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

@@ -38,10 +38,11 @@ import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.i18n.MessageService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.web.bean.repository.Repository;
import org.apache.log4j.Logger;
import org.apache.log4j.Priority;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.web.context.support.WebApplicationContextUtils;
/**
* Wrapper around Alfresco Resource Bundle objects. Used to catch and handle missing
* resource exception to help identify missing I18N strings in client apps.
@@ -51,7 +52,7 @@ import org.springframework.web.context.support.WebApplicationContextUtils;
*/
public final class ResourceBundleWrapper extends ResourceBundle
{
private static Logger logger = Logger.getLogger(ResourceBundleWrapper.class);
private static Log logger = LogFactory.getLog(ResourceBundleWrapper.class);
private ResourceBundle delegate;
private ResourceBundle delegateCustom;
@@ -147,7 +148,7 @@ public final class ResourceBundleWrapper extends ResourceBundle
// if the key was not found return a default string
if (result == null)
{
if (logger.isEnabledFor(Priority.WARN))
if (logger.isWarnEnabled())
logger.warn("Failed to find I18N message string key: " + key);
result = "$$" + key + "$$";