From ba16a446517c45e24cfa5364858074d69c6b4747 Mon Sep 17 00:00:00 2001 From: Roy Wetherall Date: Thu, 21 Mar 2013 08:03:32 +0000 Subject: [PATCH] RM: Remove some more deprecation warnings git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@48442 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org_alfresco_module_rm/rm-action-context.xml | 3 +++ .../rm-service-context.xml | 5 +++-- .../rm-webscript-context.xml | 1 + .../action/impl/FileToAction.java | 14 +++++++++++++- .../action/impl/TransferAction.java | 14 +++++++++++++- .../capability/RMSecurityCommon.java | 1 - .../freeze/FreezeServiceImpl.java | 14 +++++++++++++- .../jscript/app/JSONConversionComponent.java | 2 +- .../model/security/ModelSecurityServiceImpl.java | 16 ++++++++-------- .../RecordsManagementNotificationHelper.java | 12 ++++++------ .../script/ImportPost.java | 12 +++++++++++- 11 files changed, 72 insertions(+), 22 deletions(-) diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml index 3c9fed2c1c..4c47f237de 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml @@ -574,6 +574,7 @@ + @@ -617,6 +618,7 @@ + @@ -698,6 +700,7 @@ + diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml index af625eeddf..05cf1464ae 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml @@ -666,7 +666,7 @@ - + @@ -947,6 +947,7 @@ + @@ -1271,7 +1272,7 @@ - + diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml index aee66f263a..f020ed05ca 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml @@ -227,6 +227,7 @@ + diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FileToAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FileToAction.java index 28f767d845..ab371d262d 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FileToAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FileToAction.java @@ -6,6 +6,7 @@ import java.util.List; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.module.org_alfresco_module_rm.action.RMActionExecuterAbstractBase; +import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService; import org.alfresco.repo.action.ParameterDefinitionImpl; import org.alfresco.service.cmr.action.Action; import org.alfresco.service.cmr.action.ParameterDefinition; @@ -36,6 +37,9 @@ public class FileToAction extends RMActionExecuterAbstractBase /** file folder service */ private FileFolderService fileFolderService; + /** file plan service */ + private FilePlanService filePlanService; + /** * @param fileFolderService file folder service */ @@ -44,6 +48,14 @@ public class FileToAction extends RMActionExecuterAbstractBase this.fileFolderService = fileFolderService; } + /** + * @param filePlanService file plan service + */ + public void setFilePlanService(FilePlanService filePlanService) + { + this.filePlanService = filePlanService; + } + /** * @see org.alfresco.module.org_alfresco_module_rm.action.RMActionExecuterAbstractBase#addParameterDefinitions(java.util.List) */ @@ -113,7 +125,7 @@ public class FileToAction extends RMActionExecuterAbstractBase { // TODO check the action for a context node reference // the file plan node always provides the context - NodeRef context = recordsManagementService.getFilePlan(actionedUponNodeRef); + NodeRef context = filePlanService.getFilePlan(actionedUponNodeRef); if (context == null) { throw new AlfrescoRuntimeException("Unable to execute fileTo action, because the path resolution context could not be found."); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferAction.java index 0391807ee7..054e0af853 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferAction.java @@ -28,6 +28,7 @@ import org.alfresco.model.ContentModel; import org.alfresco.module.org_alfresco_module_rm.action.RMDispositionActionExecuterAbstractBase; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionAction; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionActionDefinition; +import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService; import org.alfresco.repo.action.executer.ActionExecuter; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.transaction.AlfrescoTransactionSupport; @@ -56,6 +57,17 @@ public class TransferAction extends RMDispositionActionExecuterAbstractBase /** Indicates whether the transfer is an accession or not */ private boolean isAccession = false; + /** File plan service */ + private FilePlanService filePlanService; + + /** + * @param filePlanService file plan service + */ + public void setFilePlanService(FilePlanService filePlanService) + { + this.filePlanService = filePlanService; + } + /** * Indicates whether this transfer is an accession or not * @@ -103,7 +115,7 @@ public class TransferAction extends RMDispositionActionExecuterAbstractBase private void doTransfer(Action action, NodeRef dispositionLifeCycleNodeRef) { // Get the root rm node - NodeRef root = this.recordsManagementService.getFilePlan(dispositionLifeCycleNodeRef); + NodeRef root = filePlanService.getFilePlan(dispositionLifeCycleNodeRef); // Get the transfer object NodeRef transferNodeRef = (NodeRef)AlfrescoTransactionSupport.getResource(KEY_TRANSFER_NODEREF); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMSecurityCommon.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMSecurityCommon.java index a02fc646d5..9ebada37c5 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMSecurityCommon.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMSecurityCommon.java @@ -23,7 +23,6 @@ import net.sf.acegisecurity.vote.AccessDecisionVoter; import org.alfresco.module.org_alfresco_module_rm.RecordsManagementService; import org.alfresco.module.org_alfresco_module_rm.caveat.RMCaveatConfigComponent; import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService; -import org.alfresco.module.org_alfresco_module_rm.record.RecordService; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.transaction.AlfrescoTransactionSupport; import org.alfresco.service.cmr.repository.NodeRef; diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java index ee80881990..694dcddc44 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java @@ -29,6 +29,7 @@ import java.util.Set; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; import org.alfresco.module.org_alfresco_module_rm.RecordsManagementService; +import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService; import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; import org.alfresco.module.org_alfresco_module_rm.record.RecordService; import org.alfresco.repo.node.NodeServicePolicies; @@ -86,6 +87,9 @@ public class FreezeServiceImpl implements FreezeService, /** Record service */ private RecordService recordService; + + /** File Plan Service */ + private FilePlanService filePlanService; /** * @param policyComponent policy component @@ -126,6 +130,14 @@ public class FreezeServiceImpl implements FreezeService, { this.recordService = recordService; } + + /** + * @param filePlanService file plan service + */ + public void setFilePlanService(FilePlanService filePlanService) + { + this.filePlanService = filePlanService; + } /** * Init service @@ -588,7 +600,7 @@ public class FreezeServiceImpl implements FreezeService, holdProps.put(PROP_HOLD_REASON, reason); // Get the root rm node and create the hold object - NodeRef root = recordsManagementService.getFilePlan(nodeRef); + NodeRef root = filePlanService.getFilePlan(nodeRef); QName transferQName = QName.createQName(RM_URI, transferName); holdNodeRef = nodeService.createNode(root, ASSOC_HOLDS, transferQName, TYPE_HOLD, holdProps).getChildRef(); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java index 4bac393f31..43f46f27d5 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java @@ -154,7 +154,7 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JSONC rmNodeValues.put("kind", kind.toString()); // File plan node reference - NodeRef filePlan = recordsManagementService.getFilePlan(nodeRef); + NodeRef filePlan = filePlanService.getFilePlan(nodeRef); rmNodeValues.put("filePlan", filePlan.toString()); // Unfiled container node reference diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ModelSecurityServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ModelSecurityServiceImpl.java index 88c922d565..9e0f85a4b3 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ModelSecurityServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ModelSecurityServiceImpl.java @@ -24,8 +24,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.alfresco.module.org_alfresco_module_rm.RecordsManagementService; import org.alfresco.module.org_alfresco_module_rm.capability.Capability; +import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService; import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; import org.alfresco.repo.node.NodeServicePolicies; import org.alfresco.repo.policy.JavaBehaviour; @@ -65,9 +65,9 @@ public class ModelSecurityServiceImpl implements ModelSecurityService, /** Namespace service */ private NamespaceService namespaceService; - - /** Records management service */ - private RecordsManagementService recordsManagementService; + + /** File plan service */ + private FilePlanService filePlanService; /** Map of protected properties keyed by name */ private Map protectedProperties = new HashMap(21); @@ -127,11 +127,11 @@ public class ModelSecurityServiceImpl implements ModelSecurityService, } /** - * @param recordsManagementService records management service + * @param filePlanService file plan service */ - public void setRecordsManagementService(RecordsManagementService recordsManagementService) + public void setFilePlanService(FilePlanService filePlanService) { - this.recordsManagementService = recordsManagementService; + this.filePlanService = filePlanService; } /** @@ -232,7 +232,7 @@ public class ModelSecurityServiceImpl implements ModelSecurityService, { boolean result = false; - NodeRef filePlan = recordsManagementService.getFilePlan(nodeRef); + NodeRef filePlan = filePlanService.getFilePlan(nodeRef); if (filePlan != null) { for (Capability capability : artifact.getCapabilities()) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/notification/RecordsManagementNotificationHelper.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/notification/RecordsManagementNotificationHelper.java index 65306483d4..ed0437504d 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/notification/RecordsManagementNotificationHelper.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/notification/RecordsManagementNotificationHelper.java @@ -27,7 +27,7 @@ import java.util.Set; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; -import org.alfresco.module.org_alfresco_module_rm.RecordsManagementService; +import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService; 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; @@ -74,7 +74,6 @@ public class RecordsManagementNotificationHelper implements RecordsManagementMod /** Services */ private NotificationService notificationService; - private RecordsManagementService recordsManagementService; private FilePlanRoleService filePlanRoleService; private SearchService searchService; private NamespaceService namespaceService; @@ -82,6 +81,7 @@ public class RecordsManagementNotificationHelper implements RecordsManagementMod private AuthorityService authorityService; private TenantAdminService tenantAdminService; private NodeService nodeService; + private FilePlanService filePlanService; /** Notification role */ private String notificationRole; @@ -100,11 +100,11 @@ public class RecordsManagementNotificationHelper implements RecordsManagementMod } /** - * @param recordsManagementService rm service + * @param filePlanService file plan service */ - public void setRecordsManagementService(RecordsManagementService recordsManagementService) + public void setFilePlanService(FilePlanService filePlanService) { - this.recordsManagementService = recordsManagementService; + this.filePlanService = filePlanService; } /** @@ -398,7 +398,7 @@ public class RecordsManagementNotificationHelper implements RecordsManagementMod @Override public NodeRef doWork() throws Exception { - return recordsManagementService.getFilePlan(context); + return filePlanService.getFilePlan(context); } }, AuthenticationUtil.getSystemUserName()); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/ImportPost.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/ImportPost.java index 7c40fa21e4..0b2c9c6b7a 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/ImportPost.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/ImportPost.java @@ -29,6 +29,7 @@ import javax.servlet.http.HttpServletResponse; import org.alfresco.model.ContentModel; import org.alfresco.module.org_alfresco_module_rm.RecordsManagementService; +import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService; import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; import org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService; import org.alfresco.repo.exporter.ACPExportPackageHandler; @@ -73,6 +74,7 @@ public class ImportPost extends DeclarativeWebScript protected ImporterService importerService; protected RecordsManagementService rmService; protected FilePlanRoleService filePlanRoleService; + protected FilePlanService filePlanService; /** * @param nodeService @@ -120,6 +122,14 @@ public class ImportPost extends DeclarativeWebScript this.rmService = rmService; } + /** + * @param filePlanService file plan service + */ + public void setFilePlanService(FilePlanService filePlanService) + { + this.filePlanService = filePlanService; + } + @Override protected Map executeImpl(WebScriptRequest req, Status status, Cache cache) { @@ -178,7 +188,7 @@ public class ImportPost extends DeclarativeWebScript // the DM admin user (meaning the webscript 'admin' authentication can't be used) // perform a manual check here to ensure the current user has the RM admin role. boolean isAdmin = filePlanRoleService.hasRMAdminRole( - this.rmService.getFilePlan(destination), + filePlanService.getFilePlan(destination), AuthenticationUtil.getRunAsUser()); if (!isAdmin) {