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

source/java/org/alfresco/web/app/ResourceBundleWrapper.java

@@ -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.commons.logging.Log;
-import org.apache.log4j.Priority;
+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 + "$$";

source/java/org/alfresco/web/bean/BrowseBean.java

@@ -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.commons.logging.Log;
-import org.apache.log4j.Priority;
+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;

source/java/org/alfresco/web/bean/CategoriesBean.java

@@ -60,7 +60,8 @@ import org.alfresco.web.ui.common.component.UIBreadcrumb;
 import org.alfresco.web.ui.common.component.UIModeList;
 import org.alfresco.web.ui.common.component.data.UIRichList;
 import org.alfresco.web.ui.repo.component.IRepoBreadcrumbHandler;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Backing Bean for the Category Management pages.
@@ -73,7 +74,7 @@ public class CategoriesBean implements IContextListener
 
    private static final String MSG_CATEGORIES = "categories";
 
-   private static Logger logger = Logger.getLogger(CategoriesBean.class);
+   private static Log    logger = LogFactory.getLog(CategoriesBean.class);
    
    /** The NodeService to be used by the bean */
    protected NodeService nodeService;

source/java/org/alfresco/web/bean/GroupsBean.java

@@ -63,7 +63,8 @@ import org.alfresco.web.ui.common.component.UIBreadcrumb;
 import org.alfresco.web.ui.common.component.UIGenericPicker;
 import org.alfresco.web.ui.common.component.UIModeList;
 import org.alfresco.web.ui.common.component.data.UIRichList;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Backing Bean for the Groups Management pages.
@@ -80,7 +81,7 @@ public class GroupsBean implements IContextListener
    private static final String MSG_ERR_EXISTS = "groups_err_exists";
    private static final String MSG_GROUPS = "root_groups";
    
-   private static Logger logger = Logger.getLogger(GroupsBean.class);
+   private static Log    logger = LogFactory.getLog(GroupsBean.class);
    
    /** The NodeService to be used by the bean */
    private NodeService nodeService;

source/java/org/alfresco/web/bean/NavigationBean.java

@@ -67,7 +67,8 @@ import org.alfresco.web.ui.common.component.UIBreadcrumb;
 import org.alfresco.web.ui.common.component.UIModeList;
 import org.alfresco.web.ui.repo.component.IRepoBreadcrumbHandler;
 import org.alfresco.web.ui.repo.component.shelf.UIShelf;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.web.jsf.FacesContextUtils;
 
 /**
@@ -931,7 +932,7 @@ public class NavigationBean
    // ------------------------------------------------------------------------------
    // Private data
    
-   private static Logger s_logger = Logger.getLogger(NavigationBean.class);
+   private static Log    s_logger = LogFactory.getLog(NavigationBean.class);
    
    /** constant values used by the toolbar location modelist control */
    public static final String LOCATION_COMPANY    = "companyhome";

source/java/org/alfresco/web/bean/RecentSpacesBean.java

@@ -41,7 +41,8 @@ import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.config.ClientConfigElement;
 import org.alfresco.web.ui.common.Utils;
 import org.alfresco.web.ui.repo.component.shelf.UIRecentSpacesShelfItem;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * This bean manages the real-time updated list of Recent Spaces in the Shelf component.
