From c09a3731eecc545a4bad93216186e7f5cb429563 Mon Sep 17 00:00:00 2001
From: Andreea Dragoi <andreea.dragoi@ness.com>
Date: Tue, 13 Oct 2015 13:32:34 +0000
Subject: [PATCH 01/23] RM-2522 : Select "Download Zip" (rm-download-zip) on RM
 Transfer Target inside RM Transfer view throws 400 Bad Request: Node is not
 fileplan    - used isFilePlan method from FilePlanService instead of old
 check

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@114258 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../org_alfresco_module_rm/script/BaseTransferWebScript.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java
index 60398a4d44..3304648aa3 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java
@@ -104,7 +104,7 @@ public abstract class BaseTransferWebScript extends StreamACP
             }
 
             // ensure the node is a filePlan object
-            if (!TYPE_FILE_PLAN.equals(this.nodeService.getType(filePlan)))
+            if (!filePlanService.isFilePlan(filePlan))
             {
                 status.setCode(HttpServletResponse.SC_BAD_REQUEST,
                             "Node " + filePlan.toString() + " is not a file plan");

From 670ca476a470957331950d32a0d55a38b0fafd93 Mon Sep 17 00:00:00 2001
From: Alexandru Balmus <alexandru.balmus@ness.com>
Date: Thu, 15 Oct 2015 13:18:14 +0000
Subject: [PATCH 02/23] Merged DEV to V2.2.1.x    114241: MNT-14900 : Alfresco
 doesn't work with Records Management       - Fixed problem with circular
 references during Spring dependency injection process

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@114437 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../extended-repository-context.xml           |  3 +-
 .../rm-service-context.xml                    |  3 +-
 .../role/FilePlanRoleServiceImpl.java         | 30 ++++++++++++++++---
 .../action/ExtendedActionServiceImpl.java     | 12 +++++++-
 4 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml
index 2b10615154..c0fb9ec36d 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml
@@ -145,7 +145,8 @@
    <!-- Action Service -->
    <bean id="actionService" class="org.alfresco.repo.action.ExtendedActionServiceImpl" init-method="init">
 
-   		<property name="filePlanService" ref="FilePlanService" />
+        <!-- The following reference injection has been commented out to address MNT-14900; dependency is resolved internally. -->
+        <!-- <property name="filePlanService" ref="FilePlanService" /> -->
 
         <property name="policyComponent">
             <ref bean="policyComponent" />
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 6de002f343..ad4a1a7ac9 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
@@ -501,7 +501,8 @@
         <property name="authorityService" ref="AuthorityService"/>
         <property name="permissionService" ref="PermissionService"/>
         <property name="nodeService" ref="NodeService"/>
-        <property name="filePlanService" ref="FilePlanService" />
+        <!-- The following reference injection has been commented out to address MNT-14900; dependency is resolved internally. -->
+        <!-- <property name="filePlanService" ref="FilePlanService" /> -->
         <!-- init repo for when a tenant is created -->
         <property name="bootstrapImporterModuleComponent" ref="org_alfresco_module_rm_bootstrapData"/>
 
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java
index 2ef8b753d8..1000908aca 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java
@@ -53,6 +53,9 @@ import org.apache.commons.lang.StringUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
 import org.springframework.extensions.surf.util.I18NUtil;
 
 /**
@@ -62,7 +65,8 @@ import org.springframework.extensions.surf.util.I18NUtil;
  * @since 2.1
  */
 public class FilePlanRoleServiceImpl implements FilePlanRoleService,
-                                                RecordsManagementModel
+                                                RecordsManagementModel,
+                                                ApplicationContextAware
 {
     /** I18N */
     private static final String MSG_ALL_ROLES = "rm.role.all";
@@ -93,6 +97,8 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
 
     private BootstrapImporterModuleComponent bootstrapImporterModule;
 
+    private ApplicationContext applicationContext;
+
     /** Records management role zone */
     public static final String RM_ROLE_ZONE_PREFIX = "rmRoleZone";
 
@@ -147,6 +153,16 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
     {
         this.bootstrapImporterModule = bootstrapImporterModuleComponent;
     }
+    
+    protected FilePlanService getFilePlanService()
+    {
+        if (filePlanService == null)
+        {
+            filePlanService = (FilePlanService) applicationContext.getBean("FilePlanService");
+        }
+
+        return filePlanService;
+    }
 
     /**
      * @see org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService#initialiseFilePlan(org.alfresco.service.cmr.repository.NodeRef)
@@ -190,11 +206,11 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
                     permissionService.setPermission(filePlan, ExtendedWriterDynamicAuthority.EXTENDED_WRITER, RMPermissionModel.FILING, true);
 
                     // Create the transfer and hold containers
-                    systemContainers.add(filePlanService.createHoldContainer(filePlan));
-                    systemContainers.add(filePlanService.createTransferContainer(filePlan));
+                    systemContainers.add(getFilePlanService().createHoldContainer(filePlan));
+                    systemContainers.add(getFilePlanService().createTransferContainer(filePlan));
 
                     // Create the unfiled record container
-                    systemContainers.add(filePlanService.createUnfiledContainer(filePlan));
+                    systemContainers.add(getFilePlanService().createUnfiledContainer(filePlan));
 
                     return systemContainers;
                 }
@@ -877,4 +893,10 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
     {
         return authorityService.getName(AuthorityType.GROUP, getAllRolesGroupShortName(filePlan));
     }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
+    {
+        this.applicationContext = applicationContext;
+    }
 }
diff --git a/rm-server/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java b/rm-server/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java
index 4d6d313465..35225914d9 100644
--- a/rm-server/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java
@@ -46,6 +46,16 @@ public class ExtendedActionServiceImpl extends ActionServiceImpl implements Appl
     /** Application context */
     private ApplicationContext extendedApplicationContext;
 
+    protected FilePlanService getFilePlanService()
+    {
+        if (filePlanService == null)
+        {
+            filePlanService = (FilePlanService) extendedApplicationContext.getBean("FilePlanService");
+        }
+
+        return filePlanService;
+    }
+    
     /**
      * @see org.alfresco.repo.action.ActionServiceImpl#setApplicationContext(org.springframework.context.ApplicationContext)
      */
@@ -98,7 +108,7 @@ public class ExtendedActionServiceImpl extends ActionServiceImpl implements Appl
         else
         {
             // get the file component kind of the node reference
-            FilePlanComponentKind kind = filePlanService.getFilePlanComponentKind(nodeRef);
+            FilePlanComponentKind kind = getFilePlanService().getFilePlanComponentKind(nodeRef);
             result = new ArrayList<ActionDefinition>(actionDefinitions.size());
 
             // check each action definition

From dbbe428c378d38a92dd46b80f6912a66ab2bcfa3 Mon Sep 17 00:00:00 2001
From: Alexandru Balmus <alexandru.balmus@ness.com>
Date: Fri, 16 Oct 2015 14:14:03 +0000
Subject: [PATCH 03/23] Reverse merged V2.2.1.x          <<< Need to use a
 different approach. >>>          Merged DEV to V2.2.1.x             114241:
 MNT-14900 : Alfresco doesn't work with Records Management                -
 Fixed problem with circular references during Spring dependency injection
 process

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@114605 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../extended-repository-context.xml           |  3 +-
 .../rm-service-context.xml                    |  3 +-
 .../role/FilePlanRoleServiceImpl.java         | 30 +++----------------
 .../action/ExtendedActionServiceImpl.java     | 12 +-------
 4 files changed, 7 insertions(+), 41 deletions(-)

diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml
index c0fb9ec36d..2b10615154 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml
@@ -145,8 +145,7 @@
    <!-- Action Service -->
    <bean id="actionService" class="org.alfresco.repo.action.ExtendedActionServiceImpl" init-method="init">
 
-        <!-- The following reference injection has been commented out to address MNT-14900; dependency is resolved internally. -->
-        <!-- <property name="filePlanService" ref="FilePlanService" /> -->
+   		<property name="filePlanService" ref="FilePlanService" />
 
         <property name="policyComponent">
             <ref bean="policyComponent" />
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 ad4a1a7ac9..6de002f343 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
@@ -501,8 +501,7 @@
         <property name="authorityService" ref="AuthorityService"/>
         <property name="permissionService" ref="PermissionService"/>
         <property name="nodeService" ref="NodeService"/>
-        <!-- The following reference injection has been commented out to address MNT-14900; dependency is resolved internally. -->
-        <!-- <property name="filePlanService" ref="FilePlanService" /> -->
+        <property name="filePlanService" ref="FilePlanService" />
         <!-- init repo for when a tenant is created -->
         <property name="bootstrapImporterModuleComponent" ref="org_alfresco_module_rm_bootstrapData"/>
 
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java
index 1000908aca..2ef8b753d8 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java
@@ -53,9 +53,6 @@ import org.apache.commons.lang.StringUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
 import org.springframework.extensions.surf.util.I18NUtil;
 
 /**
@@ -65,8 +62,7 @@ import org.springframework.extensions.surf.util.I18NUtil;
  * @since 2.1
  */
 public class FilePlanRoleServiceImpl implements FilePlanRoleService,
-                                                RecordsManagementModel,
-                                                ApplicationContextAware
+                                                RecordsManagementModel
 {
     /** I18N */
     private static final String MSG_ALL_ROLES = "rm.role.all";
@@ -97,8 +93,6 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
 
     private BootstrapImporterModuleComponent bootstrapImporterModule;
 
-    private ApplicationContext applicationContext;
-
     /** Records management role zone */
     public static final String RM_ROLE_ZONE_PREFIX = "rmRoleZone";
 
@@ -153,16 +147,6 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
     {
         this.bootstrapImporterModule = bootstrapImporterModuleComponent;
     }
-    
-    protected FilePlanService getFilePlanService()
-    {
-        if (filePlanService == null)
-        {
-            filePlanService = (FilePlanService) applicationContext.getBean("FilePlanService");
-        }
-
-        return filePlanService;
-    }
 
     /**
      * @see org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService#initialiseFilePlan(org.alfresco.service.cmr.repository.NodeRef)
@@ -206,11 +190,11 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
                     permissionService.setPermission(filePlan, ExtendedWriterDynamicAuthority.EXTENDED_WRITER, RMPermissionModel.FILING, true);
 
                     // Create the transfer and hold containers
-                    systemContainers.add(getFilePlanService().createHoldContainer(filePlan));
-                    systemContainers.add(getFilePlanService().createTransferContainer(filePlan));
+                    systemContainers.add(filePlanService.createHoldContainer(filePlan));
+                    systemContainers.add(filePlanService.createTransferContainer(filePlan));
 
                     // Create the unfiled record container
-                    systemContainers.add(getFilePlanService().createUnfiledContainer(filePlan));
+                    systemContainers.add(filePlanService.createUnfiledContainer(filePlan));
 
                     return systemContainers;
                 }
@@ -893,10 +877,4 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
     {
         return authorityService.getName(AuthorityType.GROUP, getAllRolesGroupShortName(filePlan));
     }
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
-    {
-        this.applicationContext = applicationContext;
-    }
 }
diff --git a/rm-server/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java b/rm-server/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java
index 35225914d9..4d6d313465 100644
--- a/rm-server/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java
@@ -46,16 +46,6 @@ public class ExtendedActionServiceImpl extends ActionServiceImpl implements Appl
     /** Application context */
     private ApplicationContext extendedApplicationContext;
 
-    protected FilePlanService getFilePlanService()
-    {
-        if (filePlanService == null)
-        {
-            filePlanService = (FilePlanService) extendedApplicationContext.getBean("FilePlanService");
-        }
-
-        return filePlanService;
-    }
-    
     /**
      * @see org.alfresco.repo.action.ActionServiceImpl#setApplicationContext(org.springframework.context.ApplicationContext)
      */
@@ -108,7 +98,7 @@ public class ExtendedActionServiceImpl extends ActionServiceImpl implements Appl
         else
         {
             // get the file component kind of the node reference
-            FilePlanComponentKind kind = getFilePlanService().getFilePlanComponentKind(nodeRef);
+            FilePlanComponentKind kind = filePlanService.getFilePlanComponentKind(nodeRef);
             result = new ArrayList<ActionDefinition>(actionDefinitions.size());
 
             // check each action definition

From 5effcfdec3e9a1d2d11d1c0949ed5c229bef28f9 Mon Sep 17 00:00:00 2001
From: Alexandru Balmus <alexandru.balmus@ness.com>
Date: Fri, 16 Oct 2015 14:26:00 +0000
Subject: [PATCH 04/23] Merged DEV to V2.2.1.x    114604: MNT-14900 : Alfresco
 doesn't work with Records Management       - Fixed the circular reference
 problem from Spring config xml using NonBlockingLazyInitTargetSource

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@114608 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../module/org_alfresco_module_rm/rm-service-context.xml  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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 6de002f343..978d73d381 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
@@ -393,8 +393,12 @@
         <property name="proxyInterfaces">
             <value>org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService</value>
         </property>
-        <property name="target">
-            <ref bean="filePlanService"/>
+        <property name="targetSource">
+            <bean class="org.alfresco.config.NonBlockingLazyInitTargetSource">
+                <property name="targetBeanName">
+                   <idref bean="filePlanService"/>
+                </property>
+            </bean>
         </property>
         <property name="interceptorNames">
             <list>

From 1e21cd4e6b4c38eb1b1cfa74ee6826236d2d1fa8 Mon Sep 17 00:00:00 2001
From: Alexandru Balmus <alexandru.balmus@ness.com>
Date: Fri, 16 Oct 2015 14:26:34 +0000
Subject: [PATCH 05/23] Update version to 2.2.1.3

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@114609 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/module/org_alfresco_module_rm/module.properties    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 9de6dd4f47..5b5d6a527e 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.2.1.2
+module.version=2.2.1.3
 
 module.repo.version.min=4.2
\ No newline at end of file

From 22af8a7422a0c69c2671f08b4401f467dc499909 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Mon, 19 Oct 2015 10:36:41 +0000
Subject: [PATCH 06/23] RM-2669 (Spike: Investigate RM Enterprise approach)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@114660 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 rm-automation/pom.xml | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index 72c3776526..1e208166bd 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -1,25 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-   <parent>
-      <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-rm-parent</artifactId>
-      <version>2.4-SNAPSHOT</version>
-   </parent>
    <modelVersion>4.0.0</modelVersion>
+   <groupId>org.alfresco</groupId>
    <artifactId>alfresco-rm-automation</artifactId>
+   <version>2.4-SNAPSHOT</version>
    <properties>
       <selenium.version>2.45.0</selenium.version>
       <spring.version>4.0.5.RELEASE</spring.version>
       <!-- Within the rm-automation project only, we want source code to be Java 8. -->
       <maven.build.sourceVersion>1.8</maven.build.sourceVersion>
+      <maven.build.testSourceVersion>1.8</maven.build.testSourceVersion>
+      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    </properties>
    <build>
       <plugins>
+         <plugin>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <version>3.2</version>
+            <configuration>
+               <source>${maven.build.sourceVersion}</source>
+               <target>${maven.build.sourceVersion}</target>
+            </configuration>
+            <executions>
+               <execution>
+                  <id>default-testCompile</id>
+                  <phase>process-test-sources</phase>
+                  <goals>
+                     <goal>testCompile</goal>
+                  </goals>
+                  <configuration>
+                     <source>${maven.build.testSourceVersion}</source>
+                     <target>${maven.build.testSourceVersion}</target>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
          <!-- Additional source folder to be added: source/compatibility -->
          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>build-helper-maven-plugin</artifactId>
+            <version>1.9.1</version>
             <executions>
                <execution>
                    <id>add-test-source</id>
@@ -36,6 +56,7 @@
          </plugin>
          <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
+            <version>2.18</version>
             <configuration>
                <redirectTestOutputToFile>false</redirectTestOutputToFile>
                <suiteXmlFiles>

From 82265f9a040d13708388d854b970c981ba32991b Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Mon, 19 Oct 2015 10:37:22 +0000
Subject: [PATCH 07/23] RM-2669 (Spike: Investigate RM Enterprise approach)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@114661 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

From 699f82abcb647986830f8bda7d032e063d898755 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Mon, 19 Oct 2015 10:41:28 +0000
Subject: [PATCH 08/23] RM-2669 (Spike: Investigate RM Enterprise approach)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@114662 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 rm-automation/pom.xml | 33 ++++++---------------------------
 1 file changed, 6 insertions(+), 27 deletions(-)

diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index 1e208166bd..72c3776526 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -1,45 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+   <parent>
+      <groupId>org.alfresco</groupId>
+      <artifactId>alfresco-rm-parent</artifactId>
+      <version>2.4-SNAPSHOT</version>
+   </parent>
    <modelVersion>4.0.0</modelVersion>
-   <groupId>org.alfresco</groupId>
    <artifactId>alfresco-rm-automation</artifactId>
-   <version>2.4-SNAPSHOT</version>
    <properties>
       <selenium.version>2.45.0</selenium.version>
       <spring.version>4.0.5.RELEASE</spring.version>
       <!-- Within the rm-automation project only, we want source code to be Java 8. -->
       <maven.build.sourceVersion>1.8</maven.build.sourceVersion>
-      <maven.build.testSourceVersion>1.8</maven.build.testSourceVersion>
-      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    </properties>
    <build>
       <plugins>
-         <plugin>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <version>3.2</version>
-            <configuration>
-               <source>${maven.build.sourceVersion}</source>
-               <target>${maven.build.sourceVersion}</target>
-            </configuration>
-            <executions>
-               <execution>
-                  <id>default-testCompile</id>
-                  <phase>process-test-sources</phase>
-                  <goals>
-                     <goal>testCompile</goal>
-                  </goals>
-                  <configuration>
-                     <source>${maven.build.testSourceVersion}</source>
-                     <target>${maven.build.testSourceVersion}</target>
-                  </configuration>
-               </execution>
-            </executions>
-         </plugin>
          <!-- Additional source folder to be added: source/compatibility -->
          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>build-helper-maven-plugin</artifactId>
-            <version>1.9.1</version>
             <executions>
                <execution>
                    <id>add-test-source</id>
@@ -56,7 +36,6 @@
          </plugin>
          <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
-            <version>2.18</version>
             <configuration>
                <redirectTestOutputToFile>false</redirectTestOutputToFile>
                <suiteXmlFiles>

From 00b205e9b6123607450e7acdc05afac0c2dae091 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Mon, 19 Oct 2015 13:32:19 +0000
Subject: [PATCH 09/23] Updated Alfresco dependency to 5.1.b-EA

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@114676 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b6f6c278be..c31a6c3aac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
    </modules>
 
    <properties>
-      <alfresco.version>5.1.a-EA</alfresco.version>
+      <alfresco.version>5.1.b-EA</alfresco.version>
       <app.war.location>${project.build.directory}/${webapp.id.name}.war</app.war.location>
       <alfresco.base.version>${alfresco.version}</alfresco.base.version>
 

From 597406765d019f91d44a7c3e1c57372656b02308 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Mon, 19 Oct 2015 13:37:48 +0000
Subject: [PATCH 10/23] Updated the svn:ignore list

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@114677 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

From 523103653bd519ac06e855065773b39439a69bb5 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Mon, 19 Oct 2015 13:46:34 +0000
Subject: [PATCH 11/23] Deleted .ant-targets-build.xml from the code base

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@114680 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .ant-targets-build.xml | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 .ant-targets-build.xml

diff --git a/.ant-targets-build.xml b/.ant-targets-build.xml
deleted file mode 100644
index 99c02cc181..0000000000
--- a/.ant-targets-build.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-fullBuildCommunity
-fullBuildEnterprise
-incrementalBuild

From 98969f47cf70b6947cfc9ecfa3a11c775cc30b45 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Mon, 19 Oct 2015 13:48:13 +0000
Subject: [PATCH 12/23] Added .ant-targets-build.xml to svn:ignore list

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@114681 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

From 6742e89e1a76783ceecce3042d44aaa9b1ed2b1b Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Mon, 19 Oct 2015 14:07:16 +0000
Subject: [PATCH 13/23] Removed warnings

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@114685 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../ReferralAdminServiceImpl.java             | 13 ------------
 .../ReferredMetadataException.java            | 19 ++++++++++++++++++
 .../ReferredMetadataServiceImplUnitTest.java  | 20 +++++++++----------
 .../UserSecurityClearanceGetUnitTest.java     |  7 +++----
 .../test/util/FPUtils.java                    |  3 +++
 5 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/referredmetadata/ReferralAdminServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/referredmetadata/ReferralAdminServiceImpl.java
index 4aa8c4afbb..9afcbc0259 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/referredmetadata/ReferralAdminServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/referredmetadata/ReferralAdminServiceImpl.java
@@ -128,19 +128,6 @@ public class ReferralAdminServiceImpl implements ReferralAdminService
         return metadataReferral;
     }
 
-    /** Gets the {@link MetadataReferral} which uses the specified {@code assocType}. */
-    private MetadataReferral getReferralForAssociation(QName assocType)
-    {
-        final MetadataReferral metadataReferral = registry.getReferralForAssociation(assocType);
-
-        if (metadataReferral == null)
-        {
-            throw new IllegalArgumentException("No " + MetadataReferral.class.getSimpleName() +
-                                               " configured for assocType " + assocType);
-        }
-        return metadataReferral;
-    }
-
     @Override public MetadataReferral detachReferrer(NodeRef referrer, QName aspectName)
     {
         final MetadataReferral referral = registry.getReferralForAspect(aspectName);
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/referredmetadata/ReferredMetadataException.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/referredmetadata/ReferredMetadataException.java
index 83cbb83ed1..aaaf992871 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/referredmetadata/ReferredMetadataException.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/referredmetadata/ReferredMetadataException.java
@@ -31,12 +31,16 @@ import java.util.List;
  */
 public class ReferredMetadataException extends AlfrescoRuntimeException
 {
+    private static final long serialVersionUID = -6059777070036571486L;
+
     public ReferredMetadataException(String msgId)                  { super(msgId); }
     public ReferredMetadataException(String msgId, Throwable cause) { super(msgId, cause); }
 
     /** This exception may be thrown when a {@link MetadataReferral} was incorrectly initialised. */
     public static class InvalidMetadataReferral extends ReferredMetadataException
     {
+        private static final long serialVersionUID = 8507076314709440295L;
+
         public InvalidMetadataReferral(String msgId)
         {
             super(msgId);
@@ -46,6 +50,8 @@ public class ReferredMetadataException extends AlfrescoRuntimeException
     /** This exception may be thrown when a {@link MetadataReferral} already exists. */
     public static class MetadataReferralAlreadyExists extends ReferredMetadataException
     {
+        private static final long serialVersionUID = 8119954252195817706L;
+
         private final MetadataReferral metadataReferral;
 
         public MetadataReferralAlreadyExists(String msgId, MetadataReferral metadataReferral)
@@ -53,11 +59,18 @@ public class ReferredMetadataException extends AlfrescoRuntimeException
             super(msgId);
             this.metadataReferral = metadataReferral;
         }
+
+        public MetadataReferral getMetadataReferral()
+        {
+            return this.metadataReferral;
+        }
     }
 
     /** A {@link MetadataReferral} has not been found. */
     public static class MetadataReferralNotFound extends ReferredMetadataException
     {
+        private static final long serialVersionUID = 8648089074801662142L;
+
         public MetadataReferralNotFound(String msgId)
         {
             super(msgId);
@@ -67,6 +80,8 @@ public class ReferredMetadataException extends AlfrescoRuntimeException
     /** A referent Node has not been found. */
     public static class ReferentNodeNotFound extends ReferredMetadataException
     {
+        private static final long serialVersionUID = -6003487925958374458L;
+
         public ReferentNodeNotFound(String msgId)
         {
             super(msgId);
@@ -76,6 +91,8 @@ public class ReferredMetadataException extends AlfrescoRuntimeException
     /** Exception to report that chains of metadata referral are not currently supported. */
     public static class ChainedMetadataReferralUnsupported extends ReferredMetadataException
     {
+        private static final long serialVersionUID = -2293262325447442964L;
+
         private final List<NodeRef> existingReferrers;
 
         public ChainedMetadataReferralUnsupported(String msgId, List<NodeRef> existingReferrers)
@@ -101,6 +118,8 @@ public class ReferredMetadataException extends AlfrescoRuntimeException
     /** Exception to report that metadata referral is not supported for metadata defined on content types. */
     public static class TypeMetadataReferralUnsupported extends ReferredMetadataException
     {
+        private static final long serialVersionUID = 7498707640089715503L;
+
         public TypeMetadataReferralUnsupported(String msgId)
         {
             super(msgId);
diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/referredmetadata/ReferredMetadataServiceImplUnitTest.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/referredmetadata/ReferredMetadataServiceImplUnitTest.java
index a9aa394aad..4fd2a5eb7a 100644
--- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/referredmetadata/ReferredMetadataServiceImplUnitTest.java
+++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/referredmetadata/ReferredMetadataServiceImplUnitTest.java
@@ -18,21 +18,24 @@
  */
 package org.alfresco.module.org_alfresco_module_rm.referredmetadata;
 
-import static java.util.Collections.emptyMap;
 import static java.util.Arrays.asList;
-import static org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferredMetadataException.ReferentNodeNotFound;
-import static org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferredMetadataException.MetadataReferralNotFound;
+import static java.util.Collections.emptyMap;
 import static org.alfresco.module.org_alfresco_module_rm.test.util.ExceptionUtils.expectedException;
 import static org.alfresco.module.org_alfresco_module_rm.test.util.FPUtils.asSet;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.any;
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.when;
 
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferredMetadataException.MetadataReferralNotFound;
+import org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferredMetadataException.ReferentNodeNotFound;
 import org.alfresco.service.cmr.dictionary.ClassDefinition;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.dictionary.PropertyDefinition;
@@ -47,10 +50,6 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * Unit tests for {@link ReferredMetadataServiceImpl}.
  *
@@ -96,6 +95,7 @@ public class ReferredMetadataServiceImplUnitTest
                                                this.setAspects(asSet(referredAspect1, referredAspect2));
                                            }};
 
+    @SuppressWarnings("serial")
     @Before public void setUp()
     {
         MockitoAnnotations.initMocks(this);
diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/UserSecurityClearanceGetUnitTest.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/UserSecurityClearanceGetUnitTest.java
index 16b6ea6851..1e3fb5706a 100644
--- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/UserSecurityClearanceGetUnitTest.java
+++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/UserSecurityClearanceGetUnitTest.java
@@ -18,7 +18,6 @@
  */
 package org.alfresco.module.org_alfresco_module_rm.script.classification;
 
-import static java.util.Collections.emptyMap;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.mockito.Matchers.any;
@@ -34,8 +33,6 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationLevel;
 import org.alfresco.module.org_alfresco_module_rm.classification.ClearanceLevel;
 import org.alfresco.module.org_alfresco_module_rm.classification.SecurityClearance;
@@ -50,7 +47,6 @@ import org.alfresco.service.namespace.QName;
 import org.alfresco.util.Pair;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
@@ -58,6 +54,9 @@ import org.mockito.Spy;
 import org.springframework.extensions.webscripts.DeclarativeWebScript;
 import org.springframework.extensions.webscripts.WebScriptRequest;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 /**
  * Test for get user security clearance API
  *
diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/FPUtils.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/FPUtils.java
index 335461a587..6d09317b6d 100644
--- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/FPUtils.java
+++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/FPUtils.java
@@ -44,6 +44,7 @@ public class FPUtils
      * @param <T> the type of elements in the list.
      * @return the list with each element being the first retrieved from a {@code Supplier}.
      */
+    @SafeVarargs
     public static <T> List<T> asListFrom(Supplier<T>... suppliers)
     {
         if (suppliers == null || suppliers.length == 0)
@@ -66,6 +67,7 @@ public class FPUtils
      * @param <T> the type of elements in the set.
      * @return the set with each element being the first retrieved from a {@code Supplier} (duplicates removed).
      */
+    @SafeVarargs
     public static <T> Set<T> asSetFrom(Supplier<T>... suppliers)
     {
         List<T> l = asListFrom(suppliers);
@@ -78,6 +80,7 @@ public class FPUtils
      * @param objects the objects to be added to the set
      * @return a Set of objects (any equal objects will of course not be duplicated)
      */
+    @SafeVarargs
     public static <T> Set<T> asSet(T... objects)
     {
         return new HashSet<>(asList(objects));

From bb0fa6f8cd95b25b30a26796b1c4b1765dd4e6d0 Mon Sep 17 00:00:00 2001
From: Tatyana Valkevych <tatyana.valkevych@alfresco.com>
Date: Mon, 19 Oct 2015 14:39:39 +0000
Subject: [PATCH 14/23] Updated version to 2.2.1.3 and
 dependency.share.po.version to 4.2.5-SNAPSHOT in pom.xml files

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@114687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 pom.xml           | 2 +-
 rm-server/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9bd2bc28c3..296823bfdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
    <groupId>org.alfresco</groupId>
    <artifactId>alfresco-rm-parent</artifactId>
    <packaging>pom</packaging>
-   <version>2.2.1.2-SNAPSHOT</version>
+   <version>2.2.1.3</version>
    <name>Alfresco Records Management</name>
 
    <url>http://www.alfresco.org/</url>
diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index 7169a0eedf..4ce8419000 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -5,7 +5,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-rm-parent</artifactId>
-      <version>2.2.1.2-SNAPSHOT</version>
+      <version>2.2.1.3</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>alfresco-rm-server</artifactId>

From 2fa3bf1a55a35bef17de2e2ff8e89c62e7f37c09 Mon Sep 17 00:00:00 2001
From: Alexandru Balmus <alexandru.balmus@ness.com>
Date: Tue, 20 Oct 2015 13:25:39 +0000
Subject: [PATCH 15/23] RM-2391 : The Audit Log GET requests have to verify
 first which user is logged in and to which data it has access.    -
 Implemented final fix and added a unit test.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@114786 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../RecordsManagementAuditServiceImpl.java    |  2 +-
 ...RecordsManagementAuditServiceImplTest.java | 49 +++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
index 6c2e81679f..9e804bc72e 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
@@ -921,7 +921,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean
                     return true;
                 }
                 
-                if( nodeRef != null &&
+                if(nodeRef != null && nodeService.exists(nodeRef) &&
                     !AccessStatus.ALLOWED.equals(
                         capabilityService.getCapabilityAccessState(nodeRef, ACCESS_AUDIT_CAPABILITY)))
                 {
diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java
index 65b0cede07..1a9d8f469c 100644
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java
@@ -141,6 +141,55 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
         }, ADMIN_USER);
     }
 
+    /**
+     * Test getAuditTrail method to check that deleted items always show in the audit.
+     * 
+     * @see RM-2391 (last addressed isue)
+     */
+    public void testGetAuditTrailForDeletedItem()
+    {
+        // We have only one entry for the event "audit.start":
+        List<RecordsManagementAuditEntry> entries = getAuditTrail(1, ADMIN_USER);
+
+        assertEquals(entries.get(0).getEvent(), "audit.start");
+
+        // Event "audit.view" was generated but will be visible on the next call to getAuditTrail().
+
+        // Make a change:
+        updateTitle(filePlan, ADMIN_USER); // event=Update RM Object
+
+        // Show the audit has been updated; at this point we have three entries for the three events up to now:
+        // "audit.start", "audit.view" and "Update RM Object";
+        entries = getAuditTrail(3, ADMIN_USER);
+
+        assertEquals(entries.get(0).getEvent(), "audit.start");
+        assertEquals(entries.get(1).getEvent(), "audit.view");
+        assertEquals(entries.get(2).getEvent(), "Update RM Object");
+
+        // New "audit.view" event was generated - will be visible on next getAuditTrail().
+
+        doTestInTransaction(new Test<Void>()
+        {
+            @Override
+            public Void run() throws Exception
+            {
+                nodeService.deleteNode(record);
+                List<RecordsManagementAuditEntry> entries = getAuditTrail(5, ADMIN_USER);
+
+                assertEquals(entries.get(0).getEvent(), "audit.start");
+                assertEquals(entries.get(1).getEvent(), "audit.view");
+                assertEquals(entries.get(2).getEvent(), "Update RM Object");
+                assertEquals(entries.get(3).getEvent(), "audit.view");
+
+                // Show the audit contains a reference to the deleted item:
+                assertEquals(entries.get(4).getEvent(), "Delete RM Object");
+                assertEquals(entries.get(4).getNodeRef(), record);
+
+                return null;
+            }
+        });
+    }
+    
     /**
      * Test getAuditTrail method and parameter filters.
      */

From 5553043b6e8f973b960f1e466a69553de62c9b02 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Tue, 20 Oct 2015 14:01:30 +0000
Subject: [PATCH 16/23] RM-2702 (RM HEAD does not work with Alfresco 5.1.b-EA)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@114791 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 rm-server/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index 476c419d4b..8332c617f0 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -15,7 +15,7 @@
       <alfresco.client.contextPath>/alfresco</alfresco.client.contextPath>
       <alfresco.postgres.version>9.1-901.jdbc4</alfresco.postgres.version>
       <alfresco.mysql.version>5.1.31</alfresco.mysql.version>
-      <alfresco.spring.webscripts>5.1.2</alfresco.spring.webscripts>
+      <alfresco.spring.webscripts>${alfresco.version}</alfresco.spring.webscripts>
       <webapp.id.name>alfresco</webapp.id.name>
       <webapp.id>${webapp.id.name}</webapp.id>
    </properties>

From 2b46d5043fc5323c6fa4337ded79ef9bc880052f Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Tue, 20 Oct 2015 15:54:56 +0000
Subject: [PATCH 17/23] RM-2702 (RM HEAD does not work with Alfresco 5.1.b-EA)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@114809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 rm-server/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index 8332c617f0..520e8b46ef 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -15,7 +15,7 @@
       <alfresco.client.contextPath>/alfresco</alfresco.client.contextPath>
       <alfresco.postgres.version>9.1-901.jdbc4</alfresco.postgres.version>
       <alfresco.mysql.version>5.1.31</alfresco.mysql.version>
-      <alfresco.spring.webscripts>${alfresco.version}</alfresco.spring.webscripts>
+      <alfresco.spring.webscripts>5.4</alfresco.spring.webscripts>
       <webapp.id.name>alfresco</webapp.id.name>
       <webapp.id>${webapp.id.name}</webapp.id>
    </properties>

From 26ba2420669999d6b06c42ced3f328bdfc298907 Mon Sep 17 00:00:00 2001
From: Tatyana Valkevych <tatyana.valkevych@alfresco.com>
Date: Wed, 21 Oct 2015 12:27:06 +0000
Subject: [PATCH 18/23] Merged V2.2.1.x (2.2.1.3) to V2.2    114608: Merged DEV
 to V2.2.1.x       114604: MNT-14900 : Alfresco doesn't work with Records
 Management          - Fixed the circular reference problem from Spring config
 xml using NonBlockingLazyInitTargetSource

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@114900 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../module/org_alfresco_module_rm/rm-service-context.xml  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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 016ae2361a..4057ea3e2d 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
@@ -393,8 +393,12 @@
         <property name="proxyInterfaces">
             <value>org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService</value>
         </property>
-        <property name="target">
-            <ref bean="filePlanService"/>
+        <property name="targetSource">
+            <bean class="org.alfresco.config.NonBlockingLazyInitTargetSource">
+                <property name="targetBeanName">
+                   <idref bean="filePlanService"/>
+                </property>
+            </bean>
         </property>
         <property name="interceptorNames">
             <list>

From b963fb6175ac933c16cfca31fbe6056b45585706 Mon Sep 17 00:00:00 2001
From: Tatyana Valkevych <tatyana.valkevych@alfresco.com>
Date: Wed, 21 Oct 2015 12:44:37 +0000
Subject: [PATCH 19/23] Merged V2.2 to V2.3    114900: Merged V2.2.1.x
 (2.2.1.3) to V2.2       114608: Merged DEV to V2.2.1.x          114604:
 MNT-14900 : Alfresco doesn't work with Records Management             - Fixed
 the circular reference problem from Spring config xml using
 NonBlockingLazyInitTargetSource

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@114902 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../module/org_alfresco_module_rm/rm-service-context.xml  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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 2343579896..f79173a8a2 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
@@ -392,8 +392,12 @@
         <property name="proxyInterfaces">
             <value>org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService</value>
         </property>
-        <property name="target">
-            <ref bean="filePlanService"/>
+        <property name="targetSource">
+            <bean class="org.alfresco.config.NonBlockingLazyInitTargetSource">
+                <property name="targetBeanName">
+                   <idref bean="filePlanService"/>
+                </property>
+            </bean>
         </property>
         <property name="interceptorNames">
             <list>

From 16cc24bf0c8113783e0065915eb88a1482b55d77 Mon Sep 17 00:00:00 2001
From: Alexandru Balmus <alexandru.balmus@ness.com>
Date: Wed, 21 Oct 2015 13:45:08 +0000
Subject: [PATCH 20/23] Merged V2.2 to V2.3    114786: RM-2391 : The Audit Log
 GET requests have to verify first which user is logged in and to which data
 it has access.       - Implemented final fix and added a unit test.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@114905 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../RecordsManagementAuditServiceImpl.java    |  2 +-
 ...RecordsManagementAuditServiceImplTest.java | 49 +++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
index dd8d826ed9..d002fb915e 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
@@ -921,7 +921,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean
                     return true;
                 }
                 
-                if( nodeRef != null &&
+                if(nodeRef != null && nodeService.exists(nodeRef) &&
                     !AccessStatus.ALLOWED.equals(
                         capabilityService.getCapabilityAccessState(nodeRef, ACCESS_AUDIT_CAPABILITY)))
                 {
diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java
index 65b0cede07..1a9d8f469c 100644
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java
@@ -141,6 +141,55 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
         }, ADMIN_USER);
     }
 
+    /**
+     * Test getAuditTrail method to check that deleted items always show in the audit.
+     * 
+     * @see RM-2391 (last addressed isue)
+     */
+    public void testGetAuditTrailForDeletedItem()
+    {
+        // We have only one entry for the event "audit.start":
+        List<RecordsManagementAuditEntry> entries = getAuditTrail(1, ADMIN_USER);
+
+        assertEquals(entries.get(0).getEvent(), "audit.start");
+
+        // Event "audit.view" was generated but will be visible on the next call to getAuditTrail().
+
+        // Make a change:
+        updateTitle(filePlan, ADMIN_USER); // event=Update RM Object
+
+        // Show the audit has been updated; at this point we have three entries for the three events up to now:
+        // "audit.start", "audit.view" and "Update RM Object";
+        entries = getAuditTrail(3, ADMIN_USER);
+
+        assertEquals(entries.get(0).getEvent(), "audit.start");
+        assertEquals(entries.get(1).getEvent(), "audit.view");
+        assertEquals(entries.get(2).getEvent(), "Update RM Object");
+
+        // New "audit.view" event was generated - will be visible on next getAuditTrail().
+
+        doTestInTransaction(new Test<Void>()
+        {
+            @Override
+            public Void run() throws Exception
+            {
+                nodeService.deleteNode(record);
+                List<RecordsManagementAuditEntry> entries = getAuditTrail(5, ADMIN_USER);
+
+                assertEquals(entries.get(0).getEvent(), "audit.start");
+                assertEquals(entries.get(1).getEvent(), "audit.view");
+                assertEquals(entries.get(2).getEvent(), "Update RM Object");
+                assertEquals(entries.get(3).getEvent(), "audit.view");
+
+                // Show the audit contains a reference to the deleted item:
+                assertEquals(entries.get(4).getEvent(), "Delete RM Object");
+                assertEquals(entries.get(4).getNodeRef(), record);
+
+                return null;
+            }
+        });
+    }
+    
     /**
      * Test getAuditTrail method and parameter filters.
      */

From 3fd9d0958de603943b5da522d0f662bd111566fd Mon Sep 17 00:00:00 2001
From: Tom Page <tom.page@alfresco.com>
Date: Wed, 21 Oct 2015 15:03:13 +0000
Subject: [PATCH 21/23] Merged BRANCHES/V2.2.1.x to BRANCHES/V2.2:    114437:
 Merged DEV to V2.2.1.x         114241: MNT-14900 : Alfresco doesn't work with
 Records Management            - Fixed problem with circular references during
 Spring dependency injection process    114605: Reverse merged V2.2.1.x       
        <<< Need to use a different approach. >>>               Merged DEV to
 V2.2.1.x                  114241: MNT-14900 : Alfresco doesn't work with
 Records Management                     - Fixed problem with circular
 references during Spring dependency injection process    114609: (RECORD
 ONLY) Update version to 2.2.1.3    114687: (RECORD ONLY) Updated version to
 2.2.1.3 and dependency.share.po.version to 4.2.5-SNAPSHOT in pom.xml files

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@114917 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 pom.xml           | 2 +-
 rm-server/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 76f272a5d0..0a6b4579b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
    <groupId>org.alfresco</groupId>
    <artifactId>alfresco-rm-parent</artifactId>
    <packaging>pom</packaging>
-   <version>2.2.1-SNAPSHOT</version>
+   <version>2.2.2-SNAPSHOT</version>
    <name>Alfresco Records Management</name>
 
    <url>http://www.alfresco.org/</url>
diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index c79a190b9a..60364087b4 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -5,7 +5,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-rm-parent</artifactId>
-      <version>2.2.1-SNAPSHOT</version>
+      <version>2.2.2-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>alfresco-rm-server</artifactId>

From 0d01c265f69578ae3a8a6145dd44ec9141b7d213 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Fri, 23 Oct 2015 08:58:24 +0000
Subject: [PATCH 22/23] Added some info why we override a managed version of a
 dependency

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@115015 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 rm-server/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index 520e8b46ef..39efb74434 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -424,6 +424,11 @@
       <dependency>
          <groupId>org.springframework.extensions.surf</groupId>
          <artifactId>spring-webscripts</artifactId>
+         <!--
+            We are overriding a managed version of a dependency here.
+            This is need to be able to support different Alfresco
+            versions (i.e for the time being 5.0.2, 5.0.d and 5.1.b-EA)
+         -->
          <version>${alfresco.spring.webscripts}</version>
          <classifier>tests</classifier>
          <scope>test</scope>

From c1a558cfcdffdad1787408ebe45a27d076f78d1c Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Sat, 24 Oct 2015 12:36:59 +0000
Subject: [PATCH 23/23] RM-2693 (Create RM Enterprise server AMP)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@115087 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 rm-server/pom.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index 39efb74434..e8a2195917 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -83,6 +83,17 @@
                </suiteXmlFiles>
             </configuration>
          </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jar-plugin</artifactId>
+            <executions>
+               <execution>
+                  <goals>
+                     <goal>test-jar</goal>
+                  </goals>
+               </execution>
+            </executions>
+         </plugin>
       </plugins>
    </build>
    <profiles>