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/repo/avm/AVMNodeConverter.java

@@ -27,7 +27,8 @@ import org.alfresco.service.cmr.avm.AVMException;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.util.Pair;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Utility for going back and forth between the AVM world and
@@ -36,7 +37,7 @@ import org.apache.log4j.Logger;
  */
 public class AVMNodeConverter
 {
-    private static Logger fgLogger = Logger.getLogger(AVMNodeConverter.class);
+    private static Log    fgLogger = LogFactory.getLog(AVMNodeConverter.class);
     
     /**
      * Get a NodeRef corresponding to the given path and version.

source/java/org/alfresco/repo/avm/AVMNodeImpl.java

@@ -35,7 +35,8 @@ import org.alfresco.repo.domain.PropertyValue;
 import org.alfresco.service.cmr.avm.AVMReadOnlyException;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.GUID;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Base class for all repository file system like objects.
@@ -43,7 +44,7 @@ import org.apache.log4j.Logger;
  */
 public abstract class AVMNodeImpl implements AVMNode, Serializable
 {
-    private static Logger fgLogger = Logger.getLogger(AVMNodeImpl.class);
+    private static Log    fgLogger = LogFactory.getLog(AVMNodeImpl.class);
     
     protected static final boolean DEBUG = true;
     

source/java/org/alfresco/repo/avm/AVMNodeService.java

@@ -67,7 +67,8 @@ import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.QNamePattern;
 import org.alfresco.util.Pair;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * NodeService implementing facade over AVMService.
@@ -75,7 +76,7 @@ import org.apache.log4j.Logger;
  */
 public class AVMNodeService extends AbstractNodeServiceImpl implements NodeService
 {
-    private static Logger fgLogger = Logger.getLogger(AVMNodeService.class);
+    private static Log    fgLogger = LogFactory.getLog(AVMNodeService.class);
     
     /**
      * Flag for whether policy callbacks are made.

source/java/org/alfresco/repo/avm/AVMRepository.java

@@ -53,7 +53,8 @@ import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.Pair;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * This or AVMStore are
@@ -63,7 +64,7 @@ import org.apache.log4j.Logger;
 public class AVMRepository
 {
     @SuppressWarnings("unused")
-    private static Logger fgLogger = Logger.getLogger(AVMRepository.class);
+    private static Log    fgLogger = LogFactory.getLog(AVMRepository.class);
     
     /**
      * The single instance of AVMRepository.

source/java/org/alfresco/repo/avm/AVMServiceImpl.java

@@ -52,7 +52,8 @@ import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.Pair;
 import org.alfresco.util.TempFileProvider;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Implements the AVMService.
@@ -63,7 +64,7 @@ public class AVMServiceImpl implements AVMService
     public static final String SYSTEM = "system";
     
     @SuppressWarnings("unused")
-    private static Logger fgLogger = Logger.getLogger(AVMServiceImpl.class);
+    private static Log    fgLogger = LogFactory.getLog(AVMServiceImpl.class);
     
     /**
      * The AVMRepository for each service thread.

source/java/org/alfresco/repo/avm/AVMSyncServiceImpl.java

@@ -38,7 +38,8 @@ import org.alfresco.service.cmr.avmsync.AVMDifference;
 import org.alfresco.service.cmr.avmsync.AVMSyncException;
 import org.alfresco.service.cmr.avmsync.AVMSyncService;
 import org.alfresco.util.NameMatcher;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * This implements APIs that allow comparison and synchronization
@@ -48,7 +49,7 @@ import org.apache.log4j.Logger;
  */
 public class AVMSyncServiceImpl implements AVMSyncService
 {
-    private static Logger fgLogger = Logger.getLogger(AVMSyncServiceImpl.class);
+    private static Log    fgLogger = LogFactory.getLog(AVMSyncServiceImpl.class);
     
     /**
      * The AVMService.

source/java/org/alfresco/repo/avm/LookupCache.java

@@ -9,7 +9,8 @@ import java.util.List;
 import org.alfresco.repo.avm.util.SimplePath;
 import org.alfresco.repo.cache.SimpleCache;
 import org.alfresco.util.Pair;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * All lookup traffic goes through here.
@@ -17,7 +18,7 @@ import org.apache.log4j.Logger;
  */
 public class LookupCache 
 {
-    private static Logger fgLogger = Logger.getLogger(LookupCache.class);
+    private static Log    fgLogger = LogFactory.getLog(LookupCache.class);
     
     /**
      * The Map of of keys to lookups.

source/java/org/alfresco/repo/avm/OrphanReaper.java

@@ -29,7 +29,8 @@ import java.util.List;
 import org.alfresco.repo.domain.DbAccessControlList;
 import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
 import org.alfresco.service.transaction.TransactionService;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.hibernate.SessionFactory;
 import org.springframework.orm.hibernate3.HibernateTemplate;
 
@@ -78,7 +79,7 @@ public class OrphanReaper
         }
     }
 
-    private Logger fgLogger = Logger.getLogger(OrphanReaper.class);
+    private Log    fgLogger = LogFactory.getLog(OrphanReaper.class);
 
     /**
      * The Transaction Service

source/java/org/alfresco/repo/avm/actions/AVMRevertListAction.java

@@ -14,7 +14,8 @@ import org.alfresco.service.cmr.avmsync.AVMDifference;
 import org.alfresco.service.cmr.avmsync.AVMSyncService;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * This action handles reverting a selected set of nodes to a particular version.
@@ -24,7 +25,7 @@ import org.apache.log4j.Logger;
 public class AVMRevertListAction extends ActionExecuterAbstractBase 
 {
     @SuppressWarnings("unused")
-    private static Logger fgLogger = Logger.getLogger(AVMRevertListAction.class);
+    private static Log    fgLogger = LogFactory.getLog(AVMRevertListAction.class);
     
     public static final String NAME = "avm-revert-list";
     // The version to revert to.

source/java/org/alfresco/repo/avm/actions/AVMRevertStoreAction.java

@@ -15,7 +15,8 @@ import org.alfresco.service.cmr.avmsync.AVMSyncService;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.util.Pair;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Reverts a node and everything underneath it to a specified version.
@@ -24,7 +25,7 @@ import org.apache.log4j.Logger;
 public class AVMRevertStoreAction extends ActionExecuterAbstractBase 
 {
     @SuppressWarnings("unused")
-    private static Logger fgLogger = Logger.getLogger(AVMRevertStoreAction.class);
+    private static Log    fgLogger = LogFactory.getLog(AVMRevertStoreAction.class);
     
     public static final String NAME = "avm-revert-store";
     public static final String PARAM_VERSION = "version";

source/java/org/alfresco/repo/avm/actions/AVMRevertToVersionAction.java

@@ -15,7 +15,8 @@ import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.util.Pair;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Revert a single path to a specified node. The path in head is passed
@@ -26,7 +27,7 @@ import org.apache.log4j.Logger;
 public class AVMRevertToVersionAction extends ActionExecuterAbstractBase 
 {
     @SuppressWarnings("unused")
-    private static Logger fgLogger = Logger.getLogger(AVMRevertToVersionAction.class);
+    private static Log    fgLogger = LogFactory.getLog(AVMRevertToVersionAction.class);
     
     public static final String NAME = "avm-revert-to-version";
     // The node to revert to. Passed as an AVMNodeDescriptor.

source/java/org/alfresco/repo/avm/actions/AVMUndoSandboxListAction.java

@@ -19,7 +19,8 @@ import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.Pair;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Undos a list of changed nodes in a user sandbox. The set of nodes to undo is
@@ -30,7 +31,7 @@ import org.apache.log4j.Logger;
 public class AVMUndoSandboxListAction extends ActionExecuterAbstractBase 
 {
     @SuppressWarnings("unused")
-    private static Logger fgLogger = Logger.getLogger(AVMUndoSandboxListAction.class);
+    private static Log    fgLogger = LogFactory.getLog(AVMUndoSandboxListAction.class);
     
     public static final String NAME = "avm-undo-list";
     // The encoded list of nodes.

source/java/org/alfresco/repo/avm/actions/SimpleAVMSubmitAction.java

@@ -40,7 +40,8 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.NameMatcher;
 import org.alfresco.util.Pair;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * This action submits all the newer changes in the passed in NodeRef
@@ -49,7 +50,7 @@ import org.apache.log4j.Logger;
  */
 public class SimpleAVMSubmitAction extends ActionExecuterAbstractBase
 {
-    private static Logger fgLogger = Logger.getLogger(SimpleAVMSubmitAction.class);
+    private static Log    fgLogger = LogFactory.getLog(SimpleAVMSubmitAction.class);
     
     public static String NAME = "simple-avm-submit";
     

source/java/org/alfresco/repo/avm/actions/StartAVMWorkflowAction.java

@@ -20,7 +20,8 @@ import org.alfresco.service.cmr.workflow.WorkflowDefinition;
 import org.alfresco.service.cmr.workflow.WorkflowPath;
 import org.alfresco.service.cmr.workflow.WorkflowService;
 import org.alfresco.service.namespace.QName;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * This action knows how to start an AVM specific workflow.
@@ -28,7 +29,7 @@ import org.apache.log4j.Logger;
  */
 public class StartAVMWorkflowAction extends ActionExecuterAbstractBase 
 {
-    private static Logger fgLogger = Logger.getLogger(StartAVMWorkflowAction.class);
+    private static Log    fgLogger = LogFactory.getLog(StartAVMWorkflowAction.class);
     
     public static final String NAME = "start-avm-workflow";
     public static final String PARAM_WORKFLOW_NAME = "workflow-name";

source/java/org/alfresco/repo/avm/wf/AVMRemoveAllSrcWebappsHandler.java

@@ -39,7 +39,8 @@ import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.Pair;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.jbpm.graph.exe.ExecutionContext;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.context.ApplicationContext;
@@ -53,8 +54,8 @@ public class AVMRemoveAllSrcWebappsHandler extends JBPMSpringActionHandler
 {
     static final long serialVersionUID = 3004374776252613278L;
 
-    private static Logger log = 
-        Logger.getLogger(AVMRemoveAllSrcWebappsHandler.class);
+    private static Log    log = 
+        LogFactory.getLog(AVMRemoveAllSrcWebappsHandler.class);
 
     /**
      * The AVMService instance.

source/java/org/alfresco/repo/avm/wf/AVMSubmitHandler.java

@@ -30,7 +30,8 @@ import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.avmsync.AVMDifference;
 import org.alfresco.service.cmr.avmsync.AVMSyncService;
 import org.alfresco.service.namespace.QName;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.jbpm.graph.exe.ExecutionContext;
 import org.springframework.beans.factory.BeanFactory;
 
@@ -43,7 +44,7 @@ public class AVMSubmitHandler extends JBPMSpringActionHandler
 {
     private static final long serialVersionUID = 7561005904505181493L;
 
-    private static Logger fgLogger = Logger.getLogger(AVMSubmitHandler.class);
+    private static Log    fgLogger = LogFactory.getLog(AVMSubmitHandler.class);
     
     /**
      * The AVMSyncService.

source/java/org/alfresco/repo/avm/wf/AVMSubmitLinkChecker.java

@@ -40,7 +40,8 @@ import org.alfresco.service.cmr.action.Action;
 import org.alfresco.service.cmr.action.ActionService;
 import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.jbpm.graph.exe.ExecutionContext;
 import org.springframework.beans.factory.BeanFactory;
 
@@ -54,7 +55,7 @@ public class AVMSubmitLinkChecker extends JBPMSpringActionHandler
 {
     private static final long serialVersionUID = 1442635948148675461L;
 
-    private static Logger logger = Logger.getLogger(AVMSubmitLinkChecker.class);
+    private static Log    logger = LogFactory.getLog(AVMSubmitLinkChecker.class);
     
     /**
      * The AVMService.

source/java/org/alfresco/repo/avm/wf/AVMSubmitTransactionListener.java

@@ -36,7 +36,8 @@ import org.alfresco.repo.transaction.TransactionListenerAdapter;
 import org.alfresco.service.cmr.avmsync.AVMDifference;
 import org.alfresco.util.VirtServerUtils;
 import org.springframework.context.ApplicationContext;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
 *  Gets callbacks at critical moments within a transaction
@@ -45,8 +46,8 @@ import org.apache.log4j.Logger;
 */
 public class AVMSubmitTransactionListener extends TransactionListenerAdapter
 {
-    private static Logger log = 
-        Logger.getLogger(AVMSubmitTransactionListener.class);
+    private static Log    log = 
+        LogFactory.getLog(AVMSubmitTransactionListener.class);
 
     public AVMSubmitTransactionListener() { }