From 050e02184bf258c6a745c13942e1ea10ac99931c Mon Sep 17 00:00:00 2001 From: Silviu Dinuta Date: Fri, 8 Jul 2016 13:04:08 +0300 Subject: [PATCH 1/6] RM-3643: Added a patch for adding newly introduced aspect to authorities that have marks. This will be applied from 2.5-EA1 to latest versions --- .../module/org_alfresco_module_rm/patch/rm-patch-context.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml index 95f4003fe2..c59658b435 100755 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml @@ -9,7 +9,7 @@ - + From db64bfd6144f2d9e573ffcf46ea8309aa34f0e52 Mon Sep 17 00:00:00 2001 From: Silviu Dinuta Date: Wed, 13 Jul 2016 15:48:04 +0300 Subject: [PATCH 2/6] RM-3643: modified patch configuration after separating db schemas --- .../module/org_alfresco_module_rm/patch/rm-patch-context.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml index c59658b435..95f4003fe2 100755 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml @@ -9,7 +9,7 @@ - + From ade55de992345630e724fe2853a31a3f703443e7 Mon Sep 17 00:00:00 2001 From: Ana Bozianu Date: Thu, 28 Jul 2016 10:20:24 +0300 Subject: [PATCH 3/6] RM-3708 - replaced authentication service with person service --- .../org_alfresco_module_rm/rm-job-context.xml | 2 +- .../job/DispositionLifecycleJobExecuter.java | 14 +++++++------- .../job/RecordsManagementJob.java | 4 +--- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-job-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-job-context.xml index 44bd92fe34..fb5701337d 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-job-context.xml +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-job-context.xml @@ -85,7 +85,7 @@ - + diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java index aadbbf6f19..8a972fba52 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java @@ -43,7 +43,7 @@ import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.search.ResultSet; import org.alfresco.service.cmr.search.SearchService; -import org.alfresco.service.cmr.security.AuthenticationService; +import org.alfresco.service.cmr.security.PersonService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -74,8 +74,8 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute /** search service */ private SearchService searchService; - /** authenticationService service */ - private AuthenticationService authenticationService; + /** person service */ + private PersonService personService; /** * List of disposition actions to automatically execute when eligible. @@ -241,13 +241,13 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute } } - public AuthenticationService getAuthenticationService() + public PersonService getPersonService() { - return authenticationService; + return personService; } - public void setAuthenticationService(AuthenticationService authenticationService) + public void setPersonService(PersonService personService) { - this.authenticationService = authenticationService; + this.personService = personService; } } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/RecordsManagementJob.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/RecordsManagementJob.java index a1dc0c3a65..61f1d9caad 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/RecordsManagementJob.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/RecordsManagementJob.java @@ -129,10 +129,8 @@ public class RecordsManagementJob implements Job if (jobExecuter instanceof DispositionLifecycleJobExecuter) { String auditUser = (String) context.getJobDetail().getJobDataMap().get("runAuditAs"); - if (((DispositionLifecycleJobExecuter) jobExecuter).getAuthenticationService() - .authenticationExists(auditUser)) + if (((DispositionLifecycleJobExecuter) jobExecuter).getPersonService().getPersonOrNull(auditUser) != null) { - setRunAuditAs(auditUser); } else From d988e9506691d07a01109ec66fd0010a93f0afd5 Mon Sep 17 00:00:00 2001 From: Roy Wetherall Date: Thu, 4 Aug 2016 08:15:30 +1000 Subject: [PATCH 4/6] Add information to README file about outlook integration profile --- README.txt | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/README.txt b/README.txt index bbac5c8f0c..b9362315b3 100644 --- a/README.txt +++ b/README.txt @@ -32,7 +32,6 @@ Configuring a different DB other than H2 (e.g. MySQL or PostgreSQL): mvn clean install -Pstart-repo,use-mysql - Running integration test: ------------------------- @@ -69,6 +68,23 @@ The latest Aikau snapshot can be pulled by running the following command in rm-c Thereafter start the Share instance and run automation tests as described above. +Configuring Outlook Integration: +------------------------------- + +To download and run RM with the Outlook Integration AMPs installed on the repo and Share use the following commands: + + mvn clean install -Pstart-repo,outlook-integration + mvn clean install -Pstart-share,outlook-integration + +Follow these instructions install licence and Outlook plugin: + + - http://docs.alfresco.com/outlook2.1/tasks/Outlook-license.html + - http://docs.alfresco.com/outlook2.1/tasks/Outlook-install_v2.html + + + + + SNAPSHOT dependencies: ---------------------- From 222af4d6511848dcdfbe99b28dc82d86b8486faa Mon Sep 17 00:00:00 2001 From: Tom Page Date: Mon, 8 Aug 2016 10:10:34 +0100 Subject: [PATCH 5/6] Update version to 2.3.0.6. --- pom.xml | 2 +- rm-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 227f21c7ad..7dd4fc55fc 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm-parent pom - 2.3.0.6-SNAPSHOT + 2.3.0.6 Alfresco Records Management http://www.alfresco.org/ diff --git a/rm-server/pom.xml b/rm-server/pom.xml index 67736697db..579a25d455 100644 --- a/rm-server/pom.xml +++ b/rm-server/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-rm-parent - 2.3.0.6-SNAPSHOT + 2.3.0.6 4.0.0 alfresco-rm-server From 0ea9fa7360bcfe4562934db260835ea27a28b678 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Mon, 8 Aug 2016 11:15:39 +0100 Subject: [PATCH 6/6] Update version to 2.3.0.7-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 7dd4fc55fc..06cc4d693c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm-parent pom - 2.3.0.6 + 2.3.0.7-SNAPSHOT Alfresco Records Management http://www.alfresco.org/ diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index ae3e5aa022..f9f625308f 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -3,7 +3,7 @@ org.alfresco alfresco-rm-parent - 2.3.0.6-SNAPSHOT + 2.3.0.7-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 6ba5887b4e..cfbab867b6 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.6 +module.version=2.3.0.7 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 579a25d455..15f37cc054 100644 --- a/rm-server/pom.xml +++ b/rm-server/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-rm-parent - 2.3.0.6 + 2.3.0.7-SNAPSHOT 4.0.0 alfresco-rm-server