@@ -53,7 +54,7 @@ import org.apache.log4j.Logger;
  */
 public class RecentSpacesBean implements IContextListener
 {
-   private static Logger logger = Logger.getLogger(RecentSpacesBean.class);
+   private static Log    logger = LogFactory.getLog(RecentSpacesBean.class);
    
    /** The NavigationBean reference */
    protected NavigationBean navigator;

source/java/org/alfresco/web/bean/UserShortcutsBean.java

@@ -49,7 +49,8 @@ import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.ui.common.Utils;
 import org.alfresco.web.ui.common.component.UIActionLink;
 import org.alfresco.web.ui.repo.component.shelf.UIShortcutsShelfItem;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * This bean manages the user defined list of Recent Spaces in the Shelf component.
@@ -58,7 +59,7 @@ import org.apache.log4j.Logger;
  */
 public class UserShortcutsBean
 {
-   private static Logger logger = Logger.getLogger(UserShortcutsBean.class);
+   private static Log    logger = LogFactory.getLog(UserShortcutsBean.class);
    
    /** The NodeService to be used by the bean */
    protected NodeService nodeService;

source/java/org/alfresco/web/bean/repository/Repository.java

@@ -64,7 +64,8 @@ import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.ui.common.Utils;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 import org.springframework.web.jsf.FacesContextUtils;
 
@@ -86,7 +87,7 @@ public final class Repository
    
    private static final String METADATA_EXTACTER_REGISTRY = "metadataExtracterRegistry";  
 
-   private static Logger logger = Logger.getLogger(Repository.class);
+   private static Log logger = LogFactory.getLog(Repository.class);
    
    /** cache of client StoreRef */
    private static StoreRef storeRef = null;

source/java/org/alfresco/web/bean/users/UsersBean.java

@@ -57,14 +57,15 @@ import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.ui.common.Utils;
 import org.alfresco.web.ui.common.component.UIActionLink;
 import org.alfresco.web.ui.common.component.data.UIRichList;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * @author Kevin Roast
  */
 public class UsersBean implements IContextListener
 {
-   private static Logger logger = Logger.getLogger(UsersBean.class);
+   private static Log    logger = LogFactory.getLog(UsersBean.class);
 
    public static final String ERROR_PASSWORD_MATCH = "error_password_match";
    private static final String ERROR_DELETE = "error_delete_user";

source/java/org/alfresco/web/bean/wizard/NewUserWizard.java

@@ -61,14 +61,15 @@ import org.alfresco.web.bean.users.UsersBean;
 import org.alfresco.web.config.ClientConfigElement;
 import org.alfresco.web.ui.common.Utils;
 import org.alfresco.web.ui.common.component.UIActionLink;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * @author Kevin Roast
  */
 public class NewUserWizard extends AbstractWizardBean
 {
-   private static Logger logger = Logger.getLogger(NewUserWizard.class);
+   private static Log    logger = LogFactory.getLog(NewUserWizard.class);
 
    private static final String WIZARD_TITLE_NEW_ID = "new_user_title";
    private static final String WIZARD_DESC_NEW_ID = "new_user_desc";

source/java/org/alfresco/web/data/Sort.java

@@ -35,7 +35,8 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Sort
@@ -471,6 +472,6 @@ public abstract class Sort
    /** config value whether to use strong collation Key string comparisons */
    private boolean strongStringCompare = false;
    
-   private static Logger s_logger = Logger.getLogger(IDataContainer.class);
+   private static Log    s_logger = LogFactory.getLog(IDataContainer.class);
    
 } // end class Sort

source/java/org/alfresco/web/ui/common/component/data/UIDataPager.java

@@ -38,7 +38,8 @@ import javax.faces.event.AbortProcessingException;
 import javax.faces.event.ActionEvent;
 import javax.faces.event.FacesEvent;
 
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import org.alfresco.web.app.Application;
 import org.alfresco.web.data.IDataContainer;
@@ -50,7 +51,7 @@ import org.alfresco.web.ui.common.WebResources;
  */
 public class UIDataPager extends UICommand
 {
-   private static Logger s_logger = Logger.getLogger(IDataContainer.class);
+   private static Log    s_logger = LogFactory.getLog(IDataContainer.class);
    
    private static final String LAST_PAGE = "last_page";
    private static final String NEXT_PAGE = "next_page";

source/java/org/alfresco/web/ui/common/component/data/UISortLink.java

@@ -37,7 +37,8 @@ import javax.faces.event.AbortProcessingException;
 import javax.faces.event.ActionEvent;
 import javax.faces.event.FacesEvent;
 
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import org.alfresco.web.data.IDataContainer;
 import org.alfresco.web.ui.common.Utils;
@@ -336,7 +337,7 @@ public class UISortLink extends UICommand
    // ------------------------------------------------------------------------------
    // Constants
    
-   private static Logger s_logger = Logger.getLogger(IDataContainer.class);
+   private static Log    s_logger = LogFactory.getLog(IDataContainer.class);
    
    /** sorting mode */
    private String mode = IDataContainer.SORT_CASEINSENSITIVE;

source/java/org/alfresco/web/ui/common/component/evaluator/BaseEvaluator.java

@@ -29,7 +29,8 @@ import java.io.IOException;
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
 
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import org.alfresco.web.ui.common.component.SelfRenderingComponent;
 
@@ -137,7 +138,7 @@ public abstract class BaseEvaluator extends SelfRenderingComponent
    public abstract boolean evaluate();
    
    
-   protected static final Logger s_logger = Logger.getLogger(BaseEvaluator.class);
+   protected static final Log    s_logger = LogFactory.getLog(BaseEvaluator.class);
    
    /** the value to be evaluated against */
    private Object value;

source/java/org/alfresco/web/ui/repo/component/template/UITemplate.java

@@ -44,7 +44,8 @@ import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.bean.repository.User;
 import org.alfresco.web.ui.common.Utils;
 import org.alfresco.web.ui.common.component.SelfRenderingComponent;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Component responsible for rendering the output of a FreeMarker template directly to the page.
@@ -58,7 +59,7 @@ import org.apache.log4j.Logger;
  */
 public class UITemplate extends SelfRenderingComponent
 {
-   private static Logger logger = Logger.getLogger(UITemplate.class);
+   private static Log    logger = LogFactory.getLog(UITemplate.class);
    
    /** Template name/classpath */
    private String template = null;