diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/compatibility/ModulePatchComponent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/compatibility/ModulePatchComponent.java index 9b3e043223..2367da6b41 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/compatibility/ModulePatchComponent.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/compatibility/ModulePatchComponent.java @@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFactory; public abstract class ModulePatchComponent extends AbstractModuleComponent { /** logger */ - protected static final Log logger = LogFactory.getLog(ModulePatchComponent.class); + protected static final Log LOGGER = LogFactory.getLog(ModulePatchComponent.class); /** Retrying transaction helper */ protected RetryingTransactionHelper retryingTransactionHelper; @@ -89,9 +89,9 @@ public abstract class ModulePatchComponent extends AbstractModuleComponent { try { - if (logger.isInfoEnabled()) + if (LOGGER.isInfoEnabled()) { - logger.info("Module patch component '" + getName() + "' is executing ..."); + LOGGER.info("Module patch component '" + getName() + "' is executing ..."); } // execute path within an isolated transaction @@ -114,17 +114,17 @@ public abstract class ModulePatchComponent extends AbstractModuleComponent }, false, true); - if (logger.isInfoEnabled()) + if (LOGGER.isInfoEnabled()) { - logger.info(" ... completed module patch '" + getName() + "'"); + LOGGER.info(" ... completed module patch '" + getName() + "'"); } } catch (Throwable exception) { // record the exception otherwise it gets swallowed - if (logger.isInfoEnabled()) + if (LOGGER.isInfoEnabled()) { - logger.info(" ... error encountered. " + exception.getMessage(), exception); + LOGGER.info(" ... error encountered. " + exception.getMessage(), exception); } throw exception; } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/NotificationTemplatePatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/NotificationTemplatePatch.java index cedf33c90a..1c1218ad35 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/NotificationTemplatePatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/NotificationTemplatePatch.java @@ -145,9 +145,9 @@ public class NotificationTemplatePatch extends ModulePatchComponent { if (template == null || !nodeService.exists(template)) { - if (logger.isDebugEnabled()) + if (LOGGER.isDebugEnabled()) { - logger.debug("Skipping template update, because template has not been bootstraped."); + LOGGER.debug("Skipping template update, because template has not been bootstraped."); } } else @@ -156,9 +156,9 @@ public class NotificationTemplatePatch extends ModulePatchComponent String lastPatchUpdate = (String)nodeService.getProperty(template, PROP_LAST_PATCH_UPDATE); if (lastPatchUpdate == null || !name.equals(lastPatchUpdate)) { - if (logger.isDebugEnabled()) + if (LOGGER.isDebugEnabled()) { - logger.debug("Applying update to template. (template=" + template.toString() + ", templateUpdate=" + templateUpdate + ")"); + LOGGER.debug("Applying update to template. (template=" + template.toString() + ", templateUpdate=" + templateUpdate + ")"); } // Make sure the template is versionable @@ -192,9 +192,9 @@ public class NotificationTemplatePatch extends ModulePatchComponent } else { - if (logger.isDebugEnabled()) + if (LOGGER.isDebugEnabled()) { - logger.debug("Skipping template update, because template has already been patched. (template=" + template.toString() + ")"); + LOGGER.debug("Skipping template update, because template has already been patched. (template=" + template.toString() + ")"); } } } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/RMv2FilePlanNodeRefPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/RMv2FilePlanNodeRefPatch.java index 721620c5e2..c82e1197cc 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/RMv2FilePlanNodeRefPatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/RMv2FilePlanNodeRefPatch.java @@ -113,9 +113,9 @@ public class RMv2FilePlanNodeRefPatch extends ModulePatchComponent { List filePlanComponents = patchDAO.getNodesByAspectQNameId(aspectPair.getFirst(), 0L, patchDAO.getMaxAdmNodeID()); - if (logger.isDebugEnabled()) + if (LOGGER.isDebugEnabled()) { - logger.debug(" ... updating " + filePlanComponents.size() + " items"); + LOGGER.debug(" ... updating " + filePlanComponents.size() + " items"); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/RMv2ModelPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/RMv2ModelPatch.java index 930d8b4129..01be7f7155 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/RMv2ModelPatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/RMv2ModelPatch.java @@ -127,16 +127,16 @@ public class RMv2ModelPatch extends ModulePatchComponent qnameDAO.updateQName(qnameBefore, qnameAfter); - if (logger.isDebugEnabled()) + if (LOGGER.isDebugEnabled()) { - logger.debug(" ... updated qname " + qnameBefore.toString()); + LOGGER.debug(" ... updated qname " + qnameBefore.toString()); } } else { - if (logger.isDebugEnabled()) + if (LOGGER.isDebugEnabled()) { - logger.debug(" ... no need to update qname " + qnameBefore.toString()); + LOGGER.debug(" ... no need to update qname " + qnameBefore.toString()); } } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/RMv2SavedSearchPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/RMv2SavedSearchPatch.java index fd81b2dc46..6dd1881118 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/RMv2SavedSearchPatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/RMv2SavedSearchPatch.java @@ -89,9 +89,9 @@ public class RMv2SavedSearchPatch extends ModulePatchComponent // get the saved searches List savedSearches = recordsManagementSearchService.getSavedSearches(RM_SITE_ID); - if (logger.isDebugEnabled()) + if (LOGGER.isDebugEnabled()) { - logger.debug(" ... updating " + savedSearches.size() + " saved searches"); + LOGGER.debug(" ... updating " + savedSearches.size() + " saved searches"); } for (SavedSearchDetails savedSearchDetails : savedSearches) @@ -106,9 +106,9 @@ public class RMv2SavedSearchPatch extends ModulePatchComponent writer.putContent(refreshedJSON); - if (logger.isDebugEnabled()) + if (LOGGER.isDebugEnabled()) { - logger.debug(" ... updated saved search " + savedSearchDetails.getName() + " (nodeRef=" + nodeRef.toString() + ")"); + LOGGER.debug(" ... updated saved search " + savedSearchDetails.getName() + " (nodeRef=" + nodeRef.toString() + ")"); } } } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21BehaviorScriptsPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21BehaviorScriptsPatch.java index 80973df6dd..dd6748d44f 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21BehaviorScriptsPatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21BehaviorScriptsPatch.java @@ -97,9 +97,9 @@ public class RMv21BehaviorScriptsPatch extends RMv21PatchComponent implements Be // check that the behavior scripts folder exists if (!nodeService.exists(newBehaviorScriptsFolder)) { - if (logger.isDebugEnabled()) + if (LOGGER.isDebugEnabled()) { - logger.debug(" ... creating RM Behavior Scripts folder"); + LOGGER.debug(" ... creating RM Behavior Scripts folder"); } String newBehaviorScriptsFolderName = "Records Management Behavior Scripts"; @@ -137,9 +137,9 @@ public class RMv21BehaviorScriptsPatch extends RMv21PatchComponent implements Be if (oldBehaviorScripts != null && !oldBehaviorScripts.isEmpty()) { - if (logger.isDebugEnabled()) + if (LOGGER.isDebugEnabled()) { - logger.debug(" ... moving files from RM Scripts folder to RM Behavior Scripts folder"); + LOGGER.debug(" ... moving files from RM Scripts folder to RM Behavior Scripts folder"); } for (FileInfo script : oldBehaviorScripts) @@ -147,9 +147,9 @@ public class RMv21BehaviorScriptsPatch extends RMv21PatchComponent implements Be // move the old script to the new location fileFolderService.moveFrom(script.getNodeRef(), OLD_BEHAVIOR_SCRIPTS_FOLDER, RMv21BehaviorScriptsPatch.newBehaviorScriptsFolder, script.getName()); - if (logger.isDebugEnabled()) + if (LOGGER.isDebugEnabled()) { - logger.debug(" ...... moved " + script.getName()); + LOGGER.debug(" ...... moved " + script.getName()); } } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21CapabilityPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21CapabilityPatch.java index e8fa8c3c57..6bd9855bfa 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21CapabilityPatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21CapabilityPatch.java @@ -107,9 +107,9 @@ public class RMv21CapabilityPatch extends RMv21PatchComponent // only update if the capability is missing if (!capabilities.contains(capability)) { - if (logger.isDebugEnabled()) + if (LOGGER.isDebugEnabled()) { - logger.debug(" ... adding capability " + capabilityName + " to role " + role.getName()); + LOGGER.debug(" ... adding capability " + capabilityName + " to role " + role.getName()); } capabilities.add(capability); @@ -127,16 +127,16 @@ public class RMv21CapabilityPatch extends RMv21PatchComponent { Set filePlans = getFilePlans(); - if (logger.isDebugEnabled()) + if (LOGGER.isDebugEnabled()) { - logger.debug(" ... updating " + filePlans.size() + " file plans"); + LOGGER.debug(" ... updating " + filePlans.size() + " file plans"); } for (NodeRef filePlan : filePlans) { - if (logger.isDebugEnabled()) + if (LOGGER.isDebugEnabled()) { - logger.debug(" ... updating file plan " + filePlan.toString()); + LOGGER.debug(" ... updating file plan " + filePlan.toString()); } // add new capabilities diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21InPlacePatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21InPlacePatch.java index 338f333bbc..5ec24cdee3 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21InPlacePatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21InPlacePatch.java @@ -138,18 +138,18 @@ public class RMv21InPlacePatch extends RMv21PatchComponent { Set filePlans = filePlanService.getFilePlans(); - if (logger.isDebugEnabled()) + if (LOGGER.isDebugEnabled()) { - logger.debug(" ... updating " + filePlans.size() + " file plans"); + LOGGER.debug(" ... updating " + filePlans.size() + " file plans"); } for (NodeRef filePlan : filePlans) { if (filePlanService.getUnfiledContainer(filePlan) == null) { - if (logger.isDebugEnabled()) + if (LOGGER.isDebugEnabled()) { - logger.debug(" ... updating file plan " + filePlan.toString()); + LOGGER.debug(" ... updating file plan " + filePlan.toString()); } ruleService.disableRules(); @@ -194,9 +194,9 @@ public class RMv21InPlacePatch extends RMv21PatchComponent private void moveExistingHolds(NodeRef filePlan) { - if (logger.isDebugEnabled()) + if (LOGGER.isDebugEnabled()) { - logger.debug(" ... moving existing holds for file plan " + filePlan.toString()); + LOGGER.debug(" ... moving existing holds for file plan " + filePlan.toString()); } NodeRef container = filePlanService.getHoldContainer(filePlan); @@ -212,9 +212,9 @@ public class RMv21InPlacePatch extends RMv21PatchComponent private void moveExistingTransfers(NodeRef filePlan) { - if (logger.isDebugEnabled()) + if (LOGGER.isDebugEnabled()) { - logger.debug(" ... moving existing transfers for file plan " + filePlan.toString()); + LOGGER.debug(" ... moving existing transfers for file plan " + filePlan.toString()); } NodeRef container = filePlanService.getTransferContainer(filePlan); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21RecordInheritancePatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21RecordInheritancePatch.java index 12928267bb..a3d4d2f707 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21RecordInheritancePatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21RecordInheritancePatch.java @@ -109,9 +109,9 @@ public class RMv21RecordInheritancePatch extends RMv21PatchComponent { List records = patchDAO.getNodesByAspectQNameId(aspectPair.getFirst(), 0L, patchDAO.getMaxAdmNodeID()); - if (logger.isDebugEnabled()) + if (LOGGER.isDebugEnabled()) { - logger.debug(" ... updating " + records.size() + " records"); + LOGGER.debug(" ... updating " + records.size() + " records"); } for (Long record : records) @@ -119,9 +119,9 @@ public class RMv21RecordInheritancePatch extends RMv21PatchComponent Pair recordPair = nodeDAO.getNodePair(record); NodeRef recordNodeRef = recordPair.getSecond(); - if (logger.isDebugEnabled()) + if (LOGGER.isDebugEnabled()) { - logger.debug(" ... updating record " + recordNodeRef.toString()); + LOGGER.debug(" ... updating record " + recordNodeRef.toString()); // get the primary parent ChildAssociationRef assoc = nodeService.getPrimaryParent(recordNodeRef); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21ReportServicePatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21ReportServicePatch.java index 9bd6430897..b0faf61e34 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21ReportServicePatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21ReportServicePatch.java @@ -74,14 +74,14 @@ public class RMv21ReportServicePatch extends RMv21PatchComponent // check whether report dir exists or not if (nodeService.exists(RM_CONFIG_FOLDER) && !nodeService.exists(TEMPLATE_ROOT)) { - if (logger.isDebugEnabled()) + if (LOGGER.isDebugEnabled()) { - logger.debug(" ... adding template root folder"); + LOGGER.debug(" ... adding template root folder"); } - if (logger.isDebugEnabled()) + if (LOGGER.isDebugEnabled()) { - logger.debug(" ... adding destruction report template"); + LOGGER.debug(" ... adding destruction report template"); } // create report templates diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21RolesPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21RolesPatch.java index 404c2705b4..3ce9e325db 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21RolesPatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21RolesPatch.java @@ -71,9 +71,9 @@ public class RMv21RolesPatch extends RMv21PatchComponent implements BeanNameAwar { Set filePlans = filePlanService.getFilePlans(); - if (logger.isDebugEnabled()) + if (LOGGER.isDebugEnabled()) { - logger.debug(" ... updating " + filePlans.size() + " file plans"); + LOGGER.debug(" ... updating " + filePlans.size() + " file plans"); } for (NodeRef filePlan : filePlans) @@ -85,9 +85,9 @@ public class RMv21RolesPatch extends RMv21PatchComponent implements BeanNameAwar String roleGroupName = role.getRoleGroupName(); if (!authorityService.getAuthorityZones(roleGroupName).contains(RMAuthority.ZONE_APP_RM)) { - if (logger.isDebugEnabled()) + if (LOGGER.isDebugEnabled()) { - logger.debug(" ... updating " + roleGroupName + " in file plan " + filePlan.toString()); + LOGGER.debug(" ... updating " + roleGroupName + " in file plan " + filePlan.toString()); } addAuthorityToZone(roleGroupName);