From d5efeec83052ef19db1b68ba3c33d6c14debe0d3 Mon Sep 17 00:00:00 2001 From: Roxana Lucanu Date: Wed, 6 Apr 2016 17:52:38 +0300 Subject: [PATCH 1/5] RM-3030 - renamed variable and changed comment --- .../model/rma/aspect/FilePlanComponentAspect.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java index 9bbc8f4116..dae09b8673 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java @@ -235,14 +235,14 @@ public class FilePlanComponentAspect extends BaseBehaviourBean // If the node has any renditions, they inherit the file plan from their source node. List renditions = renditionService.getRenditions(nodeRef); - NodeRef thumbnail; + NodeRef rendition; for (ChildAssociationRef chAssRef : renditions) { - thumbnail = chAssRef.getChildRef(); - if (nodeService.exists(thumbnail)) + rendition = chAssRef.getChildRef(); + if (nodeService.exists(rendition)) { - // Apply file plan component aspect to thumbnail - nodeService.addAspect(thumbnail, ASPECT_FILE_PLAN_COMPONENT, null); + // Apply file plan component aspect to node's renditions + nodeService.addAspect(rendition, ASPECT_FILE_PLAN_COMPONENT, null); } } } From b208cf0c7cea8dd9a0d893a407c2d24850075cf7 Mon Sep 17 00:00:00 2001 From: gbroadbent Date: Tue, 12 Apr 2016 10:46:58 +0100 Subject: [PATCH 2/5] DUTCH: Fixed reverted "workflow" term" files as per EN bundle rev-2016-04-08 --- .../org_alfresco_module_rm/messages/actions_nl.properties | 2 +- .../alfresco/workflow/rm-workflow-messages_nl.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_nl.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_nl.properties index 96670bb10c..227f67b3b2 100755 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_nl.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_nl.properties @@ -104,7 +104,7 @@ reject.description=Hiermee wordt een record afgewezen en wordt het document naar reject.reason.display-label=Reden voor afwijzing # Request Information requestInfo.title=Informatie aanvragen -requestInfo.description=Hiermee wordt een werkstroom gestart voor het aanvragen van meer informatie over een record. +requestInfo.description=Hiermee wordt een workflow gestart voor het aanvragen van meer informatie over een record. # Execute script executeScript.title=Script uitvoeren executeScript.description=Hiermee wordt een script uitgevoerd. diff --git a/rm-community/rm-community-repo/config/alfresco/workflow/rm-workflow-messages_nl.properties b/rm-community/rm-community-repo/config/alfresco/workflow/rm-workflow-messages_nl.properties index cab8f8aeac..9786c3d3d1 100755 --- a/rm-community/rm-community-repo/config/alfresco/workflow/rm-workflow-messages_nl.properties +++ b/rm-community/rm-community-repo/config/alfresco/workflow/rm-workflow-messages_nl.properties @@ -4,8 +4,8 @@ activitiReviewPooled.workflow.email.subject=Informatie aangeleverd voor de recor activitiReviewPooled.workflow.email.body1=De gebruiker activitiReviewPooled.workflow.email.body2=heeft de vereiste informatie voor de record aangeleverd. -rmwf_workflowmodel.type.rmwf_workflowTask.title=Werkstroomtaak -rmwf_workflowmodel.type.rmwf_workflowTask.decription=Werkstroomtaak +rmwf_workflowmodel.type.rmwf_workflowTask.title=Workflowtaak +rmwf_workflowmodel.type.rmwf_workflowTask.decription=Workflowtaak rmwf_workflowmodel.property.rmwf_requestedInformation.title=Aangevraagde informatie rmwf_workflowmodel.property.rmwf_requestedInformation.decription=Aangevraagde informatie rmwf_workflowmodel.property.rmwf_message.title=Bericht From b2005355e398fbc60730829ac2baa63339be4cef Mon Sep 17 00:00:00 2001 From: Ana Bozianu Date: Tue, 12 Apr 2016 14:59:02 +0300 Subject: [PATCH 3/5] RM-3274 - fixed invalid AuthenticationUtil bean refference --- .../imap/default/default/rm-imap-server-context.xml | 2 +- .../org/alfresco/repo/imap/ExtendedImapServiceImpl.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/rm-community/rm-community-repo/config/alfresco/extension/subsystems/imap/default/default/rm-imap-server-context.xml b/rm-community/rm-community-repo/config/alfresco/extension/subsystems/imap/default/default/rm-imap-server-context.xml index 50c97563ad..f30a9cb9b0 100644 --- a/rm-community/rm-community-repo/config/alfresco/extension/subsystems/imap/default/default/rm-imap-server-context.xml +++ b/rm-community/rm-community-repo/config/alfresco/extension/subsystems/imap/default/default/rm-imap-server-context.xml @@ -6,7 +6,7 @@ - + diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/repo/imap/ExtendedImapServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/repo/imap/ExtendedImapServiceImpl.java index 7f1bcf315b..de5bd649aa 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/repo/imap/ExtendedImapServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/repo/imap/ExtendedImapServiceImpl.java @@ -54,12 +54,19 @@ public class ExtendedImapServiceImpl extends ImapServiceImpl this.dictionaryService = dictionaryService; } + public void setAuthenticationUtil(AuthenticationUtil authenticationUtil) + { + this.authenticationUtil = authenticationUtil; + } + + @Override public void setPolicyFilter(BehaviourFilter policyBehaviourFilter) { this.policyBehaviourFilter = policyBehaviourFilter; super.setPolicyFilter(policyBehaviourFilter); } + @Override public void setNodeService(NodeService nodeService) { this.nodeService = nodeService; From a36354820f22bbcf3bcf35a075d99a6db8b879a9 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Wed, 13 Apr 2016 09:06:16 +0100 Subject: [PATCH 4/5] Update version to 2.3.0.3. --- pom.xml | 2 +- rm-automation/pom.xml | 2 +- rm-server/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 0ed618218a..823c506548 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm-parent pom - 2.3.0.3-SNAPSHOT + 2.3.0.3 Alfresco Records Management http://www.alfresco.org/ diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 65ef201907..06b31abd9e 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -3,7 +3,7 @@ org.alfresco alfresco-rm-parent - 2.3.0.3-SNAPSHOT + 2.3.0.3 4.0.0 alfresco-rm-automation diff --git a/rm-server/pom.xml b/rm-server/pom.xml index 80067a3f68..c1f507803c 100644 --- a/rm-server/pom.xml +++ b/rm-server/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-rm-parent - 2.3.0.3-SNAPSHOT + 2.3.0.3 4.0.0 alfresco-rm-server From fd6ba15eac7423ec51dc0cf504b589adf182ffa1 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Wed, 13 Apr 2016 09:07:57 +0100 Subject: [PATCH 5/5] Update version to 2.3.0.4-SNAPSHOT. --- pom.xml | 2 +- rm-automation/pom.xml | 2 +- .../alfresco/module/org_alfresco_module_rm/module.properties | 2 +- rm-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 823c506548..5c3cc82443 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm-parent pom - 2.3.0.3 + 2.3.0.4-SNAPSHOT Alfresco Records Management http://www.alfresco.org/ diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 06b31abd9e..d4cd98b4f6 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -3,7 +3,7 @@ org.alfresco alfresco-rm-parent - 2.3.0.3 + 2.3.0.4-SNAPSHOT 4.0.0 alfresco-rm-automation diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties index 93687cac16..66e12dcdfc 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties @@ -6,6 +6,6 @@ module.aliases=org_alfresco_module_dod5015 module.title=Records Management module.description=Alfresco Record Management Extension -module.version=2.3.0.3 +module.version=2.3.0.4 module.repo.version.min=4.2.2 \ No newline at end of file diff --git a/rm-server/pom.xml b/rm-server/pom.xml index c1f507803c..d97aebcbab 100644 --- a/rm-server/pom.xml +++ b/rm-server/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-rm-parent - 2.3.0.3 + 2.3.0.4-SNAPSHOT 4.0.0 alfresco-rm-server