diff --git a/source/java/org/alfresco/filesys/server/auth/passthru/PassthruServers.java b/source/java/org/alfresco/filesys/server/auth/passthru/PassthruServers.java index 1c97472c39..0c583031ea 100644 --- a/source/java/org/alfresco/filesys/server/auth/passthru/PassthruServers.java +++ b/source/java/org/alfresco/filesys/server/auth/passthru/PassthruServers.java @@ -35,7 +35,8 @@ import org.alfresco.filesys.netbios.NetBIOSNameList; import org.alfresco.filesys.netbios.NetBIOSSession; import org.alfresco.filesys.smb.PCShare; import org.alfresco.filesys.util.IPAddress; -import org.apache.log4j.*; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * Passthru Servers Class @@ -54,7 +55,7 @@ public class PassthruServers { // Debug logging - private static final Logger logger = Logger.getLogger("org.alfresco.smb.protocol.auth"); + private static final Log logger = LogFactory.getLog("org.alfresco.smb.protocol.auth"); // Default timeout for setting up a new session diff --git a/source/java/org/alfresco/linkvalidation/HrefValidationProgress.java b/source/java/org/alfresco/linkvalidation/HrefValidationProgress.java index 68845c303c..0588041dde 100644 --- a/source/java/org/alfresco/linkvalidation/HrefValidationProgress.java +++ b/source/java/org/alfresco/linkvalidation/HrefValidationProgress.java @@ -29,6 +29,8 @@ package org.alfresco.linkvalidation; import java.io.Serializable; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * This class allows the progress of synchronous calls to @@ -50,7 +52,8 @@ import java.util.concurrent.atomic.AtomicBoolean; public class HrefValidationProgress implements Serializable { private static final long serialVersionUID = 3031274879702889688L; - + private static Log log = LogFactory.getLog(HrefValidationProgress.class ); + AtomicInteger webapp_update_count_; AtomicInteger dir_update_count_; AtomicInteger file_update_count_; @@ -94,6 +97,12 @@ public class HrefValidationProgress implements Serializable */ public void abort() { + if(log.isDebugEnabled()) + { + log.debug( "Validation request aborted via: " + + "HrefValidationProgress.abort()"); + } + is_aborted_.set( true ); setDone( true ); } diff --git a/source/java/org/alfresco/repo/audit/AuditInfo.java b/source/java/org/alfresco/repo/audit/AuditInfo.java index 31a84fd0b9..25cfe05761 100644 --- a/source/java/org/alfresco/repo/audit/AuditInfo.java +++ b/source/java/org/alfresco/repo/audit/AuditInfo.java @@ -34,7 +34,8 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.transaction.AlfrescoTransactionSupport; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.namespace.QName; -import org.apache.log4j.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * A class to encapsulate audit information supplied to the DAO layer. @@ -45,7 +46,7 @@ import org.apache.log4j.Logger; */ public class AuditInfo { - private static Logger s_logger = Logger.getLogger(AuditInfo.class); + private static Log s_logger = LogFactory.getLog(AuditInfo.class); /** * The user identifier for the person who caused this audit entry diff --git a/source/java/org/alfresco/repo/audit/AuditState.java b/source/java/org/alfresco/repo/audit/AuditState.java index 9ec83fd42f..bac7eb4f6b 100644 --- a/source/java/org/alfresco/repo/audit/AuditState.java +++ b/source/java/org/alfresco/repo/audit/AuditState.java @@ -34,7 +34,8 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.transaction.AlfrescoTransactionSupport; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.namespace.QName; -import org.apache.log4j.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * A class to encapsulate audit information supplied to the DAO layer. @@ -45,7 +46,7 @@ import org.apache.log4j.Logger; */ public class AuditState { - private static Logger s_logger = Logger.getLogger(AuditState.class); + private static Log s_logger = LogFactory.getLog(AuditState.class); /** * The user identifier for the person who caused this audit entry diff --git a/source/java/org/alfresco/repo/avm/AVMNodeConverter.java b/source/java/org/alfresco/repo/avm/AVMNodeConverter.java index bc9c97e292..e68f8919a5 100644 --- a/source/java/org/alfresco/repo/avm/AVMNodeConverter.java +++ b/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. diff --git a/source/java/org/alfresco/repo/avm/AVMNodeImpl.java b/source/java/org/alfresco/repo/avm/AVMNodeImpl.java index 4751f35b03..39208c1d65 100644 --- a/source/java/org/alfresco/repo/avm/AVMNodeImpl.java +++ b/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; diff --git a/source/java/org/alfresco/repo/avm/AVMNodeService.java b/source/java/org/alfresco/repo/avm/AVMNodeService.java index 57f9eee4ed..85aaa1a527 100644 --- a/source/java/org/alfresco/repo/avm/AVMNodeService.java +++ b/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. diff --git a/source/java/org/alfresco/repo/avm/AVMRepository.java b/source/java/org/alfresco/repo/avm/AVMRepository.java index a4653989d5..fe49a558c2 100644 --- a/source/java/org/alfresco/repo/avm/AVMRepository.java +++ b/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. diff --git a/source/java/org/alfresco/repo/avm/AVMServiceImpl.java b/source/java/org/alfresco/repo/avm/AVMServiceImpl.java index 82caa7ff02..ace9b1497f 100644 --- a/source/java/org/alfresco/repo/avm/AVMServiceImpl.java +++ b/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. diff --git a/source/java/org/alfresco/repo/avm/AVMSyncServiceImpl.java b/source/java/org/alfresco/repo/avm/AVMSyncServiceImpl.java index a98badf5f6..39bc64ee89 100644 --- a/source/java/org/alfresco/repo/avm/AVMSyncServiceImpl.java +++ b/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. diff --git a/source/java/org/alfresco/repo/avm/LookupCache.java b/source/java/org/alfresco/repo/avm/LookupCache.java index c486cc90ba..88dd96b3f3 100644 --- a/source/java/org/alfresco/repo/avm/LookupCache.java +++ b/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. diff --git a/source/java/org/alfresco/repo/avm/OrphanReaper.java b/source/java/org/alfresco/repo/avm/OrphanReaper.java index 5fbd637d87..31efb7d23e 100644 --- a/source/java/org/alfresco/repo/avm/OrphanReaper.java +++ b/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 diff --git a/source/java/org/alfresco/repo/avm/actions/AVMRevertListAction.java b/source/java/org/alfresco/repo/avm/actions/AVMRevertListAction.java index b01101a749..d36c72035c 100644 --- a/source/java/org/alfresco/repo/avm/actions/AVMRevertListAction.java +++ b/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. diff --git a/source/java/org/alfresco/repo/avm/actions/AVMRevertStoreAction.java b/source/java/org/alfresco/repo/avm/actions/AVMRevertStoreAction.java index b5de4f174b..569e65eccc 100644 --- a/source/java/org/alfresco/repo/avm/actions/AVMRevertStoreAction.java +++ b/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"; diff --git a/source/java/org/alfresco/repo/avm/actions/AVMRevertToVersionAction.java b/source/java/org/alfresco/repo/avm/actions/AVMRevertToVersionAction.java index 279743dab8..df50f271af 100644 --- a/source/java/org/alfresco/repo/avm/actions/AVMRevertToVersionAction.java +++ b/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. diff --git a/source/java/org/alfresco/repo/avm/actions/AVMUndoSandboxListAction.java b/source/java/org/alfresco/repo/avm/actions/AVMUndoSandboxListAction.java index ef43d04b1a..8cea3bc893 100644 --- a/source/java/org/alfresco/repo/avm/actions/AVMUndoSandboxListAction.java +++ b/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. diff --git a/source/java/org/alfresco/repo/avm/actions/SimpleAVMSubmitAction.java b/source/java/org/alfresco/repo/avm/actions/SimpleAVMSubmitAction.java index 3d6a6fe504..e065f0f304 100644 --- a/source/java/org/alfresco/repo/avm/actions/SimpleAVMSubmitAction.java +++ b/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"; diff --git a/source/java/org/alfresco/repo/avm/actions/StartAVMWorkflowAction.java b/source/java/org/alfresco/repo/avm/actions/StartAVMWorkflowAction.java index 8463d4b06b..009204a0a0 100644 --- a/source/java/org/alfresco/repo/avm/actions/StartAVMWorkflowAction.java +++ b/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"; diff --git a/source/java/org/alfresco/repo/avm/wf/AVMRemoveAllSrcWebappsHandler.java b/source/java/org/alfresco/repo/avm/wf/AVMRemoveAllSrcWebappsHandler.java index ad03523523..a8c093e5e9 100644 --- a/source/java/org/alfresco/repo/avm/wf/AVMRemoveAllSrcWebappsHandler.java +++ b/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. diff --git a/source/java/org/alfresco/repo/avm/wf/AVMSubmitHandler.java b/source/java/org/alfresco/repo/avm/wf/AVMSubmitHandler.java index 0806289633..d8418ebe42 100644 --- a/source/java/org/alfresco/repo/avm/wf/AVMSubmitHandler.java +++ b/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. diff --git a/source/java/org/alfresco/repo/avm/wf/AVMSubmitLinkChecker.java b/source/java/org/alfresco/repo/avm/wf/AVMSubmitLinkChecker.java index c0d3f321eb..adcb70763c 100644 --- a/source/java/org/alfresco/repo/avm/wf/AVMSubmitLinkChecker.java +++ b/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. diff --git a/source/java/org/alfresco/repo/avm/wf/AVMSubmitTransactionListener.java b/source/java/org/alfresco/repo/avm/wf/AVMSubmitTransactionListener.java index 3d9e074968..bc65c2605e 100644 --- a/source/java/org/alfresco/repo/avm/wf/AVMSubmitTransactionListener.java +++ b/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() { } diff --git a/source/java/org/alfresco/repo/importer/ImporterBootstrap.java b/source/java/org/alfresco/repo/importer/ImporterBootstrap.java index 5411a13b7c..85d366b63d 100644 --- a/source/java/org/alfresco/repo/importer/ImporterBootstrap.java +++ b/source/java/org/alfresco/repo/importer/ImporterBootstrap.java @@ -61,8 +61,8 @@ import org.alfresco.util.TempFileProvider; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.impl.Log4JLogger; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.context.ApplicationEvent; import org.springframework.util.FileCopyUtils; @@ -320,13 +320,6 @@ public class ImporterBootstrap extends AbstractLifecycleBean throw new ImporterException("Store URL must be provided"); } - // initialise log level - // note: only supported with Log4J - if (logEnabled && logger instanceof Log4JLogger) - { - Logger log4JLogger = ((Log4JLogger)logger).getLogger(); - log4JLogger.setLevel(Level.DEBUG); - } UserTransaction userTransaction = transactionService.getUserTransaction(); Authentication authentication = authenticationComponent.getCurrentAuthentication(); diff --git a/source/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java b/source/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java index 47daaca213..d3c4841bf5 100644 --- a/source/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java +++ b/source/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java @@ -49,7 +49,8 @@ import org.alfresco.service.cmr.repository.ScriptLocation; import org.alfresco.service.cmr.repository.ScriptProcessor; import org.alfresco.service.cmr.repository.StoreRef; 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.mozilla.javascript.Context; import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.ScriptableObject; @@ -62,7 +63,7 @@ import org.springframework.util.FileCopyUtils; */ public class RhinoScriptProcessor extends BaseProcessor implements ScriptProcessor { - private static final Logger logger = Logger.getLogger(RhinoScriptProcessor.class); + private static final Log logger = LogFactory.getLog(RhinoScriptProcessor.class); private static final String IMPORT_PREFIX = " implements ADMLuceneIndexer { - static Logger s_logger = Logger.getLogger(ADMLuceneIndexerImpl.class); + static Log s_logger = LogFactory.getLog(ADMLuceneIndexerImpl.class); /** * The node service we use to get information about nodes diff --git a/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneSearcherImpl.java b/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneSearcherImpl.java index d3fc8d1814..55f364686b 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneSearcherImpl.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneSearcherImpl.java @@ -58,7 +58,8 @@ import org.alfresco.service.namespace.NamespacePrefixResolver; import org.alfresco.service.namespace.QName; import org.alfresco.util.ISO9075; import org.alfresco.util.SearchLanguageConversion; -import org.apache.log4j.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Term; import org.apache.lucene.index.TermEnum; @@ -79,7 +80,7 @@ import com.werken.saxpath.XPathReader; */ public class ADMLuceneSearcherImpl extends AbstractLuceneBase implements LuceneSearcher { - static Logger s_logger = Logger.getLogger(ADMLuceneSearcherImpl.class); + static Log s_logger = LogFactory.getLog(ADMLuceneSearcherImpl.class); /** * Default field name diff --git a/source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java b/source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java index e5eee939c9..0d92230ba5 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java @@ -78,7 +78,8 @@ import org.alfresco.util.EqualsHelper; import org.alfresco.util.GUID; import org.alfresco.util.ISO9075; import org.alfresco.util.Pair; -import org.apache.log4j.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; @@ -103,7 +104,7 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl impl private static String SNAP_SHOT_ID = "SnapShot"; - static Logger s_logger = Logger.getLogger(AVMLuceneIndexerImpl.class); + static Log s_logger = LogFactory.getLog(AVMLuceneIndexerImpl.class); private AVMService avmService; diff --git a/source/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneBase.java b/source/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneBase.java index ae1dbf6dbe..c914475cf2 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneBase.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneBase.java @@ -34,7 +34,8 @@ import org.alfresco.repo.search.impl.lucene.index.TransactionStatus; import org.alfresco.repo.search.impl.lucene.index.IndexInfo.LockWork; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.repository.StoreRef; -import org.apache.log4j.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.search.IndexSearcher; @@ -65,7 +66,7 @@ import org.apache.lucene.search.IndexSearcher; public abstract class AbstractLuceneBase { - private static Logger s_logger = Logger.getLogger(AbstractLuceneBase.class); + private static Log s_logger = LogFactory.getLog(AbstractLuceneBase.class); private IndexInfo indexInfo; diff --git a/source/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneIndexerImpl.java b/source/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneIndexerImpl.java index 6e70731243..3130313646 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneIndexerImpl.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneIndexerImpl.java @@ -39,7 +39,8 @@ import javax.transaction.xa.XAResource; import org.alfresco.repo.search.IndexerException; import org.alfresco.repo.search.impl.lucene.index.TransactionStatus; import org.alfresco.service.cmr.repository.InvalidNodeRefException; -import org.apache.log4j.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; @@ -159,7 +160,7 @@ public abstract class AbstractLuceneIndexerImpl extends AbstractLuceneBase * Logger */ @SuppressWarnings("unused") - private static Logger s_logger = Logger.getLogger(AbstractLuceneIndexerImpl.class); + private static Log s_logger = LogFactory.getLog(AbstractLuceneIndexerImpl.class); protected static Set deletePrimary(Collection nodeRefs, IndexReader reader, boolean delete) throws LuceneIndexException diff --git a/source/java/org/alfresco/repo/search/impl/lucene/LuceneAnalyser.java b/source/java/org/alfresco/repo/search/impl/lucene/LuceneAnalyser.java index a8c810676b..b4039b7723 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/LuceneAnalyser.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/LuceneAnalyser.java @@ -39,7 +39,8 @@ import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.dictionary.PropertyDefinition; 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.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.WhitespaceAnalyzer; @@ -53,7 +54,7 @@ import org.apache.lucene.analysis.WhitespaceAnalyzer; public class LuceneAnalyser extends Analyzer { - private static Logger s_logger = Logger.getLogger(LuceneAnalyser.class); + private static Log s_logger = LogFactory.getLog(LuceneAnalyser.class); // Dictinary service to look up analyser classes by data type and locale. private DictionaryService dictionaryService; diff --git a/source/java/org/alfresco/repo/search/impl/lucene/LuceneQueryParser.java b/source/java/org/alfresco/repo/search/impl/lucene/LuceneQueryParser.java index a8829bc490..c8a998fb20 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/LuceneQueryParser.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/LuceneQueryParser.java @@ -54,7 +54,8 @@ import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.search.SearchParameters; import org.alfresco.service.namespace.NamespacePrefixResolver; 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.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; @@ -76,7 +77,7 @@ import com.werken.saxpath.XPathReader; public class LuceneQueryParser extends QueryParser { - private static Logger s_logger = Logger.getLogger(LuceneQueryParser.class); + private static Log s_logger = LogFactory.getLog(LuceneQueryParser.class); private NamespacePrefixResolver namespacePrefixResolver; diff --git a/source/java/org/alfresco/repo/search/impl/lucene/analysis/MLAnalayser.java b/source/java/org/alfresco/repo/search/impl/lucene/analysis/MLAnalayser.java index 6006b9bce5..a7aec2f5dc 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/analysis/MLAnalayser.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/analysis/MLAnalayser.java @@ -10,13 +10,14 @@ import org.alfresco.i18n.I18NUtil; import org.alfresco.repo.search.MLAnalysisMode; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.dictionary.DictionaryService; -import org.apache.log4j.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; public class MLAnalayser extends Analyzer { - private static Logger s_logger = Logger.getLogger(MLAnalayser.class); + private static Log s_logger = LogFactory.getLog(MLAnalayser.class); private DictionaryService dictionaryService; diff --git a/source/java/org/alfresco/repo/search/impl/lucene/analysis/MLTokenDuplicator.java b/source/java/org/alfresco/repo/search/impl/lucene/analysis/MLTokenDuplicator.java index 21d4ade4f2..8bcf61f26f 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/analysis/MLTokenDuplicator.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/analysis/MLTokenDuplicator.java @@ -9,7 +9,8 @@ import java.util.Iterator; import java.util.Locale; import org.alfresco.repo.search.MLAnalysisMode; -import org.apache.log4j.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; @@ -23,7 +24,7 @@ import org.apache.lucene.analysis.Tokenizer; */ public class MLTokenDuplicator extends Tokenizer { - private static Logger s_logger = Logger.getLogger(MLTokenDuplicator.class); + private static Log s_logger = LogFactory.getLog(MLTokenDuplicator.class); TokenStream source; diff --git a/source/java/org/alfresco/repo/search/impl/lucene/index/ReferenceCountingReadOnlyIndexReaderFactory.java b/source/java/org/alfresco/repo/search/impl/lucene/index/ReferenceCountingReadOnlyIndexReaderFactory.java index 64f5f279fa..c8e04d3428 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/index/ReferenceCountingReadOnlyIndexReaderFactory.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/index/ReferenceCountingReadOnlyIndexReaderFactory.java @@ -30,7 +30,8 @@ import java.util.HashMap; import org.alfresco.util.EqualsHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.log4j.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.lucene.index.FilterIndexReader; import org.apache.lucene.index.IndexReader; @@ -77,7 +78,7 @@ public class ReferenceCountingReadOnlyIndexReaderFactory public static class ReferenceCountingReadOnlyIndexReader extends FilterIndexReader implements ReferenceCounting { - private static Logger s_logger = Logger.getLogger(ReferenceCountingReadOnlyIndexReader.class); + private static Log s_logger = LogFactory.getLog(ReferenceCountingReadOnlyIndexReader.class); private static final long serialVersionUID = 7693185658022810428L; diff --git a/source/java/org/alfresco/repo/template/FreeMarkerProcessor.java b/source/java/org/alfresco/repo/template/FreeMarkerProcessor.java index 49b65c7472..aaa0a786d6 100644 --- a/source/java/org/alfresco/repo/template/FreeMarkerProcessor.java +++ b/source/java/org/alfresco/repo/template/FreeMarkerProcessor.java @@ -40,7 +40,8 @@ import org.alfresco.service.cmr.repository.TemplateImageResolver; import org.alfresco.service.cmr.repository.TemplateProcessor; import org.alfresco.service.cmr.repository.TemplateProcessorExtension; import org.alfresco.service.cmr.repository.TemplateService; -import org.apache.log4j.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import freemarker.cache.MruCacheStorage; import freemarker.cache.StringTemplateLoader; @@ -69,7 +70,7 @@ public class FreeMarkerProcessor extends BaseProcessor implements TemplateProces private final static String MSG_ERROR_TEMPLATE_FAIL = "error_template_fail"; private final static String MSG_ERROR_TEMPLATE_IO = "error_template_io"; - private static final Logger logger = Logger.getLogger(FreeMarkerProcessor.class); + private static final Log logger = LogFactory.getLog(FreeMarkerProcessor.class); /** Pseudo path to String based template */ private static final String PATH = "string://fixed"; diff --git a/source/java/org/alfresco/repo/transaction/RetryingTransactionAdvice.java b/source/java/org/alfresco/repo/transaction/RetryingTransactionAdvice.java index a69638dd33..626e9abd31 100644 --- a/source/java/org/alfresco/repo/transaction/RetryingTransactionAdvice.java +++ b/source/java/org/alfresco/repo/transaction/RetryingTransactionAdvice.java @@ -7,7 +7,8 @@ import java.util.Random; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; -import org.apache.log4j.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.hibernate.StaleObjectStateException; import org.hibernate.exception.LockAcquisitionException; import org.springframework.aop.framework.ReflectiveMethodInvocation; @@ -23,7 +24,7 @@ import org.springframework.transaction.TransactionStatus; */ public class RetryingTransactionAdvice implements MethodInterceptor { - private static Logger fgLogger = Logger.getLogger(RetryingTransactionAdvice.class); + private static Log fgLogger = LogFactory.getLog(RetryingTransactionAdvice.class); /** * The transaction manager instance. diff --git a/source/java/org/alfresco/repo/transaction/RetryingTransactionHelper.java b/source/java/org/alfresco/repo/transaction/RetryingTransactionHelper.java index 39d08b880a..8783fcfb24 100644 --- a/source/java/org/alfresco/repo/transaction/RetryingTransactionHelper.java +++ b/source/java/org/alfresco/repo/transaction/RetryingTransactionHelper.java @@ -36,7 +36,8 @@ import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.error.ExceptionStackUtil; import org.alfresco.repo.security.permissions.AccessDeniedException; 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.StaleObjectStateException; import org.hibernate.exception.LockAcquisitionException; import org.springframework.dao.ConcurrencyFailureException; @@ -54,7 +55,7 @@ import org.springframework.jdbc.UncategorizedSQLException; public class RetryingTransactionHelper { private static final String MSG_READ_ONLY = "permissions.err_read_only"; - private static Logger logger = Logger.getLogger(RetryingTransactionHelper.class); + private static Log logger = LogFactory.getLog(RetryingTransactionHelper.class); /** * Exceptions that trigger retries.