From 4615d25c78b01fd3aa8b10b528be316f00e15264 Mon Sep 17 00:00:00 2001 From: Roy Wetherall Date: Wed, 16 Oct 2013 04:35:48 +0000 Subject: [PATCH] RM-1071: Impossible to create folder after upgrade: Access Denied * consolidate loggers for RM module patches to aid debug * use log4j.logger.org.alfresco.module.org_alfresco_module_rm.patch=debug git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@56718 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../patch/ModulePatchComponent.java | 9 +++++--- .../patch/NotificationTemplatePatch.java | 7 ------ .../patch/RMv21BehaviorScriptsPatch.java | 23 ++++++++++++------- .../patch/RMv21CapabilityPatch.java | 7 +----- .../patch/RMv21InPlacePatch.java | 5 ---- .../patch/RMv21RecordInheritancePatch.java | 8 +------ .../patch/RMv21ReportServicePatch.java | 6 +---- .../patch/RMv21RolesPatch.java | 13 +++++++---- .../patch/RMv2FilePlanNodeRefPatch.java | 7 +----- .../patch/RMv2ModelPatch.java | 5 ---- .../patch/RMv2RMAdminUserPatch.java | 5 ---- .../patch/RMv2SavedSearchPatch.java | 7 +----- 12 files changed, 34 insertions(+), 68 deletions(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/ModulePatchComponent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/ModulePatchComponent.java index d0d1ef0684..b3bfaa10dd 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/ModulePatchComponent.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/ModulePatchComponent.java @@ -91,15 +91,18 @@ public abstract class ModulePatchComponent extends AbstractModuleComponent }, false, true); - if (logger.isDebugEnabled() == true) + if (logger.isInfoEnabled() == true) { - logger.debug(" ... completed module patch '" + getName() + "'"); + logger.info(" ... completed module patch '" + getName() + "'"); } } catch (Throwable exception) { // record the exception otherwise it gets swallowed - exception.printStackTrace(); + if (logger.isInfoEnabled() == true) + { + logger.info(" ... error encountered. " + exception.getMessage(), exception); + } throw exception; } } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/NotificationTemplatePatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/NotificationTemplatePatch.java index 08acae35de..82ee7714c0 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/NotificationTemplatePatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/NotificationTemplatePatch.java @@ -36,8 +36,6 @@ import org.alfresco.service.cmr.version.VersionService; import org.alfresco.service.cmr.version.VersionType; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.BeanNameAware; /** @@ -52,9 +50,6 @@ public class NotificationTemplatePatch extends ModulePatchComponent private static final String PATH_DUE_FOR_REVIEW = "alfresco/module/org_alfresco_module_rm/bootstrap/content/notify-records-due-for-review-email.ftl"; private static final String PATH_SUPERSEDED = "alfresco/module/org_alfresco_module_rm/bootstrap/content/record-superseded-email.ftl"; - /** Logger */ - private static Log logger = LogFactory.getLog(NotificationTemplatePatch.class); - /** Records management notification helper */ private RecordsManagementNotificationHelper notificationHelper; @@ -152,8 +147,6 @@ public class NotificationTemplatePatch extends ModulePatchComponent } else { - System.out.println(nodeService.getProperty(template, ContentModel.PROP_DESCRIPTION)); - // Check to see if this template has already been updated String lastPatchUpdate = (String)nodeService.getProperty(template, PROP_LAST_PATCH_UPDATE); if (lastPatchUpdate == null || name.equals(lastPatchUpdate) == false) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21BehaviorScriptsPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21BehaviorScriptsPatch.java index 6eebbe6eee..77990a6850 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21BehaviorScriptsPatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21BehaviorScriptsPatch.java @@ -34,8 +34,6 @@ import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.BeanNameAware; /** @@ -47,10 +45,7 @@ import org.springframework.beans.factory.BeanNameAware; * @since 2.1 */ public class RMv21BehaviorScriptsPatch extends ModulePatchComponent implements BeanNameAware -{ - /** logger */ - private static Log logger = LogFactory.getLog(RMv21BehaviorScriptsPatch.class); - +{ /** rm config folder root lookup */ protected static final NodeRef RM_CONFIG = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, "rm_config_folder"); @@ -59,6 +54,9 @@ public class RMv21BehaviorScriptsPatch extends ModulePatchComponent implements B /** new behavior scripts folder root lookup */ protected static NodeRef newBehaviorScriptsFolder = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, "rm_behavior_scripts"); + + /** name of example script */ + protected static final String IS_CLOSED_JS = "rma_isClosed.js"; /** Node Service */ private NodeService nodeService; @@ -66,17 +64,25 @@ public class RMv21BehaviorScriptsPatch extends ModulePatchComponent implements B /** File Folder Service */ private FileFolderService fileFolderService; + /** + * @param nodeService node service + */ public void setNodeService(NodeService nodeService) { this.nodeService = nodeService; } + /** + * @param fileFolderService file folder service + */ public void setFileFolderService(FileFolderService fileFolderService) { this.fileFolderService = fileFolderService; } - + /** + * @see org.alfresco.module.org_alfresco_module_rm.patch.ModulePatchComponent#executePatch() + */ @Override protected void executePatch() throws Throwable { @@ -113,7 +119,6 @@ public class RMv21BehaviorScriptsPatch extends ModulePatchComponent implements B // move to the new behavior scripts folder if the old behavior scripts folder exists and contains files if (nodeService.exists(OLD_BEHAVIOR_SCRIPTS_FOLDER) == true) { - // run the following code as System AuthenticationUtil.runAs(new RunAsWork() { @@ -138,6 +143,7 @@ public class RMv21BehaviorScriptsPatch extends ModulePatchComponent implements B for (FileInfo script : oldBehaviorScripts) { + // move the old script to the new location fileFolderService.moveFrom(script.getNodeRef(), OLD_BEHAVIOR_SCRIPTS_FOLDER, RMv21BehaviorScriptsPatch.newBehaviorScriptsFolder, script.getName()); if (logger.isDebugEnabled() == true) @@ -145,6 +151,7 @@ public class RMv21BehaviorScriptsPatch extends ModulePatchComponent implements B logger.debug(" ...... moved " + script.getName()); } } + } return null; } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21CapabilityPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21CapabilityPatch.java index 100a458ffe..f1875fd273 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21CapabilityPatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21CapabilityPatch.java @@ -29,8 +29,6 @@ import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; import org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService; import org.alfresco.module.org_alfresco_module_rm.role.Role; import org.alfresco.service.cmr.repository.NodeRef; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.BeanNameAware; /** @@ -41,10 +39,7 @@ import org.springframework.beans.factory.BeanNameAware; */ public class RMv21CapabilityPatch extends ModulePatchComponent implements BeanNameAware, RecordsManagementModel, DOD5015Model -{ - /** Logger */ - private static Log logger = LogFactory.getLog(RMv21CapabilityPatch.class); - +{ /** file plan service */ private FilePlanService filePlanService; diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21InPlacePatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21InPlacePatch.java index 1a1923dfa4..83d3e842c6 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21InPlacePatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21InPlacePatch.java @@ -39,8 +39,6 @@ import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.rule.RuleService; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.BeanNameAware; /** @@ -67,9 +65,6 @@ public class RMv21InPlacePatch extends ModulePatchComponent "EditNonRecordMetadata" }; - /** Logger */ - private static Log logger = LogFactory.getLog(RMv21InPlacePatch.class); - /** file plan role service */ private FilePlanRoleService filePlanRoleService; diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21RecordInheritancePatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21RecordInheritancePatch.java index 56a11d907f..362780261b 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21RecordInheritancePatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21RecordInheritancePatch.java @@ -31,8 +31,6 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.namespace.QName; import org.alfresco.util.Pair; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.BeanNameAware; /** @@ -43,11 +41,7 @@ import org.springframework.beans.factory.BeanNameAware; */ public class RMv21RecordInheritancePatch extends ModulePatchComponent implements BeanNameAware, RecordsManagementModel, DOD5015Model -{ - - /** logger */ - private static Log logger = LogFactory.getLog(RMv21RecordInheritancePatch.class); - +{ /** file plan permission service */ private FilePlanPermissionServiceImpl filePlanPermissionServiceImpl; diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21ReportServicePatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21ReportServicePatch.java index 4e518de474..6c05d61354 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21ReportServicePatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21ReportServicePatch.java @@ -32,8 +32,6 @@ import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.BeanNameAware; /** @@ -50,12 +48,10 @@ public class RMv21ReportServicePatch extends ModulePatchComponent private static final String PATH_DESTRUCTION_TEMPLATE = "alfresco/module/org_alfresco_module_rm/bootstrap/report/report_rmr_destructionReport.html.ftl"; - /** logger */ - private static Log logger = LogFactory.getLog(RMv21ReportServicePatch.class); - /** node service */ private NodeService nodeService; + /** content service */ private ContentService contentService; /** diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21RolesPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21RolesPatch.java index bb172e810e..aa45d143c2 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21RolesPatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21RolesPatch.java @@ -28,8 +28,6 @@ import org.alfresco.module.org_alfresco_module_rm.role.Role; import org.alfresco.repo.security.authority.RMAuthority; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.security.AuthorityService; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.BeanNameAware; /** @@ -40,11 +38,13 @@ import org.springframework.beans.factory.BeanNameAware; */ public class RMv21RolesPatch extends ModulePatchComponent implements BeanNameAware { - /** logger */ - private static Log logger = LogFactory.getLog(RMv21RolesPatch.class); - + /** file plan service */ private FilePlanService filePlanService; + + /** file plan role service */ private FilePlanRoleService filePlanRoleService; + + /** authority service */ private AuthorityService authorityService; public void setFilePlanService(FilePlanService filePlanService) @@ -62,6 +62,9 @@ public class RMv21RolesPatch extends ModulePatchComponent implements BeanNameAwa this.authorityService = authorityService; } + /** + * @see org.alfresco.module.org_alfresco_module_rm.patch.ModulePatchComponent#executePatch() + */ @Override protected void executePatch() throws Throwable { diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2FilePlanNodeRefPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2FilePlanNodeRefPatch.java index 463ececd9d..e3d50124ac 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2FilePlanNodeRefPatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2FilePlanNodeRefPatch.java @@ -37,8 +37,6 @@ import org.alfresco.service.cmr.repository.Period; import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.namespace.QName; import org.alfresco.util.Pair; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.BeanNameAware; /** @@ -48,10 +46,7 @@ import org.springframework.beans.factory.BeanNameAware; */ public class RMv2FilePlanNodeRefPatch extends ModulePatchComponent implements BeanNameAware, RecordsManagementModel, DOD5015Model -{ - /** Logger */ - private static Log logger = LogFactory.getLog(RMv2FilePlanNodeRefPatch.class); - +{ private NodeService nodeService; private PatchDAO patchDAO; private NodeDAO nodeDAO; diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2ModelPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2ModelPatch.java index d936289906..f142d9b972 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2ModelPatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2ModelPatch.java @@ -28,8 +28,6 @@ import org.alfresco.repo.domain.qname.QNameDAO; import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.service.namespace.QName; import org.alfresco.util.Pair; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.BeanNameAware; /** @@ -41,9 +39,6 @@ import org.springframework.beans.factory.BeanNameAware; public class RMv2ModelPatch extends ModulePatchComponent implements BeanNameAware, RecordsManagementModel, DOD5015Model { - /** Logger */ - private static Log logger = LogFactory.getLog(RMv2ModelPatch.class); - private static long BATCH_SIZE = 100000L; private PatchDAO patchDAO; diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2RMAdminUserPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2RMAdminUserPatch.java index bd63231482..b39867284c 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2RMAdminUserPatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2RMAdminUserPatch.java @@ -32,8 +32,6 @@ import org.alfresco.service.cmr.security.MutableAuthenticationService; import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.namespace.QName; import org.alfresco.util.GUID; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.BeanNameAware; import org.springframework.extensions.surf.util.I18NUtil; @@ -47,9 +45,6 @@ public class RMv2RMAdminUserPatch extends ModulePatchComponent implements BeanNa /** I18N */ private static final String MSG_FIRST_NAME = "bootstrap.rmadmin.firstName"; private static final String MSG_LAST_NAME = "bootstrap.rmadmin.lastName"; - - /** Logger */ - private static Log logger = LogFactory.getLog(RMv2RMAdminUserPatch.class); /** generate rm admin password */ private String password = GUID.generate(); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2SavedSearchPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2SavedSearchPatch.java index 48333f62bc..31ee3ce95d 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2SavedSearchPatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2SavedSearchPatch.java @@ -25,8 +25,6 @@ import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchService; import org.alfresco.module.org_alfresco_module_rm.search.SavedSearchDetails; import org.alfresco.service.cmr.site.SiteService; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.BeanNameAware; /** @@ -37,10 +35,7 @@ import org.springframework.beans.factory.BeanNameAware; */ public class RMv2SavedSearchPatch extends ModulePatchComponent implements BeanNameAware, RecordsManagementModel, DOD5015Model -{ - /** Logger */ - private static Log logger = LogFactory.getLog(RMv2SavedSearchPatch.class); - +{ /** RM site id */ private static final String RM_SITE_ID = "rm";