DRYD-477: Restore SLF4j logging to event listener classes.

diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/CreateVersionListener.java b/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/CreateVersionListener.java
index e275d928523a1f0015cfe99fd83444c2aa64528d..6eee7cf3756eaeabe79df219a1d794bcc737a4d8 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/CreateVersionListener.java
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/CreateVersionListener.java
@@ -1,7 +1,7 @@
 package org.collectionspace.services.listener.botgarden;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.collectionspace.services.client.workflow.WorkflowClient;
 import org.collectionspace.services.movement.nuxeo.MovementConstants;
@@ -15,7 +15,7 @@ import org.nuxeo.ecm.core.event.impl.DocumentEventContext;
 
 public class CreateVersionListener extends AbstractCSEventSyncListenerImpl {
        public static final String SKIP_PROPERTY = "CreateVersionListener.SKIP";
-       static final Log logger = LogFactory.getLog(CreateVersionListener.class);
+       private static final Logger logger = LoggerFactory.getLogger(CreateVersionListener.class);
 
     @Override
        public boolean shouldHandleEvent(Event event) {
@@ -57,7 +57,7 @@ public class CreateVersionListener extends AbstractCSEventSyncListenerImpl {
        }
 
        @Override
-       public Log getLogger() {
+       public Logger getLogger() {
                return logger;
        }
 }
\ No newline at end of file

diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/DeleteDeadLocationListener.java b/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/DeleteDeadLocationListener.java
index 41146b757e451f5cc107f0cd464f5f53c0694695..4e3a3a0b0045ebb7ca0bd4cc1fac255ca5f77ffb 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/DeleteDeadLocationListener.java
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/DeleteDeadLocationListener.java
@@ -1,7 +1,7 @@
 package org.collectionspace.services.listener.botgarden;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.collectionspace.services.client.workflow.WorkflowClient;
 import org.collectionspace.services.movement.nuxeo.MovementBotGardenConstants;
@@ -15,7 +15,7 @@ import org.nuxeo.ecm.core.event.EventContext;
 import org.nuxeo.ecm.core.event.impl.DocumentEventContext;
 
 public class DeleteDeadLocationListener extends AbstractCSEventSyncListenerImpl {
-       static final Log logger = LogFactory.getLog(DeleteDeadLocationListener.class);
+       private static final Logger logger = LoggerFactory.getLogger(DeleteDeadLocationListener.class);
 
     @Override
        public boolean shouldHandleEvent(Event event) {
@@ -60,7 +60,7 @@ public class DeleteDeadLocationListener extends AbstractCSEventSyncListenerImpl
     }
     
     @Override
-    public Log getLogger() {
+    public Logger getLogger() {
        return logger;
     }
 }
\ No newline at end of file

diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateAccessCodeListener.java b/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateAccessCodeListener.java
index 1a63c5f6ce7fa49822503dd91aa522cc83225131..04f0a218b80ac0f38f777028b56e597099d53792 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateAccessCodeListener.java
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateAccessCodeListener.java
@@ -8,8 +8,9 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.collectionspace.services.batch.BatchResource;
 import org.collectionspace.services.batch.nuxeo.UpdateAccessCodeBatchJob;
@@ -48,7 +49,7 @@ import org.nuxeo.ecm.core.event.impl.DocumentEventContext;
  *
  */
 public class UpdateAccessCodeListener extends AbstractCSEventSyncListenerImpl {
-       static final Log logger = LogFactory.getLog(UpdateAccessCodeListener.class);
+       private static final Logger logger = LoggerFactory.getLogger(UpdateAccessCodeListener.class);
 
        public static final String PREVIOUS_DEAD_FLAG_PROPERTY_NAME = "UpdateAccessCodeListener.previousDeadFlag";
        public static final String PREVIOUS_TAXON_NAMES_PROPERTY_NAME = "UpdateAccessCodeListener.previousTaxonNames";
@@ -376,7 +377,7 @@ public class UpdateAccessCodeListener extends AbstractCSEventSyncListenerImpl {
        }
        
        @Override
-       public Log getLogger() {
+       public Logger getLogger() {
                return logger;
        }
 }

diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateDeadFlagListener.java b/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateDeadFlagListener.java
index 3569452ce1c5396c9ffdc409b8c02cc9b7b97f62..76aca736a837ef49b3a7b2b998312a9745f864ea 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateDeadFlagListener.java
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateDeadFlagListener.java
@@ -1,7 +1,7 @@
 package org.collectionspace.services.listener.botgarden;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.collectionspace.services.batch.BatchResource;
 import org.collectionspace.services.batch.nuxeo.UpdateDeadFlagBatchJob;
@@ -28,13 +28,13 @@ import org.nuxeo.ecm.core.event.EventContext;
 import org.nuxeo.ecm.core.event.impl.DocumentEventContext;
 
 public class UpdateDeadFlagListener extends AbstractCSEventSyncListenerImpl {
-       static final Log logger = LogFactory.getLog(UpdateDeadFlagListener.class);
+       private static final Logger logger = LoggerFactory.getLogger(UpdateDeadFlagListener.class);
 
     @Override
        public boolean shouldHandleEvent(Event event) {
        return event.getContext() instanceof DocumentEventContext;
     }
-    
+
        /*
         * Set the dead flag and dead date on collectionobjects related to a new or modified movement record.
         */
@@ -119,7 +119,7 @@ public class UpdateDeadFlagListener extends AbstractCSEventSyncListenerImpl {
        }
        
        @Override
-       public Log getLogger() {
+       public Logger getLogger() {
                return logger;
        }
 }
\ No newline at end of file

diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateLocationListener.java b/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateLocationListener.java
index 0d3496a77d6d97cbb191ace55c31446e7564b5ed..f92e6b0af2c5121b51ba7b65c22a2b7fe6f8684b 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateLocationListener.java
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateLocationListener.java
@@ -1,7 +1,7 @@
 package org.collectionspace.services.listener.botgarden;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.collectionspace.services.client.workflow.WorkflowClient;
 import org.collectionspace.services.movement.nuxeo.MovementBotGardenConstants;
@@ -16,7 +16,7 @@ import org.nuxeo.ecm.core.event.EventContext;
 import org.nuxeo.ecm.core.event.impl.DocumentEventContext;
 
 public class UpdateLocationListener extends AbstractCSEventSyncListenerImpl {
-       static final Log logger = LogFactory.getLog(UpdateLocationListener.class);
+       private static final Logger logger = LoggerFactory.getLogger(UpdateLocationListener.class);
 
     @Override
        public boolean shouldHandleEvent(Event event) {
@@ -91,7 +91,7 @@ public class UpdateLocationListener extends AbstractCSEventSyncListenerImpl {
        }
        
        @Override
-       public Log getLogger() {
+       public Logger getLogger() {
                return logger;
        }
 }
\ No newline at end of file

diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateRareFlagListener.java b/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateRareFlagListener.java
index 72bb3f756b0225070ae99eabf7e6ae9a56ce9424..0efc873a13a092056d06e71bb7047ab153a5bf3a 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateRareFlagListener.java
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateRareFlagListener.java
@@ -3,8 +3,8 @@ package org.collectionspace.services.listener.botgarden;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.collectionspace.services.batch.BatchResource;
 import org.collectionspace.services.batch.nuxeo.UpdateRareFlagBatchJob;
@@ -41,7 +41,7 @@ import org.nuxeo.ecm.core.event.impl.DocumentEventContext;
  *
  */
 public class UpdateRareFlagListener extends AbstractCSEventSyncListenerImpl {
-       static final Log logger = LogFactory.getLog(UpdateRareFlagListener.class);
+       private static final Logger logger = LoggerFactory.getLogger(UpdateRareFlagListener.class);
 
        public static final String PREVIOUS_TAXON_PROPERTY_NAME = "UpdateRareFlagListener.previousTaxon";
        public static final String PREVIOUS_HAS_RARE_CONSERVATION_CATEGORY_PROPERTY_NAME = "UpdateRareFlagListener.previousHasRareConservationCategory";
@@ -219,7 +219,7 @@ public class UpdateRareFlagListener extends AbstractCSEventSyncListenerImpl {
        }
        
        @Override
-       public Log getLogger() {
+       public Logger getLogger() {
                return logger;
        }
 }

diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateStyledNameListener.java b/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateStyledNameListener.java
index 4400383f4dc671f929370c4b2d5eb3880550e020..f6c61b72c170435e9cf1d044321f598c57cb0dd1 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateStyledNameListener.java
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateStyledNameListener.java
@@ -1,7 +1,7 @@
 package org.collectionspace.services.listener.botgarden;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.jboss.resteasy.spi.ResteasyProviderFactory;
 
@@ -27,7 +27,7 @@ import org.nuxeo.ecm.core.event.impl.DocumentEventContext;
 
 public class UpdateStyledNameListener extends AbstractCSEventSyncListenerImpl {
        public static final String RUN_AFTER_MODIFIED_PROPERTY = "UpdateStyledNameListener.RUN_AFTER_MODIFIED";
-       static final Log logger = LogFactory.getLog(UpdateStyledNameListener.class);
+       private static final Logger logger = LoggerFactory.getLogger(UpdateStyledNameListener.class);
 
     @Override
        public boolean shouldHandleEvent(Event event) {
@@ -115,7 +115,7 @@ public class UpdateStyledNameListener extends AbstractCSEventSyncListenerImpl {
        }
        
        @Override
-       public Log getLogger() {
+       public Logger getLogger() {
                return logger;
        }
 }
\ No newline at end of file

diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/naturalhistory/src/main/java/org/collectionspace/services/listener/naturalhistory/UpdateFormattedDisplayNameListener.java b/3rdparty/nuxeo/nuxeo-platform-listener/naturalhistory/src/main/java/org/collectionspace/services/listener/naturalhistory/UpdateFormattedDisplayNameListener.java
index 3b8b4608c51c6aed7381354fb6a08e8827231927..fdacc758569b9d8a1bd530e9ee59b7977d5fae21 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-listener/naturalhistory/src/main/java/org/collectionspace/services/listener/naturalhistory/UpdateFormattedDisplayNameListener.java
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/naturalhistory/src/main/java/org/collectionspace/services/listener/naturalhistory/UpdateFormattedDisplayNameListener.java
@@ -5,8 +5,9 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.collectionspace.services.client.workflow.WorkflowClient;
 import org.collectionspace.services.common.api.RefName;
@@ -25,7 +26,7 @@ import org.nuxeo.ecm.core.event.impl.DocumentEventContext;
 
 public class UpdateFormattedDisplayNameListener extends AbstractCSEventSyncListenerImpl {
        public static final String RUN_AFTER_MODIFIED_PROPERTY = "UpdateFormattedDisplayNameListener.RUN_AFTER_MODIFIED";
-       static final Log logger = LogFactory.getLog(UpdateFormattedDisplayNameListener.class);
+       private static final Logger logger = LoggerFactory.getLogger(UpdateFormattedDisplayNameListener.class);
 
        private static final String[] DISPLAY_NAME_PATH_ELEMENTS = TaxonConstants.DISPLAY_NAME_FIELD_NAME.split("/");
        private static final String TERM_GROUP_LIST_FIELD_NAME = DISPLAY_NAME_PATH_ELEMENTS[0];
@@ -130,7 +131,7 @@ public class UpdateFormattedDisplayNameListener extends AbstractCSEventSyncListe
        */
        
        @Override
-       public Log getLogger() {
+       public Logger getLogger() {
                return logger;
        }
 }
\ No newline at end of file

diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/reindex/src/main/java/org/collectionspace/services/listener/Reindex.java b/3rdparty/nuxeo/nuxeo-platform-listener/reindex/src/main/java/org/collectionspace/services/listener/Reindex.java
index 3523b8a1465f997aff01cf21592379372bea593f..f645744e99770f68e0d33d4a49e1c2c8be526228 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-listener/reindex/src/main/java/org/collectionspace/services/listener/Reindex.java
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/reindex/src/main/java/org/collectionspace/services/listener/Reindex.java
@@ -4,8 +4,9 @@ import java.util.List;
 
 import org.apache.commons.collections.ListUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.collectionspace.services.nuxeo.listener.AbstractCSEventPostCommitListenerImpl;
 import org.nuxeo.ecm.core.api.DocumentModel;
@@ -26,7 +27,7 @@ import org.nuxeo.runtime.api.Framework;
  * index time.
  */
 public class Reindex extends AbstractCSEventPostCommitListenerImpl {
-       private final static Log logger = LogFactory.getLog(Reindex.class);
+       private static final Logger logger = LoggerFactory.getLogger(Reindex.class);
 
     // FIXME: This listener runs asynchronously post-commit, so that reindexing records after a
     // save does not hold up the save.
@@ -108,7 +109,7 @@ public class Reindex extends AbstractCSEventPostCommitListenerImpl {
        }
 
        @Override
-       protected Log getLogger() {
+       protected Logger getLogger() {
                return logger;
        }
 

diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/reindex/src/main/java/org/collectionspace/services/listener/ReindexSupport.java b/3rdparty/nuxeo/nuxeo-platform-listener/reindex/src/main/java/org/collectionspace/services/listener/ReindexSupport.java
index 6281328c3d462c8fccc964784e85c674aeaa7f47..a985566ca7efc9c3b1ba188990eccfa1f68cfbf0 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-listener/reindex/src/main/java/org/collectionspace/services/listener/ReindexSupport.java
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/reindex/src/main/java/org/collectionspace/services/listener/ReindexSupport.java
@@ -3,8 +3,8 @@ package org.collectionspace.services.listener;
 import java.io.Serializable;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.collectionspace.services.nuxeo.listener.AbstractCSEventSyncListenerImpl;
 
@@ -29,7 +29,7 @@ import org.nuxeo.runtime.api.Framework;
  * will only run synchronously).
  */
 public class ReindexSupport extends AbstractCSEventSyncListenerImpl {
-    final static Log logger = LogFactory.getLog(ReindexSupport.class);
+    private static final Logger logger = LoggerFactory.getLogger(ReindexSupport.class);
 
     @Override
        public boolean shouldHandleEvent(Event event) {
@@ -74,7 +74,7 @@ public class ReindexSupport extends AbstractCSEventSyncListenerImpl {
     }
     
     @Override
-    public Log getLogger() {
+    public Logger getLogger() {
        return logger;
     }
 }

diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/updateimagederivatives/src/main/java/org/collectionspace/services/listener/UpdateImageDerivatives.java b/3rdparty/nuxeo/nuxeo-platform-listener/updateimagederivatives/src/main/java/org/collectionspace/services/listener/UpdateImageDerivatives.java
index c1531c162118c4dfee32ecd386119eef1aed57d4..f5c9d8b1101fcb16627b608bb16fa5ef9648c46b 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-listener/updateimagederivatives/src/main/java/org/collectionspace/services/listener/UpdateImageDerivatives.java
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/updateimagederivatives/src/main/java/org/collectionspace/services/listener/UpdateImageDerivatives.java
@@ -2,8 +2,8 @@ package org.collectionspace.services.listener;
 
 import java.io.Serializable;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.collectionspace.services.common.api.CommonAPI;
 import org.collectionspace.services.nuxeo.client.java.CoreSessionInterface;
@@ -24,7 +24,7 @@ public class UpdateImageDerivatives extends AbstractCSEventSyncListenerImpl {
        // All Nuxeo sessions that get passed around to CollectionSpace code need to
        // be wrapped inside of a CoreSessionWrapper. For example:
        //              CoreSessionInterface coreSession = new CoreSessionWrapper(docEventContext.getCoreSession());
-       private static final Log logger = LogFactory.getLog(UpdateImageDerivatives.class);
+       private static final Logger logger = LoggerFactory.getLogger(UpdateImageDerivatives.class);
 
     @Override
        public boolean shouldHandleEvent(Event event) {
@@ -92,7 +92,7 @@ public class UpdateImageDerivatives extends AbstractCSEventSyncListenerImpl {
        }
 
        @Override
-       public Log getLogger() {
+       public Logger getLogger() {
                return logger;
        }
 }
\ No newline at end of file

diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/AbstractUpdateObjectLocationValues.java b/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/AbstractUpdateObjectLocationValues.java
index f81ab0705c84cecd2c3dcf026294af839e08d378..696a4c081be259a26084b232eafc400c7b52f722 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/AbstractUpdateObjectLocationValues.java
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/AbstractUpdateObjectLocationValues.java
@@ -256,7 +256,7 @@ public abstract class AbstractUpdateObjectLocationValues extends AbstractCSEvent
                try {
                        relationDocModels = coreSession.query(query);
                } catch (DocumentException e) {
-                       getLogger().error(e);
+                       getLogger().error(String.format("Error running this NXQL query: %s", query), e);
                }
                
         if (relationDocModels == null || relationDocModels.isEmpty()) {
@@ -354,7 +354,7 @@ public abstract class AbstractUpdateObjectLocationValues extends AbstractCSEvent
                try {
                        relationDocModels = session.query(query);
                } catch (DocumentException e) {
-                       getLogger().error(e);
+                       getLogger().error(String.format("Error running this NXQL query: %s", query), e);
                        return null;
                }
                

diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/UpdateObjectLocationAndCrateOnMove.java b/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/UpdateObjectLocationAndCrateOnMove.java
index cd593de6425bff88d9eddb2a00d14b2fbd23812d..7a40b9b166eeb23765fc2c33a5961f9a25c739f7 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/UpdateObjectLocationAndCrateOnMove.java
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/UpdateObjectLocationAndCrateOnMove.java
@@ -1,8 +1,10 @@
 package org.collectionspace.services.listener;
 
 import java.io.Serializable;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.collectionspace.services.common.api.RefNameUtils;
 import org.collectionspace.services.common.api.Tools;
 import org.nuxeo.ecm.core.api.ClientException;
@@ -12,7 +14,8 @@ public class UpdateObjectLocationAndCrateOnMove extends UpdateObjectLocationOnMo
 
     // FIXME: We might experiment here with using log4j instead of Apache Commons Logging;
     // am using the latter to follow Ray's pattern for now
-    private final Log logger = LogFactory.getLog(UpdateObjectLocationAndCrateOnMove.class);
+    private static final Logger logger = LoggerFactory.getLogger(UpdateObjectLocationAndCrateOnMove.class);
+    
     // FIXME: Get values below from external constants
     private final static String COLLECTIONOBJECTS_ANTHROPOLOGY_SCHEMA = "collectionobjects_anthropology";
     private final static String MOVEMENTS_ANTHROPOLOGY_SCHEMA = "movements_anthropology";

diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/UpdateObjectLocationOnMove.java b/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/UpdateObjectLocationOnMove.java
index dfdde2be4c13ba87d3207e52ab37aa9c9482f729..ccbc808668614987221171292f87bfab92bb3647 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/UpdateObjectLocationOnMove.java
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/UpdateObjectLocationOnMove.java
@@ -1,7 +1,7 @@
 package org.collectionspace.services.listener;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.collectionspace.services.common.api.RefNameUtils;
 import org.collectionspace.services.common.api.Tools;
@@ -11,7 +11,7 @@ import org.nuxeo.ecm.core.api.DocumentModel;
 
 public class UpdateObjectLocationOnMove extends AbstractUpdateObjectLocationValues {
 
-    private final Log logger = LogFactory.getLog(UpdateObjectLocationOnMove.class);
+    private static final Logger logger = LoggerFactory.getLogger(UpdateObjectLocationOnMove.class);
 
     @Override
     protected boolean updateCollectionObjectLocation(DocumentModel collectionObjectDocModel,
@@ -47,7 +47,7 @@ public class UpdateObjectLocationOnMove extends AbstractUpdateObjectLocationValu
     }
 
     @Override
-    public Log getLogger() {
+    public Logger getLogger() {
        return logger;
     }
 }
\ No newline at end of file

diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/src/main/java/org/collectionspace/services/listener/UpdateRelationsOnDelete.java b/3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/src/main/java/org/collectionspace/services/listener/UpdateRelationsOnDelete.java
index 81bc6b154b759c5bdbfa976b190d401539d81bc8..465b5aa87f22fcadfd663e4d8aa87e8d52a89f07 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/src/main/java/org/collectionspace/services/listener/UpdateRelationsOnDelete.java
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/src/main/java/org/collectionspace/services/listener/UpdateRelationsOnDelete.java
@@ -4,8 +4,8 @@ import java.util.ArrayList;
 import java.util.IllegalFormatException;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.collectionspace.services.client.workflow.WorkflowClient;
 import org.collectionspace.services.common.document.DocumentException;
@@ -24,7 +24,7 @@ public class UpdateRelationsOnDelete extends AbstractCSEventSyncListenerImpl {
 
     // FIXME: We might experiment here with using log4j instead of Apache Commons Logging;
     // am using the latter to follow Ray's pattern for now
-    final Log logger = LogFactory.getLog(UpdateRelationsOnDelete.class);
+    private static final Logger logger = LoggerFactory.getLogger(UpdateRelationsOnDelete.class);
     
     // FIXME: Get these constant values from external sources rather than redeclaring here
     final static String RELATION_DOCTYPE = "Relation";
@@ -103,7 +103,7 @@ public class UpdateRelationsOnDelete extends AbstractCSEventSyncListenerImpl {
     }
 
     @Override
-    public Log getLogger() {
+    public Logger getLogger() {
        return this.logger;
     }
 }

diff --git a/3rdparty/nuxeo/nuxeo-platform-thumbnail/src/main/java/org/collectionspace/services/nuxeo/extension/thumbnail/UpdateThumbListener.java b/3rdparty/nuxeo/nuxeo-platform-thumbnail/src/main/java/org/collectionspace/services/nuxeo/extension/thumbnail/UpdateThumbListener.java
index d74c86d7a2ecd90940d8e7060f569a63373cc53b..281766088396e80d1ce48dd380d6afa3ae148fc8 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-thumbnail/src/main/java/org/collectionspace/services/nuxeo/extension/thumbnail/UpdateThumbListener.java
+++ b/3rdparty/nuxeo/nuxeo-platform-thumbnail/src/main/java/org/collectionspace/services/nuxeo/extension/thumbnail/UpdateThumbListener.java
@@ -1,7 +1,7 @@
 package org.collectionspace.services.nuxeo.extension.thumbnail;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.collectionspace.services.nuxeo.listener.AbstractCSEventSyncListenerImpl;
 import org.collectionspace.services.nuxeo.util.ThumbnailConstants;
@@ -16,7 +16,7 @@ import org.nuxeo.ecm.core.event.EventContext;
 import org.nuxeo.ecm.core.event.impl.DocumentEventContext;
 
 public class UpdateThumbListener extends AbstractCSEventSyncListenerImpl {
-    final Log logger = LogFactory.getLog(UpdateThumbListener.class);
+    private static final Logger logger = LoggerFactory.getLogger(UpdateThumbListener.class);
 
     @Override
        public boolean shouldHandleEvent(Event event) {
@@ -53,9 +53,9 @@ public class UpdateThumbListener extends AbstractCSEventSyncListenerImpl {
             }
         }
     }
-    
+
     @Override
-    public Log getLogger() {
+    public Logger getLogger() {
        return logger;
     }
 }

diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/listener/AbstractCSEventListenerImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/listener/AbstractCSEventListenerImpl.java
index d902aed20b06a2533220baafdbb2bc290920937a..092cdd64065501d74142ecd036b134a60260706a 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/listener/AbstractCSEventListenerImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/listener/AbstractCSEventListenerImpl.java
@@ -6,7 +6,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
+
 import org.collectionspace.services.client.workflow.WorkflowClient;
 import org.collectionspace.services.common.api.Tools;
 import org.collectionspace.services.config.tenant.EventListenerConfig;
@@ -211,7 +212,7 @@ public abstract class AbstractCSEventListenerImpl implements CSEventListener {
        //
        // Derived classes need to implement.
        //
-       abstract protected Log getLogger();
+       abstract protected Logger getLogger();
 
        //FIXME: Does not include all the sync-related "delete" workflow states
        /**