Merged V2.1 to HEAD

6694: Removal of explicit Log4J usage


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6750 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-11 04:32:56 +00:00
parent ac03bb5f8c
commit 6936c6e642
15 changed files with 52 additions and 37 deletions

View File

@@ -87,8 +87,9 @@ import org.alfresco.web.ui.repo.component.IRepoBreadcrumbHandler;
import org.alfresco.web.ui.repo.component.UINodeDescendants;
import org.alfresco.web.ui.repo.component.UINodePath;
import org.alfresco.web.ui.repo.component.UISimpleSearch;
import org.apache.log4j.Logger;
import org.apache.log4j.Priority;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* Bean providing properties and behaviour for the main folder/document browse screen and
@@ -548,7 +549,7 @@ public class BrowseBean implements IContextListener
}
else
{
if (logger.isEnabledFor(Priority.WARN))
if (logger.isWarnEnabled())
logger.warn("Found invalid object in database: id = " + nodeRef + ", type = " + type);
}
}
@@ -829,7 +830,7 @@ public class BrowseBean implements IContextListener
}
else
{
if (logger.isEnabledFor(Priority.WARN))
if (logger.isWarnEnabled())
logger.warn("Found invalid object in database: id = " + nodeRef + ", type = " + type);
}
}
@@ -1010,13 +1011,13 @@ public class BrowseBean implements IContextListener
}
else
{
if (logger.isEnabledFor(Priority.WARN))
if (logger.isWarnEnabled())
logger.warn("Found invalid object in database: id = " + nodeRef + ", type = " + type);
}
}
else
{
if (logger.isEnabledFor(Priority.WARN))
if (logger.isWarnEnabled())
logger.warn("Missing object returned from search indexes: id = " + nodeRef + " search query: " + query);
}
}
@@ -1975,7 +1976,7 @@ public class BrowseBean implements IContextListener
private static final String MSG_DELETE_COMPANYROOT = "delete_companyroot_confirm";
private static final String MSG_SEARCH_MINIMUM = "search_minimum";
private static Logger logger = Logger.getLogger(BrowseBean.class);
private static Log logger = LogFactory.getLog(BrowseBean.class);
/** The NodeService to be used by the bean */
protected NodeService nodeService;