From: Richard Millet Date: Fri, 13 Dec 2019 01:07:17 +0000 (-0800) Subject: DRYD-477: Restore SLF4j logging to event listener classes. X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=dcb59cb81a9324d2c56750995c23d060d26883a2;p=tmp%2Fjakarta-migration.git 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 e275d9285..6eee7cf37 100644 --- 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 41146b757..4e3a3a0b0 100644 --- 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 1a63c5f6c..04f0a218b 100644 --- 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 3569452ce..76aca736a 100644 --- 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 0d3496a77..f92e6b0af 100644 --- 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 72bb3f756..0efc873a1 100644 --- 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 4400383f4..f6c61b72c 100644 --- 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 3b8b4608c..fdacc7585 100644 --- 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 3523b8a14..f645744e9 100644 --- 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 6281328c3..a985566ca 100644 --- 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 c1531c162..f5c9d8b11 100644 --- 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 f81ab0705..696a4c081 100644 --- 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 cd593de64..7a40b9b16 100644 --- 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 dfdde2be4..ccbc80866 100644 --- 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 81bc6b154..465b5aa87 100644 --- 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 d74c86d7a..281766088 100644 --- 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 d902aed20..092cdd640 100644 --- 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 /**