Merge master into feature/RM-3512_QueryForAuthorities

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:
 ----------------------
 

rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-job-context.xml

@@ -85,7 +85,7 @@
 
       <property name="nodeService" ref="nodeService" />
       <property name="searchService" ref="searchService" />
-      <property name="authenticationService" ref="authenticationService" />
+      <property name="personService" ref="personService" />
       <property name="recordsManagementActionService" ref="recordsManagementActionService" />
    </bean>
 

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;
     }
 }

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