From fb215876b82053e06907b5e8b10a3ce75db2bf5c Mon Sep 17 00:00:00 2001
From: Sara Aspery <sara.aspery@alfresco.com>
Date: Sat, 24 Jun 2017 22:49:27 +0100
Subject: [PATCH] fixing IDE whitespaces

---
 .../requests/gscore/api/RecordsAPI.java       |    6 +-
 .../records/CompleteRecordTests.java          |    7 +-
 .../rm-service-context.xml                    | 1986 ++++++++---------
 .../action/impl/DeclareRecordAction.java      |    8 +-
 .../record/RecordService.java                 |  350 +--
 .../record/RecordServiceImpl.java             |  429 ++--
 .../rule/FilePlanRuleInheritanceTest.java     |  103 +-
 7 files changed, 1411 insertions(+), 1478 deletions(-)

diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RecordsAPI.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RecordsAPI.java
index 2825dab997..e39c8034be 100644
--- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RecordsAPI.java
+++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RecordsAPI.java
@@ -149,8 +149,8 @@ public class RecordsAPI extends RMModelRequest
      *                   <li>Invalid parameter: {@code recordId} is not a record</li>
      *                   <li>authentication fails</li>
      *                   <li>current user does not have permission to complete {@code recordId}</li>
-     *                   <li>{@code recordId} does not exist</li>
-     *                   <li>model integrity exception: the record is already complete</li>
+     *                   <li>{@code recordId} does not exist or is frozen</li>
+     *                   <li>model integrity exception: the record is already completed</li>
      *                   <li>model integrity exception: the record has missing meta-data</li>
      *                   </ul>
      */
@@ -242,7 +242,7 @@ public class RecordsAPI extends RMModelRequest
      * @param recordModel The record model which holds the information
      * @param recordId The identifier of a record
      * @param parameters The URL parameters to add
-     * @param returns The updated {@link Record}
+     * @return The updated {@link Record}
      * @throws Exception for the following cases:
      * <ul>
      *  <li>the update request is invalid or {@code recordId} is not a valid format or {@code recordModel} is invalid</li>
diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/CompleteRecordTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/CompleteRecordTests.java
index 8964357053..e099fd9afb 100644
--- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/CompleteRecordTests.java
+++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/CompleteRecordTests.java
@@ -207,8 +207,7 @@ public class CompleteRecordTests extends BaseRMRestTest
             description = "Cannot complete a document that is not a record"
         )
     @AlfrescoTest (jira = "RM-4431")
-    public void completeNonRecord(String nonRecordId)
-        throws Exception
+    public void completeNonRecord(String nonRecordId) throws Exception
     {
         // Get the recordsAPI
         RecordsAPI recordsAPI = getRestAPIFactory().getRecordsAPI();
@@ -254,7 +253,7 @@ public class CompleteRecordTests extends BaseRMRestTest
     }
 
     /**
-     * Helper method to create an electronic record and and assert successfully creation
+     * Helper method to create an electronic record and and assert successful creation
      */
     private Record createAndVerifyElectronicRecord(String recordFolderId) throws Exception
     {
@@ -268,7 +267,7 @@ public class CompleteRecordTests extends BaseRMRestTest
     }
 
     /**
-     * Helper method to create a non-electronic record and and assert successfully creation
+     * Helper method to create a non-electronic record and and assert successful creation
      */
     private Record createAndVerifyNonElectronicRecord(String recordFolderId) throws Exception
     {
diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
index 2a9b9accf5..6916b0bd36 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:aop="http://www.springframework.org/schema/aop"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xsi:schemaLocation="
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xmlns:aop="http://www.springframework.org/schema/aop"
+   xmlns:context="http://www.springframework.org/schema/context"
+   xmlns:util="http://www.springframework.org/schema/util"
+   xsi:schemaLocation="
       http://www.springframework.org/schema/context
       http://www.springframework.org/schema/context/spring-context-3.0.xsd
       http://www.springframework.org/schema/beans
@@ -16,134 +16,129 @@
 
    <!--  Helper beans -->
 
-   <bean id="baseTransaction" abstract="true"
-         class="org.springframework.transaction.interceptor.TransactionInterceptor">
-      <property name="transactionManager">
-         <ref bean="transactionManager" />
-      </property>
-      <property name="transactionAttributes">
-         <props>
-            <prop key="*">${server.transaction.mode.default}</prop>
-         </props>
-      </property>
-   </bean>
+   <bean id="baseTransaction" abstract="true" class="org.springframework.transaction.interceptor.TransactionInterceptor">
+        <property name="transactionManager">
+            <ref bean="transactionManager"/>
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">${server.transaction.mode.default}</prop>
+            </props>
+        </property>
+    </bean>
 
-   <bean id="baseSecurity" abstract="true"
-         class="org.alfresco.module.org_alfresco_module_rm.security.RMMethodSecurityInterceptor">
-      <property name="authenticationManager">
-         <ref bean="authenticationManager" />
-      </property>
-      <property name="accessDecisionManager">
-         <ref bean="accessDecisionManager" />
-      </property>
-      <property name="afterInvocationManager">
-         <ref bean="afterInvocationManager" />
-      </property>
-   </bean>
+    <bean id="baseSecurity" abstract="true" class="org.alfresco.module.org_alfresco_module_rm.security.RMMethodSecurityInterceptor">
+        <property name="authenticationManager">
+            <ref bean="authenticationManager"/>
+        </property>
+        <property name="accessDecisionManager">
+            <ref bean="accessDecisionManager"/>
+        </property>
+        <property name="afterInvocationManager">
+            <ref bean="afterInvocationManager"/>
+        </property>
+     </bean>
 
-   <bean id="baseService" abstract="true">
-      <property name="nodeService" ref="NodeService" />
-      <property name="dictionaryService" ref="DictionaryService" />
-      <property name="authenticationUtil" ref="rm.authenticationUtil" />
-      <property name="transactionalResourceHelper" ref="rm.transactionalResourceHelper" />
-      <property name="renditionService" ref="RenditionService" />
-   </bean>
+     <bean id="baseService" abstract="true">
+        <property name="nodeService" ref="NodeService"/>
+        <property name="dictionaryService" ref="DictionaryService"/>
+        <property name="authenticationUtil" ref="rm.authenticationUtil"/>
+        <property name="transactionalResourceHelper" ref="rm.transactionalResourceHelper" />
+        <property name="renditionService" ref="RenditionService" />
+     </bean>
 
-   <!-- Records Management Service Registry -->
+    <!-- Records Management Service Registry -->
 
-   <bean id="RecordsManagementServiceRegistry"
-         class="org.alfresco.module.org_alfresco_module_rm.RecordsManagementServiceRegistryImpl" />
+    <bean id="RecordsManagementServiceRegistry" class="org.alfresco.module.org_alfresco_module_rm.RecordsManagementServiceRegistryImpl" />
 
-   <!--  Vital Record Service -->
+    <!--  Vital Record Service -->
 
-   <bean id="vitalRecordService" parent="baseService"
-         class="org.alfresco.module.org_alfresco_module_rm.vital.VitalRecordServiceImpl">
-      <property name="filePlanService" ref="FilePlanService" />
-   </bean>
+    <bean id="vitalRecordService" parent="baseService" class="org.alfresco.module.org_alfresco_module_rm.vital.VitalRecordServiceImpl">
+        <property name="filePlanService" ref="FilePlanService" />
+    </bean>
 
-   <bean id="VitalRecordService" class="org.springframework.aop.framework.ProxyFactoryBean">
-      <property name="proxyInterfaces">
-         <value>org.alfresco.module.org_alfresco_module_rm.vital.VitalRecordService</value>
-      </property>
-      <property name="target">
-         <ref bean="vitalRecordService" />
-      </property>
-      <property name="interceptorNames">
-         <list>
-            <idref local="VitalRecordService_transaction" />
-            <idref bean="exceptionTranslator" />
-            <idref local="VitalRecordService_security" />
-         </list>
-      </property>
-   </bean>
+    <bean id="VitalRecordService" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.module.org_alfresco_module_rm.vital.VitalRecordService</value>
+        </property>
+        <property name="target">
+            <ref bean="vitalRecordService"/>
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref local="VitalRecordService_transaction"/>
+                <idref bean="exceptionTranslator"/>
+                <idref local="VitalRecordService_security"/>
+            </list>
+        </property>
+    </bean>
 
-   <bean id="VitalRecordService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
-      <property name="transactionManager">
-         <ref bean="transactionManager" />
-      </property>
-      <property name="transactionAttributes">
-         <props>
-            <prop key="*">${server.transaction.mode.default}</prop>
-         </props>
-      </property>
-   </bean>
+    <bean id="VitalRecordService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
+        <property name="transactionManager">
+            <ref bean="transactionManager"/>
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">${server.transaction.mode.default}</prop>
+            </props>
+        </property>
+    </bean>
 
-   <bean id="VitalRecordService_security" parent="baseSecurity">
-      <property name="objectDefinitionSource">
-         <value>
-            <![CDATA[
+    <bean id="VitalRecordService_security" parent="baseSecurity">
+        <property name="objectDefinitionSource">
+            <value>
+                <![CDATA[
                 org.alfresco.module.org_alfresco_module_rm.vital.VitalRecordService.*=RM_ALLOW
                 ]]>
-         </value>
-      </property>
-   </bean>
+            </value>
+        </property>
+    </bean>
 
-   <!--  Disposition Service -->
-   <bean id="dispositionService" parent="baseService"
-         class="org.alfresco.module.org_alfresco_module_rm.disposition.DispositionServiceImpl">
-      <property name="recordsManagementServiceRegistry" ref="RecordsManagementServiceRegistry" />
-      <property name="behaviourFilter" ref="policyBehaviourFilter" />
-      <property name="filePlanService" ref="FilePlanService" />
-      <property name="recordFolderService" ref="RecordFolderService" />
-      <property name="recordService" ref="RecordService" />
-      <property name="freezeService" ref="FreezeService" />
-   </bean>
+    <!--  Disposition Service -->
+    <bean id="dispositionService" parent="baseService" class="org.alfresco.module.org_alfresco_module_rm.disposition.DispositionServiceImpl">
+        <property name="recordsManagementServiceRegistry" ref="RecordsManagementServiceRegistry"/>
+        <property name="behaviourFilter" ref="policyBehaviourFilter" />
+        <property name="filePlanService" ref="FilePlanService" />
+        <property name="recordFolderService" ref="RecordFolderService"/>
+        <property name="recordService" ref="RecordService"/>
+        <property name="freezeService" ref="FreezeService"/>
+    </bean>
 
-   <bean id="DispositionService" class="org.springframework.aop.framework.ProxyFactoryBean">
-      <property name="proxyInterfaces">
-         <value>org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService</value>
-      </property>
-      <property name="targetSource">
-         <bean class="org.alfresco.config.NonBlockingLazyInitTargetSource">
-            <property name="targetBeanName">
-               <idref bean="dispositionService" />
-            </property>
-         </bean>
-      </property>
-      <property name="interceptorNames">
-         <list>
-            <idref local="DispositionService_transaction" />
-            <idref bean="exceptionTranslator" />
-            <idref local="DispositionService_security" />
-         </list>
-      </property>
-   </bean>
+    <bean id="DispositionService" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService</value>
+        </property>
+        <property name="targetSource">
+            <bean class="org.alfresco.config.NonBlockingLazyInitTargetSource">
+                <property name="targetBeanName">
+                   <idref bean="dispositionService"/>
+                </property>
+            </bean>
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref local="DispositionService_transaction"/>
+                <idref bean="exceptionTranslator"/>
+                <idref local="DispositionService_security"/>
+            </list>
+        </property>
+    </bean>
 
-   <bean id="DispositionService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
-      <property name="transactionManager">
-         <ref bean="transactionManager" />
-      </property>
-      <property name="transactionAttributes">
-         <props>
-            <prop key="*">${server.transaction.mode.default}</prop>
-         </props>
-      </property>
-   </bean>
+    <bean id="DispositionService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
+        <property name="transactionManager">
+            <ref bean="transactionManager"/>
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">${server.transaction.mode.default}</prop>
+            </props>
+        </property>
+    </bean>
 
-   <bean id="DispositionService_security" parent="baseSecurity">
-      <property name="objectDefinitionSource">
-         <value>
-            <![CDATA[
+    <bean id="DispositionService_security" parent="baseSecurity">
+        <property name="objectDefinitionSource">
+            <value>
+                <![CDATA[
                 org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.registerDispositionProperty=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.getDispositionProperties=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.getDispositionSchedule=RM.Read.0
@@ -167,116 +162,114 @@
                 org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.calculateAsOfDate=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.*=RM_DENY
                 ]]>
-         </value>
-      </property>
-   </bean>
+            </value>
+        </property>
+    </bean>
 
-   <!--  Transfer Service -->
-   <bean id="rmTransferService" class="org.alfresco.module.org_alfresco_module_rm.transfer.TransferServiceImpl"
-         parent="baseService">
-      <property name="filePlanService" ref="FilePlanService" />
-      <property name="dispositionService" ref="dispositionService" />
-      <property name="recordService" ref="RecordService" />
-      <property name="recordFolderService" ref="RecordFolderService" />
-      <property name="nodeService" ref="nodeService" />
-      <property name="freezeService" ref="FreezeService" />
-      <property name="transferContainerType" ref="rma.transferContainer" />
-      <property name="transferType" ref="rma.transfer" />
-   </bean>
+    <!--  Transfer Service -->
+    <bean id="rmTransferService" class="org.alfresco.module.org_alfresco_module_rm.transfer.TransferServiceImpl" parent="baseService">
+        <property name="filePlanService" ref="FilePlanService" />
+        <property name="dispositionService" ref="dispositionService" />
+        <property name="recordService" ref="RecordService" />
+        <property name="recordFolderService" ref="RecordFolderService" />
+        <property name="nodeService" ref="nodeService"/>
+        <property name="freezeService" ref="FreezeService"/>
+        <property name="transferContainerType" ref="rma.transferContainer"/>
+        <property name="transferType" ref="rma.transfer"/>
+    </bean>
 
-   <bean id="RmTransferService" class="org.springframework.aop.framework.ProxyFactoryBean">
-      <property name="proxyInterfaces">
-         <value>org.alfresco.module.org_alfresco_module_rm.transfer.TransferService</value>
-      </property>
-      <property name="target">
-         <ref bean="rmTransferService" />
-      </property>
-      <property name="interceptorNames">
-         <list>
-            <idref local="rmTransferService_transaction" />
-            <idref bean="exceptionTranslator" />
-            <idref local="rmTransferService_security" />
-         </list>
-      </property>
-   </bean>
+    <bean id="RmTransferService" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.module.org_alfresco_module_rm.transfer.TransferService</value>
+        </property>
+        <property name="target">
+            <ref bean="rmTransferService"/>
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref local="rmTransferService_transaction"/>
+                <idref bean="exceptionTranslator"/>
+                <idref local="rmTransferService_security"/>
+            </list>
+        </property>
+    </bean>
 
-   <bean id="rmTransferService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
-      <property name="transactionManager">
-         <ref bean="transactionManager" />
-      </property>
-      <property name="transactionAttributes">
-         <props>
-            <prop key="*">${server.transaction.mode.default}</prop>
-         </props>
-      </property>
-   </bean>
+    <bean id="rmTransferService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
+        <property name="transactionManager">
+            <ref bean="transactionManager"/>
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">${server.transaction.mode.default}</prop>
+            </props>
+        </property>
+    </bean>
 
-   <bean id="rmTransferService_security" parent="baseSecurity">
-      <property name="objectDefinitionSource">
-         <value>
-            <![CDATA[
+    <bean id="rmTransferService_security" parent="baseSecurity">
+        <property name="objectDefinitionSource">
+            <value>
+                <![CDATA[
                 org.alfresco.module.org_alfresco_module_rm.transfer.TransferService.isTransfer=RM.Read.0
                 org.alfresco.module.org_alfresco_module_rm.transfer.TransferService.transfer=RM.Read.0
                 org.alfresco.module.org_alfresco_module_rm.transfer.TransferService.completeTransfer=RM.Read.0
                 org.alfresco.module.org_alfresco_module_rm.transfer.TransferService.*=RM_DENY
                 ]]>
-         </value>
-      </property>
-   </bean>
+            </value>
+        </property>
+    </bean>
 
-   <!--  Capability Service -->
+    <!--  Capability Service -->
 
-   <bean id="capabilityService" class="org.alfresco.module.org_alfresco_module_rm.capability.CapabilityServiceImpl">
-   </bean>
+    <bean id="capabilityService" class="org.alfresco.module.org_alfresco_module_rm.capability.CapabilityServiceImpl">
+    </bean>
 
-   <bean id="CapabilityService" class="org.springframework.aop.framework.ProxyFactoryBean">
-      <property name="proxyInterfaces">
-         <value>org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService</value>
-      </property>
-      <property name="target">
-         <ref bean="capabilityService" />
-      </property>
-      <property name="interceptorNames">
-         <list>
-            <idref local="CapabilityService_transaction" />
-            <idref bean="exceptionTranslator" />
-            <!-- <idref local="CapabilityService_security"/>  -->
-         </list>
-      </property>
-   </bean>
+    <bean id="CapabilityService" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService</value>
+        </property>
+        <property name="target">
+            <ref bean="capabilityService"/>
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref local="CapabilityService_transaction"/>
+                <idref bean="exceptionTranslator"/>
+                <!-- <idref local="CapabilityService_security"/>  -->
+            </list>
+        </property>
+    </bean>
 
-   <bean id="CapabilityService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
-      <property name="transactionManager">
-         <ref bean="transactionManager" />
-      </property>
-      <property name="transactionAttributes">
-         <props>
-            <prop key="*">${server.transaction.mode.default}</prop>
-         </props>
-      </property>
-   </bean>
+    <bean id="CapabilityService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
+        <property name="transactionManager">
+            <ref bean="transactionManager"/>
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">${server.transaction.mode.default}</prop>
+            </props>
+        </property>
+    </bean>
 
-   <bean id="CapabilityService_security" parent="baseSecurity">
-      <property name="objectDefinitionSource">
-         <value>
-            <![CDATA[
+    <bean id="CapabilityService_security" parent="baseSecurity">
+        <property name="objectDefinitionSource">
+            <value>
+                <![CDATA[
                 org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService.*=RM_ALLOW
                 ]]>
-         </value>
-      </property>
-   </bean>
+            </value>
+        </property>
+    </bean>
 
-   <!--  Records Management Search Service -->
+    <!--  Records Management Search Service -->
 
-   <bean id="recordsManagementSearchService"
-         class="org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchServiceImpl">
-      <property name="fileFolderService" ref="FileFolderService" />
-      <property name="siteService" ref="SiteService" />
-      <property name="namespaceService" ref="NamespaceService" />
-      <property name="searchService" ref="SearchService" />
-      <property name="reportsJSON">
-         <value>
-            <![CDATA[
+    <bean id="recordsManagementSearchService" class="org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchServiceImpl">
+        <property name="fileFolderService" ref="FileFolderService"/>
+        <property name="siteService" ref="SiteService"/>
+        <property name="namespaceService" ref="NamespaceService" />
+        <property name="searchService" ref="SearchService" />
+        <property name="reportsJSON">
+           <value>
+                <![CDATA[
                 [
                    {
                       "name" : "rm.savedsearch.vitalRecordsName",
@@ -346,42 +339,41 @@
                    }
                 ]
                 ]]>
-         </value>
-      </property>
-   </bean>
+            </value>
+        </property>
+    </bean>
 
-   <bean id="RecordsManagementSearchService" class="org.springframework.aop.framework.ProxyFactoryBean">
-      <property name="proxyInterfaces">
-         <value>org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchService</value>
-      </property>
-      <property name="target">
-         <ref bean="recordsManagementSearchService" />
-      </property>
-      <property name="interceptorNames">
-         <list>
-            <idref local="RecordsManagementSearchService_transaction" />
-            <idref bean="exceptionTranslator" />
-            <idref local="RecordsManagementSearchService_security" />
-         </list>
-      </property>
-   </bean>
+    <bean id="RecordsManagementSearchService" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchService</value>
+        </property>
+        <property name="target">
+            <ref bean="recordsManagementSearchService"/>
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref local="RecordsManagementSearchService_transaction"/>
+                <idref bean="exceptionTranslator"/>
+                <idref local="RecordsManagementSearchService_security"/>
+            </list>
+        </property>
+    </bean>
 
-   <bean id="RecordsManagementSearchService_transaction"
-         class="org.springframework.transaction.interceptor.TransactionInterceptor">
-      <property name="transactionManager">
-         <ref bean="transactionManager" />
-      </property>
-      <property name="transactionAttributes">
-         <props>
-            <prop key="*">${server.transaction.mode.default}</prop>
-         </props>
-      </property>
-   </bean>
+    <bean id="RecordsManagementSearchService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
+        <property name="transactionManager">
+            <ref bean="transactionManager"/>
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">${server.transaction.mode.default}</prop>
+            </props>
+        </property>
+    </bean>
 
-   <bean id="RecordsManagementSearchService_security" parent="baseSecurity">
-      <property name="objectDefinitionSource">
-         <value>
-            <![CDATA[
+    <bean id="RecordsManagementSearchService_security" parent="baseSecurity">
+        <property name="objectDefinitionSource">
+            <value>
+                <![CDATA[
                 org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchService.search=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchService.getSavedSearches=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchService.getSavedSearch=RM_ALLOW
@@ -390,46 +382,46 @@
                 org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchService.addReports=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchService.*=RM_DENY
                 ]]>
-         </value>
-      </property>
-   </bean>
+            </value>
+        </property>
+    </bean>
 
-   <!--  File Plan Service -->
+    <!--  File Plan Service -->
 
    <bean id="rootContainerCache" class="org.alfresco.repo.cache.DefaultSimpleCache" />
 
    <bean id="filePlanService"
          parent="baseService"
-         class="org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanServiceImpl">
-      <property name="rootContainerCache" ref="rootContainerCache" />
-   </bean>
+          class="org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanServiceImpl">
+        <property name="rootContainerCache" ref="rootContainerCache" />
+    </bean>
 
-   <bean id="FilePlanService" class="org.springframework.aop.framework.ProxyFactoryBean">
-      <property name="proxyInterfaces">
-         <value>org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService</value>
-      </property>
-      <property name="targetSource">
-         <bean class="org.alfresco.config.NonBlockingLazyInitTargetSource">
-            <property name="targetBeanName">
-               <idref bean="filePlanService" />
-            </property>
-         </bean>
-      </property>
-      <property name="interceptorNames">
-         <list>
-            <idref local="FilePlanService_transaction" />
-            <idref bean="exceptionTranslator" />
-            <idref local="FilePlanService_security" />
-         </list>
-      </property>
-   </bean>
+    <bean id="FilePlanService" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService</value>
+        </property>
+        <property name="targetSource">
+            <bean class="org.alfresco.config.NonBlockingLazyInitTargetSource">
+                <property name="targetBeanName">
+                   <idref bean="filePlanService"/>
+                </property>
+            </bean>
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref local="FilePlanService_transaction"/>
+                <idref bean="exceptionTranslator"/>
+                <idref local="FilePlanService_security"/>
+            </list>
+        </property>
+    </bean>
 
-   <bean id="FilePlanService_transaction" parent="baseTransaction" />
+    <bean id="FilePlanService_transaction" parent="baseTransaction" />
 
-   <bean id="FilePlanService_security" parent="baseSecurity">
-      <property name="objectDefinitionSource">
-         <value>
-            <![CDATA[
+    <bean id="FilePlanService_security" parent="baseSecurity">
+        <property name="objectDefinitionSource">
+            <value>
+                <![CDATA[
                 org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService.isFilePlanComponent=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService.getFilePlanComponentKind=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService.getFilePlanComponentKindFromType=RM_ALLOW
@@ -454,114 +446,112 @@
                 org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService.createRecordCategory=RM.Create.0
                 org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService.*=RM_DENY
                 ]]>
-         </value>
-      </property>
-   </bean>
+            </value>
+        </property>
+    </bean>
 
    <!--  File Plan Permission Service -->
 
    <bean id="filePlanPermissionService"
          parent="baseService"
-         class="org.alfresco.module.org_alfresco_module_rm.security.FilePlanPermissionServiceImpl"
-         init-method="init">
-      <property name="permissionService" ref="PermissionService" />
-      <property name="policyComponent" ref="policyComponent" />
-      <property name="ownableService" ref="ownableService" />
-      <property name="authorityService" ref="AuthorityService" />
-      <property name="filePlanRoleService" ref="FilePlanRoleService" />
-      <property name="filePlanService" ref="FilePlanService" />
-      <property name="recordsManagementAuditService" ref="RecordsManagementAuditService" />
-   </bean>
+          class="org.alfresco.module.org_alfresco_module_rm.security.FilePlanPermissionServiceImpl"
+          init-method="init">
+        <property name="permissionService" ref="PermissionService"/>
+        <property name="policyComponent" ref="policyComponent"/>
+        <property name="ownableService" ref="ownableService" />
+        <property name="authorityService" ref="AuthorityService" />
+        <property name="filePlanRoleService" ref="FilePlanRoleService" />
+        <property name="filePlanService" ref="FilePlanService" />
+        <property name="recordsManagementAuditService" ref="RecordsManagementAuditService" />
+    </bean>
 
-   <bean id="FilePlanPermissionService" class="org.springframework.aop.framework.ProxyFactoryBean">
-      <property name="proxyInterfaces">
-         <value>org.alfresco.module.org_alfresco_module_rm.security.FilePlanPermissionService</value>
-      </property>
-      <property name="target">
-         <ref bean="filePlanPermissionService" />
-      </property>
-      <property name="interceptorNames">
-         <list>
-            <idref local="FilePlanPermissionService_transaction" />
-            <idref bean="exceptionTranslator" />
-            <idref local="FilePlanPermissionService_security" />
-         </list>
-      </property>
-   </bean>
+    <bean id="FilePlanPermissionService" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.module.org_alfresco_module_rm.security.FilePlanPermissionService</value>
+        </property>
+        <property name="target">
+            <ref bean="filePlanPermissionService"/>
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref local="FilePlanPermissionService_transaction"/>
+                <idref bean="exceptionTranslator"/>
+                <idref local="FilePlanPermissionService_security"/>
+            </list>
+        </property>
+    </bean>
 
-   <bean id="FilePlanPermissionService_transaction"
-         class="org.springframework.transaction.interceptor.TransactionInterceptor">
-      <property name="transactionManager">
-         <ref bean="transactionManager" />
-      </property>
-      <property name="transactionAttributes">
-         <props>
-            <prop key="*">${server.transaction.mode.default}</prop>
-         </props>
-      </property>
-   </bean>
+    <bean id="FilePlanPermissionService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
+        <property name="transactionManager">
+            <ref bean="transactionManager"/>
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">${server.transaction.mode.default}</prop>
+            </props>
+        </property>
+    </bean>
 
-   <bean id="FilePlanPermissionService_security" parent="baseSecurity">
-      <property name="objectDefinitionSource">
-         <value>
-            <![CDATA[
+    <bean id="FilePlanPermissionService_security" parent="baseSecurity">
+        <property name="objectDefinitionSource">
+            <value>
+                <![CDATA[
                 org.alfresco.module.org_alfresco_module_rm.security.FilePlanPermissionService.setupRecordCategoryPermissions=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.security.FilePlanPermissionService.setupPermissions=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.security.FilePlanPermissionService.setPermission=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.security.FilePlanPermissionService.deletePermission=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.security.FilePlanPermissionService.*=RM_DENY
                 ]]>
-         </value>
-      </property>
-   </bean>
+            </value>
+        </property>
+    </bean>
 
-   <!-- File Plan Role Service -->
+    <!-- File Plan Role Service -->
 
-   <bean id="filePlanRoleService"
-         class="org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleServiceImpl"
-         depends-on="org_alfresco_module_rm_dictionaryBootstrap">
-      <property name="capabilityService" ref="CapabilityService" />
-      <property name="authorityService" ref="AuthorityService" />
-      <property name="permissionService" ref="PermissionService" />
-      <property name="nodeService" ref="NodeService" />
-      <property name="filePlanService" ref="FilePlanService" />
-      <!-- init repo for when a tenant is created -->
-      <property name="bootstrapImporterModuleComponent" ref="org_alfresco_module_rm_bootstrapData" />
+    <bean id="filePlanRoleService"
+          class="org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleServiceImpl"
+          depends-on="org_alfresco_module_rm_dictionaryBootstrap">
+        <property name="capabilityService" ref="CapabilityService"/>
+        <property name="authorityService" ref="AuthorityService"/>
+        <property name="permissionService" ref="PermissionService"/>
+        <property name="nodeService" ref="NodeService"/>
+        <property name="filePlanService" ref="FilePlanService" />
+        <!-- init repo for when a tenant is created -->
+        <property name="bootstrapImporterModuleComponent" ref="org_alfresco_module_rm_bootstrapData"/>
 
-   </bean>
+    </bean>
 
-   <bean id="FilePlanRoleService" class="org.springframework.aop.framework.ProxyFactoryBean">
-      <property name="proxyInterfaces">
-         <value>org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService</value>
-      </property>
-      <property name="target">
-         <ref bean="filePlanRoleService" />
-      </property>
-      <property name="interceptorNames">
-         <list>
-            <idref local="FilePlanRoleService_transaction" />
-            <idref bean="exceptionTranslator" />
-            <idref local="FilePlanRoleService_security" />
-         </list>
-      </property>
-   </bean>
+    <bean id="FilePlanRoleService" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService</value>
+        </property>
+        <property name="target">
+            <ref bean="filePlanRoleService"/>
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref local="FilePlanRoleService_transaction"/>
+                <idref bean="exceptionTranslator"/>
+                <idref local="FilePlanRoleService_security"/>
+            </list>
+        </property>
+    </bean>
 
-   <bean id="FilePlanRoleService_transaction"
-         class="org.springframework.transaction.interceptor.TransactionInterceptor">
-      <property name="transactionManager">
-         <ref bean="transactionManager" />
-      </property>
-      <property name="transactionAttributes">
-         <props>
-            <prop key="*">${server.transaction.mode.default}</prop>
-         </props>
-      </property>
-   </bean>
+    <bean id="FilePlanRoleService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
+        <property name="transactionManager">
+            <ref bean="transactionManager"/>
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">${server.transaction.mode.default}</prop>
+            </props>
+        </property>
+    </bean>
 
-   <bean id="FilePlanRoleService_security" parent="baseSecurity">
-      <property name="objectDefinitionSource">
-         <value>
-            <![CDATA[
+    <bean id="FilePlanRoleService_security" parent="baseSecurity">
+        <property name="objectDefinitionSource">
+            <value>
+               <![CDATA[
                 org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService.setupFilePlanRoles=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService.tearDownFilePlanRoles=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService.getRoles=RM_ALLOW
@@ -580,142 +570,138 @@
                 org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService.getAllRolesContainerGroup=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService.*=RM_DENY
                 ]]>
-         </value>
-      </property>
-   </bean>
+            </value>
+        </property>
+    </bean>
 
 
-   <!--  Records Management Extended Security Service -->
+    <!--  Records Management Extended Security Service -->
 
-   <bean id="extendedSecurityService"
-         class="org.alfresco.module.org_alfresco_module_rm.security.ExtendedSecurityServiceImpl"
-         parent="baseService">
-      <property name="nodeService" ref="nodeService" />
-      <property name="filePlanService" ref="filePlanService" />
-      <property name="filePlanRoleService" ref="filePlanRoleService" />
-      <property name="authorityService" ref="authorityService" />
-      <property name="permissionService" ref="permissionService" />
-      <property name="transactionService" ref="transactionService" />
-   </bean>
+    <bean id="extendedSecurityService"
+          class="org.alfresco.module.org_alfresco_module_rm.security.ExtendedSecurityServiceImpl"
+          parent="baseService">
+        <property name="nodeService" ref="nodeService"/>
+        <property name="filePlanService" ref="filePlanService" />
+        <property name="filePlanRoleService" ref="filePlanRoleService" />
+        <property name="authorityService" ref="authorityService"/>
+        <property name="permissionService" ref="permissionService"/>
+        <property name="transactionService" ref="transactionService"/>
+    </bean>
 
-   <bean id="ExtendedSecurityService" class="org.springframework.aop.framework.ProxyFactoryBean">
-      <property name="proxyInterfaces">
-         <value>org.alfresco.module.org_alfresco_module_rm.security.ExtendedSecurityService</value>
-      </property>
-      <property name="target">
-         <ref bean="extendedSecurityService" />
-      </property>
-      <property name="interceptorNames">
-         <list>
-            <idref local="ExtendedSecurityService_transaction" />
-            <idref bean="exceptionTranslator" />
-            <idref local="ExtendedSecurityService_security" />
-         </list>
-      </property>
-   </bean>
+    <bean id="ExtendedSecurityService" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.module.org_alfresco_module_rm.security.ExtendedSecurityService</value>
+        </property>
+        <property name="target">
+            <ref bean="extendedSecurityService"/>
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref local="ExtendedSecurityService_transaction"/>
+                <idref bean="exceptionTranslator"/>
+                <idref local="ExtendedSecurityService_security"/>
+            </list>
+        </property>
+    </bean>
 
-   <bean id="ExtendedSecurityService_transaction" parent="baseTransaction" />
+    <bean id="ExtendedSecurityService_transaction" parent="baseTransaction"/>
 
-   <bean id="ExtendedSecurityService_security" parent="baseSecurity">
-      <property name="objectDefinitionSource">
-         <value>
-            <![CDATA[
+    <bean id="ExtendedSecurityService_security" parent="baseSecurity">
+        <property name="objectDefinitionSource">
+            <value>
+                <![CDATA[
              org.alfresco.module.org_alfresco_module_rm.security.ExtendedSecurityService.*=RM_ALLOW
                 ]]>
-         </value>
-      </property>
-   </bean>
+            </value>
+        </property>
+    </bean>
 
-   <!--  Model Security service -->
+    <!--  Model Security service -->
 
-   <bean id="modelSecurityService"
-         class="org.alfresco.module.org_alfresco_module_rm.model.security.ModelSecurityServiceImpl"
-         parent="rm.baseBehaviour">
-      <property name="enabled" value="true" />
-      <property name="namespaceService" ref="namespaceService" />
-      <property name="filePlanService" ref="FilePlanService" />
-   </bean>
+    <bean id="modelSecurityService"
+          class="org.alfresco.module.org_alfresco_module_rm.model.security.ModelSecurityServiceImpl"
+          parent = "rm.baseBehaviour">
+        <property name="enabled" value="true" />
+        <property name="namespaceService" ref="namespaceService" />
+        <property name="filePlanService" ref="FilePlanService" />
+    </bean>
 
-   <bean id="ModelSecurityService" class="org.springframework.aop.framework.ProxyFactoryBean">
-      <property name="proxyInterfaces">
-         <value>org.alfresco.module.org_alfresco_module_rm.model.security.ModelSecurityService</value>
-      </property>
-      <property name="target">
-         <ref bean="modelSecurityService" />
-      </property>
-      <property name="interceptorNames">
-         <list>
-            <idref local="ModelSecurityService_transaction" />
-            <idref bean="exceptionTranslator" />
-            <idref local="ModelSecurityService_security" />
-         </list>
-      </property>
-   </bean>
+    <bean id="ModelSecurityService" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.module.org_alfresco_module_rm.model.security.ModelSecurityService</value>
+        </property>
+        <property name="target">
+            <ref bean="modelSecurityService"/>
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref local="ModelSecurityService_transaction"/>
+                <idref bean="exceptionTranslator"/>
+                <idref local="ModelSecurityService_security"/>
+            </list>
+        </property>
+    </bean>
 
-   <bean id="ModelSecurityService_transaction"
-         class="org.springframework.transaction.interceptor.TransactionInterceptor">
-      <property name="transactionManager">
-         <ref bean="transactionManager" />
-      </property>
-      <property name="transactionAttributes">
-         <props>
-            <prop key="*">${server.transaction.mode.default}</prop>
-         </props>
-      </property>
-   </bean>
+    <bean id="ModelSecurityService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
+        <property name="transactionManager">
+            <ref bean="transactionManager"/>
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">${server.transaction.mode.default}</prop>
+            </props>
+        </property>
+    </bean>
 
-   <bean id="ModelSecurityService_security" parent="baseSecurity">
-      <property name="objectDefinitionSource">
-         <value>
-            <![CDATA[
+    <bean id="ModelSecurityService_security" parent="baseSecurity">
+        <property name="objectDefinitionSource">
+            <value>
+                <![CDATA[
              org.alfresco.module.org_alfresco_module_rm.model.security.ModelSecurityService.*=RM_ALLOW
                 ]]>
-         </value>
-      </property>
-   </bean>
+            </value>
+        </property>
+    </bean>
 
-   <!-- Records Management Action Service -->
+    <!-- Records Management Action Service -->
 
-   <bean id="recordsManagementActionService"
-         class="org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionServiceImpl"
-         init-method="init">
-      <property name="policyComponent" ref="policyComponent" />
-      <property name="nodeService" ref="nodeService" />
-   </bean>
+    <bean id="recordsManagementActionService" class="org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionServiceImpl" init-method="init">
+        <property name="policyComponent" ref="policyComponent"/>
+        <property name="nodeService" ref="nodeService"/>
+    </bean>
 
-   <bean id="RecordsManagementActionService" class="org.springframework.aop.framework.ProxyFactoryBean">
-      <property name="proxyInterfaces">
-         <value>org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionService</value>
-      </property>
-      <property name="target">
-         <ref bean="recordsManagementActionService" />
-      </property>
-      <property name="interceptorNames">
-         <list>
-            <idref local="RecordsManagementActionService_transaction" />
-            <idref bean="exceptionTranslator" />
-            <idref local="RecordsManagementActionService_security" />
-         </list>
-      </property>
-   </bean>
+    <bean id="RecordsManagementActionService" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionService</value>
+        </property>
+        <property name="target">
+            <ref bean="recordsManagementActionService"/>
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref local="RecordsManagementActionService_transaction"/>
+                <idref bean="exceptionTranslator"/>
+                <idref local="RecordsManagementActionService_security"/>
+            </list>
+        </property>
+    </bean>
 
-   <bean id="RecordsManagementActionService_transaction"
-         class="org.springframework.transaction.interceptor.TransactionInterceptor">
-      <property name="transactionManager">
-         <ref bean="transactionManager" />
-      </property>
-      <property name="transactionAttributes">
-         <props>
-            <prop key="*">${server.transaction.mode.default}</prop>
-         </props>
-      </property>
-   </bean>
+    <bean id="RecordsManagementActionService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
+        <property name="transactionManager">
+            <ref bean="transactionManager"/>
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">${server.transaction.mode.default}</prop>
+            </props>
+        </property>
+    </bean>
 
 
-   <bean id="RecordsManagementActionService_security" parent="baseSecurity">
-      <property name="objectDefinitionSource">
-         <value>
-            <![CDATA[
+    <bean id="RecordsManagementActionService_security" parent="baseSecurity">
+        <property name="objectDefinitionSource">
+            <value>
+                <![CDATA[
                 org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionService.getRecordsManagementActions=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionService.getRecordsManagementActionConditions=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionService.getDispositionActions=RM_ALLOW
@@ -730,51 +716,49 @@
                 org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionService.register=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionService.*=RM_DENY
                 ]]>
-         </value>
-      </property>
-   </bean>
+            </value>
+        </property>
+    </bean>
 
-   <!-- Records Management Event Service -->
+    <!-- Records Management Event Service -->
 
-   <bean id="recordsManagementEventService"
-         class="org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEventServiceImpl">
-      <property name="nodeService" ref="NodeService" />
-      <property name="contentService" ref="ContentService" />
-   </bean>
+    <bean id="recordsManagementEventService" class="org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEventServiceImpl">
+      <property name="nodeService" ref="NodeService"/>
+      <property name="contentService" ref="ContentService"/>
+    </bean>
 
-   <bean id="RecordsManagementEventService" class="org.springframework.aop.framework.ProxyFactoryBean">
-      <property name="proxyInterfaces">
-         <value>org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEventService</value>
-      </property>
-      <property name="target">
-         <ref bean="recordsManagementEventService" />
-      </property>
-      <property name="interceptorNames">
-         <list>
-            <idref local="RecordsManagementEventService_transaction" />
-            <idref bean="exceptionTranslator" />
-            <idref local="RecordsManagementEventService_security" />
-         </list>
-      </property>
-   </bean>
+    <bean id="RecordsManagementEventService" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEventService</value>
+        </property>
+        <property name="target">
+            <ref bean="recordsManagementEventService"/>
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref local="RecordsManagementEventService_transaction"/>
+                <idref bean="exceptionTranslator"/>
+                <idref local="RecordsManagementEventService_security"/>
+            </list>
+        </property>
+    </bean>
 
-   <bean id="RecordsManagementEventService_transaction"
-         class="org.springframework.transaction.interceptor.TransactionInterceptor">
-      <property name="transactionManager">
-         <ref bean="transactionManager" />
-      </property>
-      <property name="transactionAttributes">
-         <props>
-            <prop key="*">${server.transaction.mode.default}</prop>
-         </props>
-      </property>
-   </bean>
+    <bean id="RecordsManagementEventService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
+        <property name="transactionManager">
+            <ref bean="transactionManager"/>
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">${server.transaction.mode.default}</prop>
+            </props>
+        </property>
+    </bean>
 
 
-   <bean id="RecordsManagementEventService_security" parent="baseSecurity">
-      <property name="objectDefinitionSource">
-         <value>
-            <![CDATA[
+    <bean id="RecordsManagementEventService_security" parent="baseSecurity">
+        <property name="objectDefinitionSource">
+            <value>
+                <![CDATA[
                 org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEventService.registerEventType=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEventService.getEventTypes=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEventService.getEventType=RM_ALLOW
@@ -787,26 +771,23 @@
                 org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEventService.canEditEvent=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEventService.*=RM_DENY
                 ]]>
-         </value>
-      </property>
-   </bean>
+            </value>
+        </property>
+    </bean>
 
-   <bean id="recordsManagementAdminBase"
-         class="org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminBase" abstract="true">
-      <property name="dictionaryService" ref="DictionaryService" />
-      <property name="nodeService" ref="NodeService" />
-      <property name="contentService" ref="contentService" />
-      <property name="namespaceService" ref="NamespaceService" />
-      <property name="dictionaryRepositoryBootstrap" ref="dictionaryRepositoryBootstrap" />
+   <bean id="recordsManagementAdminBase" class="org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminBase" abstract="true">
+      <property name="dictionaryService" ref="DictionaryService"/>
+      <property name="nodeService" ref="NodeService"/>
+      <property name="contentService" ref="contentService"/>
+      <property name="namespaceService" ref="NamespaceService"/>
+      <property name="dictionaryRepositoryBootstrap" ref="dictionaryRepositoryBootstrap"/>
    </bean>
 
    <!-- Records Management Admin Service -->
 
-   <bean id="recordsManagementAdminService"
-         class="org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminServiceImpl"
-         parent="recordsManagementAdminBase">
+   <bean id="recordsManagementAdminService" class="org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminServiceImpl" parent="recordsManagementAdminBase">
       <property name="relationshipService" ref="RelationshipService" />
-      <property name="transactionService" ref="transactionService" />
+      <property name="transactionService" ref="transactionService"/>
       <property name="customisableTypes">
          <list>
             <value>rma:recordCategory</value>
@@ -817,39 +798,38 @@
       </property>
    </bean>
 
-   <bean id="RecordsManagementAdminService" class="org.springframework.aop.framework.ProxyFactoryBean">
-      <property name="proxyInterfaces">
-         <value>org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService</value>
-      </property>
-      <property name="target">
-         <ref bean="recordsManagementAdminService" />
-      </property>
-      <property name="interceptorNames">
-         <list>
-            <idref local="RecordsManagementAdminService_transaction" />
-            <idref bean="exceptionTranslator" />
-            <idref local="RecordsManagementAdminService_security" />
-         </list>
-      </property>
-   </bean>
+    <bean id="RecordsManagementAdminService" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService</value>
+        </property>
+        <property name="target">
+            <ref bean="recordsManagementAdminService"/>
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref local="RecordsManagementAdminService_transaction"/>
+                <idref bean="exceptionTranslator"/>
+                <idref local="RecordsManagementAdminService_security"/>
+            </list>
+        </property>
+    </bean>
 
-   <bean id="RecordsManagementAdminService_transaction"
-         class="org.springframework.transaction.interceptor.TransactionInterceptor">
-      <property name="transactionManager">
-         <ref bean="transactionManager" />
-      </property>
-      <property name="transactionAttributes">
-         <props>
-            <prop key="*">${server.transaction.mode.default}</prop>
-         </props>
-      </property>
-   </bean>
+    <bean id="RecordsManagementAdminService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
+        <property name="transactionManager">
+            <ref bean="transactionManager"/>
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">${server.transaction.mode.default}</prop>
+            </props>
+        </property>
+    </bean>
 
 
-   <bean id="RecordsManagementAdminService_security" parent="baseSecurity">
-      <property name="objectDefinitionSource">
-         <value>
-            <![CDATA[
+    <bean id="RecordsManagementAdminService_security" parent="baseSecurity">
+        <property name="objectDefinitionSource">
+            <value>
+                <![CDATA[
                 org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.getCustomisable=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.isCustomisable=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.makeCustomisable=RM_ALLOW
@@ -882,50 +862,50 @@
                 org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.getCompoundIdFor=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.*=RM_DENY
                 ]]>
-         </value>
-      </property>
-   </bean>
+            </value>
+        </property>
+    </bean>
 
-   <!--  Freeze Service  -->
+    <!--  Freeze Service  -->
 
-   <bean id="freezeService" class="org.alfresco.module.org_alfresco_module_rm.freeze.FreezeServiceImpl">
-      <property name="nodeService" ref="nodeService" />
-      <property name="dictionaryService" ref="DictionaryService" />
-      <property name="filePlanService" ref="FilePlanService" />
-      <property name="holdService" ref="HoldService" />
-   </bean>
+    <bean id="freezeService" class="org.alfresco.module.org_alfresco_module_rm.freeze.FreezeServiceImpl">
+        <property name="nodeService" ref="nodeService" />
+        <property name="dictionaryService" ref="DictionaryService" />
+        <property name="filePlanService" ref="FilePlanService" />
+        <property name="holdService" ref="HoldService" />
+    </bean>
 
-   <bean id="FreezeService" class="org.springframework.aop.framework.ProxyFactoryBean">
-      <property name="proxyInterfaces">
-         <value>org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService</value>
-      </property>
-      <property name="target">
-         <ref bean="freezeService" />
-      </property>
-      <property name="interceptorNames">
-         <list>
-            <idref local="FreezeService_transaction" />
-            <idref bean="exceptionTranslator" />
-            <idref local="FreezeService_security" />
-         </list>
-      </property>
-   </bean>
+    <bean id="FreezeService" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService</value>
+        </property>
+        <property name="target">
+            <ref bean="freezeService"/>
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref local="FreezeService_transaction"/>
+                <idref bean="exceptionTranslator"/>
+                <idref local="FreezeService_security"/>
+            </list>
+        </property>
+    </bean>
 
-   <bean id="FreezeService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
-      <property name="transactionManager">
-         <ref bean="transactionManager" />
-      </property>
-      <property name="transactionAttributes">
-         <props>
-            <prop key="*">${server.transaction.mode.default}</prop>
-         </props>
-      </property>
-   </bean>
+    <bean id="FreezeService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
+        <property name="transactionManager">
+            <ref bean="transactionManager"/>
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">${server.transaction.mode.default}</prop>
+            </props>
+        </property>
+    </bean>
 
-   <bean id="FreezeService_security" parent="baseSecurity">
-      <property name="objectDefinitionSource">
-         <value>
-            <![CDATA[
+    <bean id="FreezeService_security" parent="baseSecurity">
+        <property name="objectDefinitionSource">
+            <value>
+                <![CDATA[
                 org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService.isHold=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService.isFrozen=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService.getFrozen=RM_ALLOW
@@ -940,67 +920,65 @@
                 org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService.getFreezeInitiator=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService.*=RM_DENY
                 ]]>
-         </value>
-      </property>
-   </bean>
+            </value>
+        </property>
+    </bean>
 
-   <!-- Records Management Audit Service -->
+    <!-- Records Management Audit Service -->
 
-   <bean id="recordsManagementAuditService"
-         class="org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditServiceImpl" init-method="init">
-      <property name="policyComponent" ref="policyComponent" />
-      <property name="dictionaryService" ref="dictionaryService" />
-      <property name="transactionService" ref="transactionService" />
-      <property name="nodeService" ref="nodeService" />
-      <property name="auditComponent" ref="auditComponent" />
-      <property name="auditService" ref="auditService" />
-      <property name="contentService" ref="ContentService" />
-      <property name="recordsManagementActionService" ref="RecordsManagementActionService" />
-      <property name="filePlanService" ref="FilePlanService" />
-      <property name="namespaceService" ref="NamespaceService" />
-      <property name="capabilityService" ref="CapabilityService" />
-      <property name="ignoredAuditProperties">
-         <list>
-            <value>cm:lastThumbnailModification</value>
-            <value>cm:autoVersion</value>
-            <value>cm:autoVersionOnUpdateProps</value>
-            <value>cm:initialVersion</value>
-         </list>
-      </property>
-   </bean>
+    <bean id="recordsManagementAuditService" class="org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditServiceImpl" init-method="init">
+        <property name="policyComponent" ref="policyComponent" />
+        <property name="dictionaryService" ref="dictionaryService" />
+        <property name="transactionService" ref="transactionService" />
+        <property name="nodeService" ref="nodeService" />
+        <property name="auditComponent" ref="auditComponent" />
+        <property name="auditService" ref="auditService" />
+        <property name="contentService" ref="ContentService" />
+        <property name="recordsManagementActionService" ref="RecordsManagementActionService" />
+        <property name="filePlanService" ref="FilePlanService" />
+        <property name="namespaceService" ref="NamespaceService" />
+        <property name="capabilityService" ref="CapabilityService" />
+        <property name="ignoredAuditProperties">
+            <list>
+                <value>cm:lastThumbnailModification</value>
+                <value>cm:autoVersion</value>
+                <value>cm:autoVersionOnUpdateProps</value>
+                <value>cm:initialVersion</value>
+            </list>
+        </property>
+    </bean>
 
-   <bean id="RecordsManagementAuditService" class="org.springframework.aop.framework.ProxyFactoryBean">
-      <property name="proxyInterfaces">
-         <value>org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService</value>
-      </property>
-      <property name="target">
-         <ref bean="recordsManagementAuditService" />
-      </property>
-      <property name="interceptorNames">
-         <list>
-            <idref local="RecordsManagementAuditService_transaction" />
-            <idref bean="exceptionTranslator" />
-            <idref local="RecordsManagementAuditService_security" />
-         </list>
-      </property>
-   </bean>
+    <bean id="RecordsManagementAuditService" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService</value>
+        </property>
+        <property name="target">
+            <ref bean="recordsManagementAuditService"/>
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref local="RecordsManagementAuditService_transaction"/>
+                <idref bean="exceptionTranslator"/>
+                <idref local="RecordsManagementAuditService_security"/>
+            </list>
+        </property>
+    </bean>
 
-   <bean id="RecordsManagementAuditService_transaction"
-         class="org.springframework.transaction.interceptor.TransactionInterceptor">
-      <property name="transactionManager">
-         <ref bean="transactionManager" />
-      </property>
-      <property name="transactionAttributes">
-         <props>
-            <prop key="*">${server.transaction.mode.default}</prop>
-         </props>
-      </property>
-   </bean>
+    <bean id="RecordsManagementAuditService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
+        <property name="transactionManager">
+            <ref bean="transactionManager"/>
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">${server.transaction.mode.default}</prop>
+            </props>
+        </property>
+    </bean>
 
-   <bean id="RecordsManagementAuditService_security" parent="baseSecurity">
-      <property name="objectDefinitionSource">
-         <value>
-            <![CDATA[
+    <bean id="RecordsManagementAuditService_security" parent="baseSecurity">
+        <property name="objectDefinitionSource">
+            <value>
+                <![CDATA[
                 org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.registerAuditEvent=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.auditEvent=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.auditOrUpdateEvent=RM_ALLOW
@@ -1016,53 +994,51 @@
                 org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.getAuditEvents=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.*=RM_DENY
                 ]]>
-         </value>
-      </property>
-   </bean>
+            </value>
+        </property>
+    </bean>
 
-   <!--  Record Folder Service -->
+    <!--  Record Folder Service -->
 
-   <bean id="recordFolderService"
-         class="org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderServiceImpl">
-      <property name="nodeService" ref="NodeService" />
-      <property name="dispositionService" ref="DispositionService" />
-      <property name="dictionaryService" ref="DictionaryService" />
-      <property name="filePlanService" ref="FilePlanService" />
-      <property name="recordService" ref="RecordService" />
-   </bean>
+    <bean id="recordFolderService" class="org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderServiceImpl">
+        <property name="nodeService" ref="NodeService"/>
+        <property name="dispositionService" ref="DispositionService" />
+        <property name="dictionaryService" ref="DictionaryService" />
+        <property name="filePlanService" ref="FilePlanService" />
+        <property name="recordService" ref="RecordService" />
+    </bean>
 
-   <bean id="RecordFolderService" class="org.springframework.aop.framework.ProxyFactoryBean">
-      <property name="proxyInterfaces">
-         <value>org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService</value>
-      </property>
-      <property name="target">
-         <ref bean="recordFolderService" />
-      </property>
-      <property name="interceptorNames">
-         <list>
-            <idref local="RecordFolderService_transaction" />
-            <idref bean="exceptionTranslator" />
-            <idref local="RecordFolderService_security" />
-         </list>
-      </property>
-   </bean>
+    <bean id="RecordFolderService" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService</value>
+        </property>
+        <property name="target">
+            <ref bean="recordFolderService"/>
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref local="RecordFolderService_transaction"/>
+                <idref bean="exceptionTranslator"/>
+                <idref local="RecordFolderService_security"/>
+            </list>
+        </property>
+    </bean>
 
-   <bean id="RecordFolderService_transaction"
-         class="org.springframework.transaction.interceptor.TransactionInterceptor">
-      <property name="transactionManager">
-         <ref bean="transactionManager" />
-      </property>
-      <property name="transactionAttributes">
-         <props>
-            <prop key="*">${server.transaction.mode.default}</prop>
-         </props>
-      </property>
-   </bean>
+    <bean id="RecordFolderService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
+        <property name="transactionManager">
+            <ref bean="transactionManager"/>
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">${server.transaction.mode.default}</prop>
+            </props>
+        </property>
+    </bean>
 
-   <bean id="RecordFolderService_security" parent="baseSecurity">
-      <property name="objectDefinitionSource">
-         <value>
-            <![CDATA[
+    <bean id="RecordFolderService_security" parent="baseSecurity">
+        <property name="objectDefinitionSource">
+            <value>
+                <![CDATA[
                 org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService.isRecordFolder=RM.Read.0
                 org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService.isRecordFolderDeclared=RM.Read.0
                 org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService.isRecordFolderClosed=RM.Read.0
@@ -1072,39 +1048,38 @@
                 org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService.closeRecordFolder=RM_CAP.0.rma:filePlanComponent.CloseFolders
                 org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService.*=RM_DENY
                 ]]>
-         </value>
-      </property>
-   </bean>
+            </value>
+        </property>
+    </bean>
 
-   <!--  Record Service -->
+    <!--  Record Service -->
 
-   <bean id="recordService" parent="rm.baseBehaviour"
-         class="org.alfresco.module.org_alfresco_module_rm.record.RecordServiceImpl" init-method="init">
-      <property name="identifierService" ref="recordsManagementIdentifierService" />
-      <property name="extendedPermissionService" ref="ExtendedPermissionService" />
-      <property name="extendedSecurityService" ref="ExtendedSecurityService" />
-      <property name="policyComponent" ref="policyComponent" />
-      <property name="filePlanService" ref="FilePlanService" />
-      <property name="ownableService" ref="OwnableService" />
-      <property name="notificationHelper" ref="recordsManagementNotificationHelper" />
-      <property name="capabilityService" ref="CapabilityService" />
-      <property name="ruleService" ref="RuleService" />
-      <property name="fileFolderService" ref="FileFolderService" />
-      <property name="recordFolderService" ref="RecordFolderService" />
-      <property name="filePlanRoleService" ref="FilePlanRoleService" />
-      <property name="permissionService" ref="permissionService" />
-      <property name="versionService" ref="VersionService" />
-      <property name="relationshipService" ref="RelationshipService" />
-      <property name="recordsManagementContainerType" ref="rma.recordsManagementContainer" />
-      <property name="renditionService" ref="RenditionService" />
-      <property name="dispositionService" ref="DispositionService" />
-      <property name="recordableVersionService" ref="RecordableVersionService" />
-      <property name="alwaysEditURIs" ref="recordService_alwaysEditURIs" />
-      <property name="incompleteNodeTagger" ref="incompleteNodeTagger" />
-      <property name="freezeService" ref="FreezeService" />
-      <property name="namespaceService" ref="NamespaceService" />
-      <property name="checkMandatoryPropertiesEnabled" value="${rm.completerecord.mandatorypropertiescheck.enabled}" />
-   </bean>
+    <bean id="recordService" parent="rm.baseBehaviour" class="org.alfresco.module.org_alfresco_module_rm.record.RecordServiceImpl" init-method="init">
+        <property name="identifierService" ref="recordsManagementIdentifierService"/>
+        <property name="extendedPermissionService" ref="ExtendedPermissionService"/>
+        <property name="extendedSecurityService" ref="ExtendedSecurityService" />
+        <property name="policyComponent" ref="policyComponent" />
+        <property name="filePlanService" ref="FilePlanService" />
+        <property name="ownableService" ref="OwnableService" />
+        <property name="notificationHelper" ref="recordsManagementNotificationHelper"/>
+        <property name="capabilityService" ref="CapabilityService" />
+        <property name="ruleService" ref="RuleService" />
+        <property name="fileFolderService" ref="FileFolderService" />
+        <property name="recordFolderService" ref="RecordFolderService" />
+        <property name="filePlanRoleService" ref="FilePlanRoleService" />
+        <property name="permissionService" ref="permissionService" />
+        <property name="versionService" ref="VersionService" />
+        <property name="relationshipService" ref="RelationshipService" />
+        <property name="recordsManagementContainerType" ref="rma.recordsManagementContainer"/>
+        <property name="renditionService" ref="RenditionService" />
+        <property name="dispositionService" ref="DispositionService"/>
+        <property name="recordableVersionService" ref="RecordableVersionService"/>
+        <property name="alwaysEditURIs" ref="recordService_alwaysEditURIs" />
+        <property name="incompleteNodeTagger" ref="incompleteNodeTagger" />
+        <property name="freezeService" ref="FreezeService" />
+        <property name="namespaceService" ref="NamespaceService"/>
+        <property name="checkMandatoryPropertiesEnabled" value="${rm.completerecord.mandatorypropertiescheck.enabled}"/>
+    </bean>
 
    <!-- Defines a list of namespace URIs for properties, which should be always editable -->
    <util:list id="recordService_alwaysEditURIs" value-type="java.lang.String">
@@ -1118,48 +1093,46 @@
       <value>http://www.alfresco.org/model/rendition/1.0</value>
    </util:list>
 
-   <bean id="recordMetadataAspectBootstrap"
-         class="org.alfresco.module.org_alfresco_module_rm.record.RecordMetadataBootstrap" init-method="init"
-         abstract="true">
-      <property name="recordService" ref="recordService" />
-      <property name="namespaceService" ref="namespaceService" />
-   </bean>
+    <bean id="recordMetadataAspectBootstrap" class="org.alfresco.module.org_alfresco_module_rm.record.RecordMetadataBootstrap" init-method="init" abstract="true">
+      <property name="recordService" ref="recordService"/>
+      <property name="namespaceService" ref="namespaceService"/>
+    </bean>
 
-   <bean id="RecordService" class="org.springframework.aop.framework.ProxyFactoryBean">
-      <property name="proxyInterfaces">
-         <value>org.alfresco.module.org_alfresco_module_rm.record.RecordService</value>
-      </property>
-      <property name="targetSource">
-         <bean class="org.alfresco.config.NonBlockingLazyInitTargetSource">
-            <property name="targetBeanName">
-               <idref bean="recordService" />
-            </property>
-         </bean>
-      </property>
-      <property name="interceptorNames">
-         <list>
-            <idref local="RecordService_transaction" />
-            <idref bean="exceptionTranslator" />
-            <idref local="RecordService_security" />
-         </list>
-      </property>
-   </bean>
+    <bean id="RecordService" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.module.org_alfresco_module_rm.record.RecordService</value>
+        </property>
+        <property name="targetSource">
+            <bean class="org.alfresco.config.NonBlockingLazyInitTargetSource">
+                <property name="targetBeanName">
+                   <idref bean="recordService"/>
+                </property>
+            </bean>
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref local="RecordService_transaction"/>
+                <idref bean="exceptionTranslator"/>
+                <idref local="RecordService_security"/>
+            </list>
+        </property>
+    </bean>
 
-   <bean id="RecordService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
-      <property name="transactionManager">
-         <ref bean="transactionManager" />
-      </property>
-      <property name="transactionAttributes">
-         <props>
-            <prop key="*">${server.transaction.mode.default}</prop>
-         </props>
-      </property>
-   </bean>
+    <bean id="RecordService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
+        <property name="transactionManager">
+            <ref bean="transactionManager"/>
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">${server.transaction.mode.default}</prop>
+            </props>
+        </property>
+    </bean>
 
-   <bean id="RecordService_security" parent="baseSecurity">
-      <property name="objectDefinitionSource">
-         <value>
-            <![CDATA[
+    <bean id="RecordService_security" parent="baseSecurity">
+        <property name="objectDefinitionSource">
+            <value>
+                <![CDATA[
                 org.alfresco.module.org_alfresco_module_rm.record.RecordService.registerRecordMetadataAspect=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.record.RecordService.disablePropertyEditableCheck=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.record.RecordService.enablePropertyEditableCheck=RM_ALLOW
@@ -1185,18 +1158,17 @@
                 org.alfresco.module.org_alfresco_module_rm.record.RecordService.complete=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.record.RecordService.*=RM_DENY
                 ]]>
-         </value>
-      </property>
-   </bean>
+            </value>
+        </property>
+    </bean>
 
    <!--  Inplace Record Service -->
 
-   <bean id="inplaceRecordService" parent="baseService"
-         class="org.alfresco.module.org_alfresco_module_rm.record.InplaceRecordServiceImpl">
+   <bean id="inplaceRecordService" parent="baseService" class="org.alfresco.module.org_alfresco_module_rm.record.InplaceRecordServiceImpl">
       <property name="siteService" ref="SiteService" />
       <property name="extendedSecurityService" ref="ExtendedSecurityService" />
       <property name="fileFolderService" ref="FileFolderService" />
-   </bean>
+    </bean>
 
    <bean id="InplaceRecordService" class="org.springframework.aop.framework.ProxyFactoryBean">
       <property name="proxyInterfaces">
@@ -1205,23 +1177,22 @@
       <property name="targetSource">
          <bean class="org.alfresco.config.NonBlockingLazyInitTargetSource">
             <property name="targetBeanName">
-               <idref bean="inplaceRecordService" />
+               <idref bean="inplaceRecordService"/>
             </property>
          </bean>
       </property>
       <property name="interceptorNames">
          <list>
-            <idref local="InplaceRecordService_transaction" />
-            <idref bean="exceptionTranslator" />
-            <idref local="InplaceRecordService_security" />
+            <idref local="InplaceRecordService_transaction"/>
+            <idref bean="exceptionTranslator"/>
+            <idref local="InplaceRecordService_security"/>
          </list>
       </property>
    </bean>
 
-   <bean id="InplaceRecordService_transaction"
-         class="org.springframework.transaction.interceptor.TransactionInterceptor">
+   <bean id="InplaceRecordService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
       <property name="transactionManager">
-         <ref bean="transactionManager" />
+         <ref bean="transactionManager"/>
       </property>
       <property name="transactionAttributes">
          <props>
@@ -1244,25 +1215,25 @@
 
    <!--  File Plan Authentication Service -->
    <bean id="filePlanAuthenticationService"
-         class="org.alfresco.module.org_alfresco_module_rm.security.FilePlanAuthenticationServiceImpl" />
+      class="org.alfresco.module.org_alfresco_module_rm.security.FilePlanAuthenticationServiceImpl" />
 
    <bean id="FilePlanAuthenticationService" class="org.springframework.aop.framework.ProxyFactoryBean">
       <property name="proxyInterfaces">
          <value>org.alfresco.module.org_alfresco_module_rm.security.FilePlanAuthenticationService</value>
       </property>
       <property name="target">
-         <ref bean="filePlanAuthenticationService" />
+         <ref bean="filePlanAuthenticationService"/>
       </property>
       <property name="interceptorNames">
          <list>
-            <idref local="FilePlanAuthenticationService_transaction" />
-            <idref bean="exceptionTranslator" />
-            <idref local="FilePlanAuthenticationService_security" />
+            <idref local="FilePlanAuthenticationService_transaction"/>
+            <idref bean="exceptionTranslator"/>
+            <idref local="FilePlanAuthenticationService_security"/>
          </list>
       </property>
    </bean>
 
-   <bean id="FilePlanAuthenticationService_transaction" parent="baseTransaction" />
+   <bean id="FilePlanAuthenticationService_transaction" parent="baseTransaction"/>
 
    <bean id="FilePlanAuthenticationService_security" parent="baseSecurity">
       <property name="objectDefinitionSource">
@@ -1274,18 +1245,16 @@
       </property>
    </bean>
 
-   <!--  Custom EMail Mapping Service -->
-   <bean id="customEmailMappingService"
-         class="org.alfresco.module.org_alfresco_module_rm.email.CustomEmailMappingServiceImpl">
+    <!--  Custom EMail Mapping Service -->
+    <bean id="customEmailMappingService"
+      class="org.alfresco.module.org_alfresco_module_rm.email.CustomEmailMappingServiceImpl" >
       <property name="extracter" ref="extracter.RFC822" />
       <property name="nodeService" ref="nodeService" />
-      <property name="contentService" ref="contentService" />
+      <property name="contentService" ref="contentService"/>
       <property name="namespacePrefixResolver">
          <ref bean="namespaceService"></ref>
       </property>
-      <property name="transactionService">
-         <ref bean="transactionService" />
-      </property>
+      <property name="transactionService"><ref bean="transactionService" /></property>
       <property name="emailMappingKeys">
          <list>
             <value>Thread-Index</value>
@@ -1298,112 +1267,110 @@
       </property>
    </bean>
 
-   <bean id="CustomEmailMappingService_transaction"
-         class="org.springframework.transaction.interceptor.TransactionInterceptor">
-      <property name="transactionManager">
-         <ref bean="transactionManager" />
-      </property>
-      <property name="transactionAttributes">
-         <props>
-            <prop key="*">${server.transaction.mode.default}</prop>
-         </props>
-      </property>
-   </bean>
+    <bean id="CustomEmailMappingService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
+        <property name="transactionManager">
+            <ref bean="transactionManager"/>
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">${server.transaction.mode.default}</prop>
+            </props>
+        </property>
+    </bean>
 
-   <bean id="CustomEmailMappingService_security" parent="baseSecurity">
-      <property name="objectDefinitionSource">
-         <value>
-            <![CDATA[
+        <bean id="CustomEmailMappingService_security" parent="baseSecurity">
+        <property name="objectDefinitionSource">
+            <value>
+                <![CDATA[
                     org.alfresco.module.org_alfresco_module_rm.email.CustomEmailMappingService.getCustomMappings=RM_ALLOW
                     org.alfresco.module.org_alfresco_module_rm.email.CustomEmailMappingService.addCustomMapping=RM_ALLOW
                     org.alfresco.module.org_alfresco_module_rm.email.CustomEmailMappingService.deleteCustomMapping=RM_ALLOW
                     org.alfresco.module.org_alfresco_module_rm.email.CustomEmailMappingService.getEmailMappingKeys=RM_ALLOW
                     org.alfresco.module.org_alfresco_module_rm.email.CustomEmailMappingService.*=RM_DENY
                 ]]>
-         </value>
-      </property>
-   </bean>
+            </value>
+        </property>
+    </bean>
 
 
-   <bean id="CustomEmailMappingService" class="org.springframework.aop.framework.ProxyFactoryBean">
-      <property name="proxyInterfaces">
-         <list>
-            <value>org.alfresco.module.org_alfresco_module_rm.email.CustomEmailMappingService</value>
-         </list>
-      </property>
-      <property name="targetName">
-         <value>customEmailMappingService</value>
-      </property>
-      <property name="interceptorNames">
-         <list>
-            <idref local="CustomEmailMappingService_transaction" />
-            <idref local="CustomEmailMappingService_security" />
-            <idref bean="exceptionTranslator" />
-         </list>
-      </property>
-   </bean>
+    <bean id="CustomEmailMappingService" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <list>
+                <value>org.alfresco.module.org_alfresco_module_rm.email.CustomEmailMappingService</value>
+            </list>
+        </property>
+        <property name="targetName">
+            <value>customEmailMappingService</value>
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref local="CustomEmailMappingService_transaction"/>
+                <idref local="CustomEmailMappingService_security"/>
+                <idref bean="exceptionTranslator"/>
+            </list>
+        </property>
+    </bean>
 
-   <!--  RM Notification Helper -->
-   <bean id="recordsManagementNotificationHelper"
-         class="org.alfresco.module.org_alfresco_module_rm.notification.RecordsManagementNotificationHelper">
-      <property name="filePlanRoleService" ref="FilePlanRoleService" />
-      <property name="notificationService" ref="NotificationService" />
-      <property name="filePlanService" ref="FilePlanService" />
-      <property name="nodeService" ref="nodeService" />
-      <property name="tenantAdminService" ref="tenantAdminService" />
-      <property name="namespaceService" ref="namespaceService" />
-      <property name="searchService" ref="searchService" />
-      <property name="siteService" ref="SiteService" />
-      <property name="authorityService" ref="authorityService" />
-      <property name="notificationRole" value="${rm.notification.role}" />
-   </bean>
+    <!--  RM Notification Helper -->
+    <bean id="recordsManagementNotificationHelper" class="org.alfresco.module.org_alfresco_module_rm.notification.RecordsManagementNotificationHelper" >
+        <property name="filePlanRoleService" ref="FilePlanRoleService"/>
+       <property name="notificationService" ref="NotificationService"/>
+       <property name="filePlanService" ref="FilePlanService"/>
+        <property name="nodeService" ref="nodeService"/>
+        <property name="tenantAdminService" ref="tenantAdminService"/>
+        <property name="namespaceService" ref="namespaceService"/>
+        <property name="searchService" ref="searchService"/>
+        <property name="siteService" ref="SiteService" />
+        <property name="authorityService" ref="authorityService" />
+       <property name="notificationRole" value="${rm.notification.role}"/>
+    </bean>
 
-   <!-- RM caveats -->
+    <!-- RM caveats -->
 
-   <bean id="caveatConfigService" class="org.alfresco.module.org_alfresco_module_rm.caveat.RMCaveatConfigServiceImpl">
-      <property name="caveatConfigComponent" ref="caveatConfigComponent" />
-      <property name="dictionaryService" ref="dictionaryService" />
-      <property name="namespaceService" ref="namespaceService" />
-      <property name="recordsManagementAdminService" ref="recordsManagementAdminService" />
-   </bean>
+    <bean id="caveatConfigService" class="org.alfresco.module.org_alfresco_module_rm.caveat.RMCaveatConfigServiceImpl">
+        <property name="caveatConfigComponent" ref="caveatConfigComponent"/>
+        <property name="dictionaryService" ref="dictionaryService"/>
+        <property name="namespaceService" ref="namespaceService" />
+        <property name="recordsManagementAdminService" ref = "recordsManagementAdminService"/>
+    </bean>
 
-   <bean id="caveatConfigComponent"
-         class="org.alfresco.module.org_alfresco_module_rm.caveat.RMCaveatConfigComponentImpl"
-         depends-on="org_alfresco_module_rm_dictionaryBootstrap">
-      <property name="contentService" ref="contentService" />
-      <property name="dictionaryService" ref="dictionaryService" />
-      <property name="namespaceService" ref="namespaceService" />
-      <property name="authorityService" ref="authorityService" />
-      <property name="personService" ref="personService" />
-      <property name="nodeService" ref="nodeService" />
-      <property name="caveatAspects" ref="caveatAspects" />
-      <property name="caveatModels" ref="caveatModels" />
-      <property name="caveatConfig" ref="caveatConfigCache" />
-   </bean>
+    <bean id="caveatConfigComponent"
+          class="org.alfresco.module.org_alfresco_module_rm.caveat.RMCaveatConfigComponentImpl"
+          depends-on="org_alfresco_module_rm_dictionaryBootstrap">
+        <property name="contentService" ref="contentService"/>
+        <property name="dictionaryService" ref="dictionaryService"/>
+        <property name="namespaceService" ref="namespaceService"/>
+        <property name="authorityService" ref="authorityService"/>
+        <property name="personService" ref="personService"/>
+        <property name="nodeService" ref="nodeService"/>
+        <property name="caveatAspects" ref="caveatAspects"/>
+        <property name="caveatModels" ref="caveatModels"/>
+        <property name="caveatConfig" ref="caveatConfigCache"/>
+    </bean>
 
-   <!-- ===================================== -->
-   <!-- Record Management Caveat Config Cache -->
-   <!-- ===================================== -->
+     <!-- ===================================== -->
+     <!-- Record Management Caveat Config Cache -->
+     <!-- ===================================== -->
 
-   <!-- The cross-transaction shared cache for in-memory CaveatConfig -->
+     <!-- The cross-transaction shared cache for in-memory CaveatConfig -->
 
-   <bean name="caveatConfigSharedCache" class="org.alfresco.repo.cache.DefaultSimpleCache" />
+     <bean name="caveatConfigSharedCache" class="org.alfresco.repo.cache.DefaultSimpleCache"/>
 
-   <!-- The transactional cache for in-memory CaveatConfig -->
+    <!-- The transactional cache for in-memory CaveatConfig -->
 
-   <bean name="caveatConfigCache" class="org.alfresco.repo.cache.TransactionalCache">
-      <property name="sharedCache">
-         <ref bean="caveatConfigSharedCache" />
-      </property>
-      <property name="name">
-         <value>org.alfresco.caveatConfigTransactionalCache</value>
-      </property>
-      <property name="maxCacheSize" value="500" />
-      <property name="mutable" value="true" />
-      <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
-   </bean>
+    <bean name="caveatConfigCache" class="org.alfresco.repo.cache.TransactionalCache">
+        <property name="sharedCache">
+            <ref bean="caveatConfigSharedCache" />
+        </property>
+        <property name="name">
+            <value>org.alfresco.caveatConfigTransactionalCache</value>
+        </property>
+        <property name="maxCacheSize" value="500" />
+        <property name="mutable" value="true" />
+        <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
+    </bean>
 
-   <bean id="caveatAspects" class="java.util.ArrayList">
+    <bean id="caveatAspects" class="java.util.ArrayList" >
       <constructor-arg>
          <list>
             <value>{http://www.alfresco.org/model/recordsmanagement/1.0}recordComponentIdentifier</value>
@@ -1411,7 +1378,7 @@
       </constructor-arg>
    </bean>
 
-   <bean id="caveatModels" class="java.util.ArrayList">
+   <bean id="caveatModels" class="java.util.ArrayList" >
       <constructor-arg>
          <list>
             <value>{http://www.alfresco.org/model/rmcustom/1.0}rmcustom</value>
@@ -1419,15 +1386,14 @@
       </constructor-arg>
    </bean>
 
-   <bean id="rmListOfValuesContraintInit"
-         class="org.alfresco.module.org_alfresco_module_rm.caveat.RMListOfValuesConstraint">
-      <property name="caveatConfigService" ref="caveatConfigService" />
-   </bean>
+    <bean id="rmListOfValuesContraintInit" class="org.alfresco.module.org_alfresco_module_rm.caveat.RMListOfValuesConstraint">
+        <property name="caveatConfigService" ref="caveatConfigService"/>
+    </bean>
 
-   <bean id="CaveatConfigService_security" parent="baseSecurity">
-      <property name="objectDefinitionSource">
-         <value>
-            <![CDATA[
+    <bean id="CaveatConfigService_security" parent="baseSecurity">
+        <property name="objectDefinitionSource">
+            <value>
+                <![CDATA[
                    org.alfresco.module.org_alfresco_module_rm.caveat.RMCaveatConfigService.getRMAllowedValues=RM_ALLOW
                    org.alfresco.module.org_alfresco_module_rm.caveat.RMCaveatConfigService.hasAccess=RM_ALLOW
                    org.alfresco.module.org_alfresco_module_rm.caveat.RMCaveatConfigService.getRMConstraint=RM_ALLOW
@@ -1445,118 +1411,115 @@
                    org.alfresco.module.org_alfresco_module_rm.caveat.RMCaveatConfigService.removeRMConstraintListValue=RM_ALLOW
                    org.alfresco.module.org_alfresco_module_rm.caveat.RMCaveatConfigService.*=RM_DENY
                 ]]>
-         </value>
-      </property>
-   </bean>
+            </value>
+        </property>
+    </bean>
 
-   <bean id="CaveatConfigService_transaction"
-         class="org.springframework.transaction.interceptor.TransactionInterceptor">
-      <property name="transactionManager">
-         <ref bean="transactionManager" />
-      </property>
-      <property name="transactionAttributes">
-         <props>
-            <prop key="*">${server.transaction.mode.default}</prop>
-         </props>
-      </property>
-   </bean>
+    <bean id="CaveatConfigService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
+        <property name="transactionManager">
+            <ref bean="transactionManager"/>
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">${server.transaction.mode.default}</prop>
+            </props>
+        </property>
+    </bean>
 
-   <bean id="CaveatConfigService" class="org.springframework.aop.framework.ProxyFactoryBean">
-      <property name="proxyInterfaces">
-         <list>
-            <value>org.alfresco.module.org_alfresco_module_rm.caveat.RMCaveatConfigService</value>
-         </list>
-      </property>
-      <property name="targetName">
-         <value>caveatConfigService</value>
-      </property>
-      <property name="interceptorNames">
-         <list>
-            <idref local="CaveatConfigService_transaction" />
-            <idref local="CaveatConfigService_security" />
-            <idref bean="exceptionTranslator" />
-         </list>
-      </property>
-   </bean>
+    <bean id="CaveatConfigService" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <list>
+                <value>org.alfresco.module.org_alfresco_module_rm.caveat.RMCaveatConfigService</value>
+            </list>
+        </property>
+        <property name="targetName">
+            <value>caveatConfigService</value>
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref local="CaveatConfigService_transaction"/>
+                <idref local="CaveatConfigService_security"/>
+                <idref bean="exceptionTranslator"/>
+            </list>
+        </property>
+    </bean>
 
-   <!--  Site service work around (see https://issues.alfresco.com/jira/browse/RM-387) -->
-   <bean name="siteGetChildrenCannedQueryFactory"
-         class="org.alfresco.module.org_alfresco_module_rm.site.GetChildrenCannedQueryFactory">
-      <property name="registry" ref="siteCannedQueryRegistry" />
-      <property name="dictionaryService" ref="dictionaryService" />
-      <property name="tenantService" ref="tenantService" />
-      <property name="nodeDAO" ref="nodeDAO" />
-      <property name="nodeService" ref="nodeService" />
-      <property name="qnameDAO" ref="qnameDAO" />
-      <property name="localeDAO" ref="localeDAO" />
-      <property name="contentDataDAO" ref="contentDataDAO" />
-      <property name="cannedQueryDAO" ref="cannedQueryDAO" />
-      <property name="methodSecurity" ref="SiteService_security_listSites" />
-   </bean>
+    <!--  Site service work around (see https://issues.alfresco.com/jira/browse/RM-387) -->
+    <bean name="siteGetChildrenCannedQueryFactory" class="org.alfresco.module.org_alfresco_module_rm.site.GetChildrenCannedQueryFactory">
+        <property name="registry" ref="siteCannedQueryRegistry"/>
+        <property name="dictionaryService" ref="dictionaryService"/>
+        <property name="tenantService" ref="tenantService"/>
+        <property name="nodeDAO" ref="nodeDAO"/>
+        <property name="nodeService" ref="nodeService"/>
+        <property name="qnameDAO" ref="qnameDAO"/>
+        <property name="localeDAO" ref="localeDAO"/>
+        <property name="contentDataDAO" ref="contentDataDAO"/>
+        <property name="cannedQueryDAO" ref="cannedQueryDAO"/>
+        <property name="methodSecurity" ref="SiteService_security_listSites"/>
+    </bean>
 
-   <!--  Data Set Service -->
+    <!--  Data Set Service -->
 
-   <bean id="dataSetService" class="org.alfresco.module.org_alfresco_module_rm.dataset.DataSetServiceImpl">
-      <property name="importerService" ref="ImporterService" />
-      <property name="searchService" ref="SearchService" />
-      <property name="nodeService" ref="NodeService" />
-      <property name="filePlanService" ref="FilePlanService" />
-      <property name="permissionService" ref="PermissionService" />
-      <property name="authorityService" ref="AuthorityService" />
-      <property name="filePlanRoleService" ref="FilePlanRoleService" />
-      <property name="recordsManagementSearchBehaviour" ref="recordsManagementSearchBehaviour" />
-      <property name="dispositionService" ref="DispositionService" />
-      <property name="recordFolderService" ref="RecordFolderService" />
-   </bean>
+    <bean id="dataSetService" class="org.alfresco.module.org_alfresco_module_rm.dataset.DataSetServiceImpl">
+        <property name="importerService" ref="ImporterService"/>
+        <property name="searchService" ref="SearchService"/>
+        <property name="nodeService" ref="NodeService"/>
+        <property name="filePlanService" ref="FilePlanService"/>
+        <property name="permissionService" ref="PermissionService"/>
+        <property name="authorityService" ref="AuthorityService"/>
+        <property name="filePlanRoleService" ref="FilePlanRoleService"/>
+        <property name="recordsManagementSearchBehaviour" ref="recordsManagementSearchBehaviour"/>
+        <property name="dispositionService" ref="DispositionService"/>
+        <property name="recordFolderService" ref="RecordFolderService"/>
+    </bean>
 
-   <bean id="DataSetService" class="org.springframework.aop.framework.ProxyFactoryBean">
-      <property name="proxyInterfaces">
-         <value>org.alfresco.module.org_alfresco_module_rm.dataset.DataSetService</value>
-      </property>
-      <property name="target">
-         <ref bean="dataSetService" />
-      </property>
-      <property name="interceptorNames">
-         <list>
-            <idref local="DataSetService_transaction" />
-            <idref bean="exceptionTranslator" />
-            <idref local="DataSetService_security" />
-         </list>
-      </property>
-   </bean>
+    <bean id="DataSetService" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.module.org_alfresco_module_rm.dataset.DataSetService</value>
+        </property>
+        <property name="target">
+            <ref bean="dataSetService"/>
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref local="DataSetService_transaction"/>
+                <idref bean="exceptionTranslator"/>
+                <idref local="DataSetService_security"/>
+            </list>
+        </property>
+    </bean>
 
-   <bean id="DataSetService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
-      <property name="transactionManager">
-         <ref bean="transactionManager" />
-      </property>
-      <property name="transactionAttributes">
-         <props>
-            <prop key="*">${server.transaction.mode.default}</prop>
-         </props>
-      </property>
-   </bean>
+    <bean id="DataSetService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
+        <property name="transactionManager">
+            <ref bean="transactionManager"/>
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">${server.transaction.mode.default}</prop>
+            </props>
+        </property>
+    </bean>
 
-   <bean id="DataSetService_security" parent="baseSecurity">
-      <property name="objectDefinitionSource">
-         <value>
-            <![CDATA[
+    <bean id="DataSetService_security" parent="baseSecurity">
+        <property name="objectDefinitionSource">
+            <value>
+                <![CDATA[
                 org.alfresco.module.org_alfresco_module_rm.dataset.DataSetService.*=RM_ALLOW
                 ]]>
-         </value>
-      </property>
-   </bean>
+            </value>
+        </property>
+    </bean>
 
-   <!-- Data Set Implementations -->
+    <!-- Data Set Implementations -->
 
-   <bean id="dataSetBase" abstract="true" init-method="register"
-         class="org.alfresco.module.org_alfresco_module_rm.dataset.DataSetBase">
-      <property name="dataSetService" ref="dataSetService" />
-   </bean>
+    <bean id="dataSetBase" abstract="true" init-method="register" class="org.alfresco.module.org_alfresco_module_rm.dataset.DataSetBase">
+        <property name="dataSetService" ref="dataSetService"/>
+    </bean>
 
-   <bean id="dataSetDOD5015" parent="dataSetBase">
-      <property name="id" value="dod5015" />
-      <property name="path" value="alfresco/module/org_alfresco_module_rm/dod5015/DODExampleFilePlan.xml" />
-   </bean>
+    <bean id="dataSetDOD5015" parent="dataSetBase">
+        <property name="id" value="dod5015"/>
+        <property name="path" value="alfresco/module/org_alfresco_module_rm/dod5015/DODExampleFilePlan.xml" />
+    </bean>
 
    <!--  Hold Service -->
 
@@ -1567,7 +1530,7 @@
       <property name="filePlanService" ref="FilePlanService" />
       <property name="recordService" ref="RecordService" />
       <property name="recordFolderService" ref="RecordFolderService" />
-      <property name="permissionService" ref="PermissionService" />
+      <property name="permissionService" ref="PermissionService"/>
       <property name="recordsManagementAuditService" ref="RecordsManagementAuditService" />
    </bean>
 
@@ -1577,13 +1540,13 @@
          <value>org.alfresco.module.org_alfresco_module_rm.hold.HoldService</value>
       </property>
       <property name="target">
-         <ref bean="holdService" />
+         <ref bean="holdService"/>
       </property>
       <property name="interceptorNames">
          <list>
-            <idref local="HoldService_transaction" />
-            <idref bean="exceptionTranslator" />
-            <idref local="HoldService_security" />
+            <idref local="HoldService_transaction"/>
+            <idref bean="exceptionTranslator"/>
+            <idref local="HoldService_security"/>
          </list>
       </property>
    </bean>
@@ -1616,10 +1579,8 @@
 
    <!--  Relationship Service  -->
 
-   <bean id="relationshipService"
-         class="org.alfresco.module.org_alfresco_module_rm.relationship.RelationshipServiceImpl" init-method="init"
-         parent="recordsManagementAdminBase">
-      <property name="policyComponent" ref="policyComponent" />
+   <bean id="relationshipService" class="org.alfresco.module.org_alfresco_module_rm.relationship.RelationshipServiceImpl" init-method="init" parent="recordsManagementAdminBase">
+      <property name="policyComponent" ref="policyComponent"/>
    </bean>
 
    <bean id="RelationshipService" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -1627,21 +1588,20 @@
          <value>org.alfresco.module.org_alfresco_module_rm.relationship.RelationshipService</value>
       </property>
       <property name="target">
-         <ref bean="relationshipService" />
+         <ref bean="relationshipService"/>
       </property>
       <property name="interceptorNames">
          <list>
-            <idref local="RelationshipService_transaction" />
-            <idref bean="exceptionTranslator" />
-            <idref local="RelationshipService_security" />
+            <idref local="RelationshipService_transaction"/>
+            <idref bean="exceptionTranslator"/>
+            <idref local="RelationshipService_security"/>
          </list>
       </property>
    </bean>
 
-   <bean id="RelationshipService_transaction"
-         class="org.springframework.transaction.interceptor.TransactionInterceptor">
+   <bean id="RelationshipService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
       <property name="transactionManager">
-         <ref bean="transactionManager" />
+         <ref bean="transactionManager"/>
       </property>
       <property name="transactionAttributes">
          <props>
@@ -1672,9 +1632,8 @@
 
    <!--  Recordable Verison Config Service  -->
 
-   <bean id="recordableVersionConfigService"
-         class="org.alfresco.module.org_alfresco_module_rm.recordableversion.RecordableVersionConfigServiceImpl">
-      <property name="nodeService" ref="NodeService" />
+   <bean id="recordableVersionConfigService" class="org.alfresco.module.org_alfresco_module_rm.recordableversion.RecordableVersionConfigServiceImpl">
+      <property name="nodeService" ref="NodeService"/>
    </bean>
 
    <bean id="RecordableVersionConfigService" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -1682,21 +1641,20 @@
          <value>org.alfresco.module.org_alfresco_module_rm.recordableversion.RecordableVersionConfigService</value>
       </property>
       <property name="target">
-         <ref bean="recordableVersionConfigService" />
+         <ref bean="recordableVersionConfigService"/>
       </property>
       <property name="interceptorNames">
          <list>
-            <idref local="RecordableVersionConfigService_transaction" />
-            <idref bean="exceptionTranslator" />
-            <idref local="RecordableVersionConfigService_security" />
+            <idref local="RecordableVersionConfigService_transaction"/>
+            <idref bean="exceptionTranslator"/>
+            <idref local="RecordableVersionConfigService_security"/>
          </list>
       </property>
    </bean>
 
-   <bean id="RecordableVersionConfigService_transaction"
-         class="org.springframework.transaction.interceptor.TransactionInterceptor">
+   <bean id="RecordableVersionConfigService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
       <property name="transactionManager">
-         <ref bean="transactionManager" />
+         <ref bean="transactionManager"/>
       </property>
       <property name="transactionAttributes">
          <props>
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java
index fcf1925d5f..7c8c6ba1df 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java
@@ -42,14 +42,10 @@ import org.alfresco.util.ParameterCheck;
  */
 public class DeclareRecordAction extends RMActionExecuterAbstractBase
 {
-    /**
-     * action name
-     */
+    /** action name */
     public static final String NAME = "declareRecord";
 
-    /**
-     * Record service
-     */
+    /** Record service */
     private RecordService recordService;
 
     /**
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordService.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordService.java
index f9cfaf2255..a54119ffe9 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordService.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordService.java
@@ -55,8 +55,9 @@ public interface RecordService
      * A record metadata aspect can be registered more than once if it applies to more than one
      * file plan type.
      *
-     * @param recordMetadataAspect record metadata aspect qualified name
-     * @param filePlanType         file plan type
+     * @param recordMetadataAspect  record metadata aspect qualified name
+     * @param filePlanType          file plan type
+     *
      * @since 2.2
      */
     void registerRecordMetadataAspect(QName recordMetadataAspect, QName filePlanType);
@@ -71,7 +72,8 @@ public interface RecordService
     /**
      * Disables the property editable check for a given node in this transaction only.
      *
-     * @param nodeRef node reference
+     * @param nodeRef   node reference
+     *
      * @since 2.2
      */
     void disablePropertyEditableCheck(NodeRef nodeRef);
@@ -82,194 +84,200 @@ public interface RecordService
     void enablePropertyEditableCheck();
 
     /**
-     * Gets a list of all the record meta-data aspects
-     *
-     * @return {@link Set}<{@link QName}>   list of record meta-data aspects
-     * @deprecated since 2.2, file plan component required to provide context
-     */
-    @Deprecated
-    Set<QName> getRecordMetaDataAspects();
+    * Gets a list of all the record meta-data aspects
+    *
+    * @return {@link Set}<{@link QName}>   list of record meta-data aspects
+    *
+    * @deprecated since 2.2, file plan component required to provide context
+    */
+   @Deprecated
+   Set<QName> getRecordMetaDataAspects();
 
-    /**
-     * Indicates whether the provided aspect is a registered record meta-data
-     * aspect.
-     *
-     * @param aspect aspect {@link QName}
-     * @return boolean   true if the aspect is a registered record meta-data aspect, false otherwise
-     * @since 2.3
-     */
-    boolean isRecordMetadataAspect(QName aspect);
+   /**
+    * Indicates whether the provided aspect is a registered record meta-data
+    * aspect.
+    *
+    * @param aspect     aspect {@link QName}
+    * @return boolean   true if the aspect is a registered record meta-data aspect, false otherwise
+    *
+    * @since 2.3
+    */
+   boolean isRecordMetadataAspect(QName aspect);
 
-    /**
-     * Indicates whther the provided property is declared on a registered record
-     * meta-data aspect.
-     *
-     * @param property property {@link QName}
-     * @return boolean   true if the property is declared on a registered record meta-data aspect,
-     * false otherwise
-     * @since 2.3
-     */
-    boolean isRecordMetadataProperty(QName property);
+   /**
+    * Indicates whther the provided property is declared on a registered record
+    * meta-data aspect.
+    *
+    * @param  property  property {@link QName}
+    * @return boolean   true if the property is declared on a registered record meta-data aspect,
+    *                   false otherwise
+    *
+    * @since 2.3
+    */
+   boolean isRecordMetadataProperty(QName property);
 
-    /**
-     * Gets a list of all the record metadata aspects relevant to the file plan type of the
-     * file plan component provided.
-     * <p>
-     * If a null context is provided all record meta-data aspects are returned, but this is not
-     * recommended.
-     *
-     * @param nodeRef node reference to file plan component providing context
-     * @return {@link Set}<{@link QName}>   list of record meta-data aspects
-     * @since 2.2
-     */
-    Set<QName> getRecordMetadataAspects(NodeRef nodeRef);
+   /**
+    * Gets a list of all the record metadata aspects relevant to the file plan type of the
+    * file plan component provided.
+    * <p>
+    * If a null context is provided all record meta-data aspects are returned, but this is not
+    * recommended.
+    *
+    * @param  nodeRef                      node reference to file plan component providing context
+    * @return {@link Set}<{@link QName}>   list of record meta-data aspects
+    *
+    * @since 2.2
+    */
+   Set<QName> getRecordMetadataAspects(NodeRef nodeRef);
 
-    /**
-     * Gets a list of all the record metadata aspect that relate to the provided file plan type.
-     * <p>
-     * If null is provided for the file plan type then record metadata aspects for the default
-     * file plan type (rma:filePlan) are returned.
-     *
-     * @param filePlanType file plan type
-     * @return{@link Set}<{@link QName}>     list of record meta-data aspects
-     * @since 2.2
-     */
-    Set<QName> getRecordMetadataAspects(QName filePlanType);
+   /**
+    * Gets a list of all the record metadata aspect that relate to the provided file plan type.
+    * <p>
+    * If null is provided for the file plan type then record metadata aspects for the default
+    * file plan type (rma:filePlan) are returned.
+    *
+    * @param filePlanType                   file plan type
+    * @return{@link Set}<{@link QName}>     list of record meta-data aspects
+    *
+    * @since 2.2
+    */
+   Set<QName> getRecordMetadataAspects(QName filePlanType);
 
-    /**
-     * Checks whether if the given node reference is a record or not
-     *
-     * @param nodeRef node reference to be checked
-     * @return boolean   true if the node reference is a record, false otherwise
-     */
-    boolean isRecord(NodeRef nodeRef);
+   /**
+    * Checks whether if the given node reference is a record or not
+    *
+    * @param nodeRef    node reference to be checked
+    * @return boolean   true if the node reference is a record, false otherwise
+    */
+   boolean isRecord(NodeRef nodeRef);
 
-    /**
-     * Indicates whether the record is declared
-     *
-     * @param nodeRef node reference of the record for which the check would be performed
-     * @return boolean  true if record is declared, false otherwise
-     */
-    boolean isDeclared(NodeRef nodeRef);
+   /**
+    * Indicates whether the record is declared
+    *
+    * @param nodeRef   node reference of the record for which the check would be performed
+    * @return boolean  true if record is declared, false otherwise
+    */
+   boolean isDeclared(NodeRef nodeRef);
 
-    /**
-     * Creates a new unfiled record from an existing node.
-     * <p>
-     * Note that the node reference of the record will be the same as the original
-     * document.
-     *
-     * @param filePlan The filePlan in which the record should be placed. filePlan can be <code>null</code> in this case the default RM site will be used.
-     * @param nodeRef  The node from which the record will be created
-     * @param isLinked indicates if the newly created record is linked to it's original location or not.
-     */
-    void createRecord(NodeRef filePlan, NodeRef nodeRef, boolean isLinked);
+   /**
+    * Creates a new unfiled record from an existing node.
+    * <p>
+    * Note that the node reference of the record will be the same as the original
+    * document.
+    *
+    * @param filePlan  The filePlan in which the record should be placed. filePlan can be <code>null</code> in this case the default RM site will be used.
+    * @param nodeRef   The node from which the record will be created
+    * @param isLinked  indicates if the newly created record is linked to it's original location or not.
+    */
+   void createRecord(NodeRef filePlan, NodeRef nodeRef, boolean isLinked);
 
-    /**
-     * Links the newly created record to it's original location.
-     *
-     * @see #createRecord(NodeRef, NodeRef, boolean)
-     */
-    void createRecord(NodeRef filePlan, NodeRef nodeRef);
+   /**
+    * Links the newly created record to it's original location.
+    *
+    * @see #createRecord(NodeRef, NodeRef, boolean)
+    */
+   void createRecord(NodeRef filePlan, NodeRef nodeRef);
 
-    /**
-     * Creates a record from a copy of the node reference provided.
-     *
-     * @param filePlan file plan
-     * @param nodeRef  node reference
-     */
-    NodeRef createRecordFromCopy(NodeRef filePlan, NodeRef nodeRef);
+   /**
+    * Creates a record from a copy of the node reference provided.
+    *
+    * @param filePlan   file plan
+    * @param nodeRef    node reference
+    */
+   NodeRef createRecordFromCopy(NodeRef filePlan, NodeRef nodeRef);
 
-    /**
-     * Creates a new document in the unfiled records container if the given node reference is a file plan
-     * node reference otherwise the node reference will be used as the destination for the new record.
-     *
-     * @param parent     parent node reference
-     * @param name       name of the new record
-     * @param type       content type, cm:content if null
-     * @param properties properties
-     * @param reader     content reader
-     */
-    NodeRef createRecordFromContent(NodeRef parent, String name, QName type, Map<QName, Serializable> properties, ContentReader reader);
+   /**
+    * Creates a new document in the unfiled records container if the given node reference is a file plan
+    * node reference otherwise the node reference will be used as the destination for the new record.
+    *
+    * @param parent     parent node reference
+    * @param name       name of the new record
+    * @param type       content type, cm:content if null
+    * @param properties properties
+    * @param reader     content reader
+    */
+   NodeRef createRecordFromContent(NodeRef parent, String name, QName type, Map<QName, Serializable> properties, ContentReader reader);
 
-    /**
-     * Indicates whether the record is filed or not
-     *
-     * @param record Record node reference
-     * @return boolean   true if filed, false otherwise
-     */
-    boolean isFiled(NodeRef record);
+   /**
+    * Indicates whether the record is filed or not
+    *
+    * @param record    nodeRef of record
+    * @return boolean   true if filed, false otherwise
+    */
+   boolean isFiled(NodeRef record);
 
-    /**
-     * 'File' a new document that arrived in the file plan structure.
-     *
-     * @param record Record node reference
-     */
-    void file(NodeRef record);
+   /**
+    * 'File' a new document that arrived in the file plan structure.
+    *
+    * @param record    noderef of record
+    */
+   void file(NodeRef record);
 
-    /**
-     * Rejects a record with the provided reason
-     *
-     * @param nodeRef The record which will be rejected
-     * @param reason  The reason for rejection
-     */
-    void rejectRecord(NodeRef nodeRef, String reason);
+   /**
+    * Rejects a record with the provided reason
+    *
+    * @param nodeRef   The record which will be rejected
+    * @param reason    The reason for rejection
+    */
+   void rejectRecord(NodeRef nodeRef, String reason);
 
-    /**
-     * Indicates whether a property of a record is editable for the current user or not.
-     *
-     * @param record   record
-     * @param property property
-     * @return boolean   true if editable, false otherwise.
-     */
-    boolean isPropertyEditable(NodeRef record, QName property);
+   /**
+    * Indicates whether a property of a record is editable for the current user or not.
+    *
+    * @param record     record
+    * @param property   property
+    * @return boolean   true if editable, false otherwise.
+    */
+   boolean isPropertyEditable(NodeRef record, QName property);
 
-    /**
-     * Indicates whether the given node (record or record folder) is a metadata stub or not.
-     *
-     * @param nodeRef node reference
-     * @return boolean  true if a metadata stub, false otherwise
-     */
-    boolean isMetadataStub(NodeRef nodeRef);
+   /**
+    * Indicates whether the given node (record or record folder) is a metadata stub or not.
+    *
+    * @param nodeRef   node reference
+    * @return boolean  true if a metadata stub, false otherwise
+    */
+   boolean isMetadataStub(NodeRef nodeRef);
 
-    /**
-     * Gets a list of all the records within a record folder
-     *
-     * @param recordFolder record folder
-     * @return List<NodeRef>    list of records in the record folder
-     */
-    List<NodeRef> getRecords(NodeRef recordFolder);
+   /**
+    * Gets a list of all the records within a record folder
+    *
+    * @param recordFolder      record folder
+    * @return List<NodeRef>    list of records in the record folder
+    */
+   List<NodeRef> getRecords(NodeRef recordFolder);
 
-    /**
-     * Adds the specified type to the record
-     *
-     * @param nodeRef   Record node reference
-     * @param typeQName Type to add
-     */
-    void addRecordType(NodeRef nodeRef, QName typeQName);
+   /**
+    * Adds the specified type to the record
+    *
+    * @param nodeRef    Record node reference
+    * @param typeQName  Type to add
+    */
+   void addRecordType(NodeRef nodeRef, QName typeQName);
 
-    /**
-     * Creates a record from the given document
-     *
-     * @param nodeRef The document node reference from which a record will be created
-     */
-    void makeRecord(NodeRef nodeRef);
+   /**
+    * Creates a record from the given document
+    *
+    * @param nodeRef    The document node reference from which a record will be created
+    */
+   void makeRecord(NodeRef nodeRef);
 
-    /**
-     * Links a record to a record folder
-     *
-     * @param record       the record to link
-     * @param recordFolder the record folder to link it to
-     */
-    void link(NodeRef record, NodeRef recordFolder);
+   /**
+    * Links a record to a record folder
+    *
+    * @param record         the record to link
+    * @param recordFolder   the record folder to link it to
+    */
+   void link(NodeRef record, NodeRef recordFolder);
 
-    /**
-     * Unlinks a record from a specified record folder.
-     *
-     * @param record       the record to unlink
-     * @param recordFolder the record folder to unlink it from
-     * @since 2.3
-     */
-    void unlink(NodeRef record, NodeRef recordFolder);
+   /**
+    * Unlinks a record from a specified record folder.
+    *
+    * @param record         the record to unlink
+    * @param recordFolder   the record folder to unlink it from
+    *
+    * @since 2.3
+    */
+   void unlink(NodeRef record, NodeRef recordFolder);
 
     /**
      * Completes a record
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
index fc9b8af4b3..b614ab292a 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
@@ -136,56 +136,42 @@ import org.springframework.extensions.surf.util.I18NUtil;
  */
 @BehaviourBean
 public class RecordServiceImpl extends BaseBehaviourBean
-        implements RecordService,
-                   RecordsManagementModel,
-                   RecordsManagementCustomModel,
-                   NodeServicePolicies.OnAddAspectPolicy,
-                   NodeServicePolicies.OnCreateChildAssociationPolicy,
-                   NodeServicePolicies.OnRemoveAspectPolicy,
-                   NodeServicePolicies.OnUpdatePropertiesPolicy,
-                   ContentServicePolicies.OnContentUpdatePolicy
+                               implements RecordService,
+                                          RecordsManagementModel,
+                                          RecordsManagementCustomModel,
+                                          NodeServicePolicies.OnAddAspectPolicy,
+                                          NodeServicePolicies.OnCreateChildAssociationPolicy,
+                                          NodeServicePolicies.OnRemoveAspectPolicy,
+                                          NodeServicePolicies.OnUpdatePropertiesPolicy,
+                                          ContentServicePolicies.OnContentUpdatePolicy
 {
-    /**
-     * Logger
-     */
+    /** Logger */
     private static final Logger LOGGER = LoggerFactory.getLogger(RecordServiceImpl.class);
 
-    /**
-     * Sync Model URI
-     */
+    /** Sync Model URI */
     private static final String SYNC_MODEL_1_0_URI = "http://www.alfresco.org/model/sync/1.0";
 
-    /**
-     * Synced aspect
-     */
+    /** Synced aspect */
     private static final QName ASPECT_SYNCED = QName.createQName(SYNC_MODEL_1_0_URI, "synced");
 
-    /**
-     * transation data key
-     */
+    /** transation data key */
     private static final String KEY_IGNORE_ON_UPDATE = "ignoreOnUpdate";
     public static final String KEY_NEW_RECORDS = "newRecords";
 
-    /**
-     * I18N
-     */
+    /** I18N */
     private static final String MSG_NODE_HAS_ASPECT = "rm.service.node-has-aspect";
     private static final String FINAL_VERSION = "rm.service.final-version";
     private static final String FINAL_DESCRIPTION = "rm.service.final-version-description";
     private static final String MSG_UNDECLARED_ONLY_RECORDS = "rm.action.undeclared-only-records";
     private static final String MSG_NO_DECLARE_MAND_PROP = "rm.action.no-declare-mand-prop";
 
-    /**
-     * Always edit property array
-     */
+    /** Always edit property array */
     private static final QName[] ALWAYS_EDIT_PROPERTIES = new QName[]
-            {
-                    ContentModel.PROP_LAST_THUMBNAIL_MODIFICATION_DATA
-            };
+    {
+       ContentModel.PROP_LAST_THUMBNAIL_MODIFICATION_DATA
+    };
 
-    /**
-     * always edit model URI's
-     */
+    /** always edit model URI's */
     private List<String> alwaysEditURIs;
 
     /**
@@ -209,140 +195,92 @@ public class RecordServiceImpl extends BaseBehaviourBean
         return this.alwaysEditURIs;
     }
 
-    /**
-     * record model URI's
-     */
+    /** record model URI's */
     public static final List<String> RECORD_MODEL_URIS = Collections.unmodifiableList(
-            Arrays.asList(
-                    RM_URI,
-                    RM_CUSTOM_URI,
-                    ReportModel.RMR_URI,
-                    RecordableVersionModel.RMV_URI,
-                    DOD5015Model.DOD_URI
-                         ));
+        Arrays.asList(
+            RM_URI,
+            RM_CUSTOM_URI,
+            ReportModel.RMR_URI,
+            RecordableVersionModel.RMV_URI,
+            DOD5015Model.DOD_URI
+    ));
 
-    /**
-     * non-record model URI's
-     */
+    /** non-record model URI's */
     private static final String[] NON_RECORD_MODEL_URIS = new String[]
-            {
-                    NamespaceService.AUDIO_MODEL_1_0_URI,
-                    NamespaceService.CONTENT_MODEL_1_0_URI,
-                    NamespaceService.EMAILSERVER_MODEL_URI,
-                    NamespaceService.EXIF_MODEL_1_0_URI,
-                    NamespaceService.FORUMS_MODEL_1_0_URI,
-                    NamespaceService.LINKS_MODEL_1_0_URI,
-                    NamespaceService.REPOSITORY_VIEW_1_0_URI
-            };
+    {
+        NamespaceService.AUDIO_MODEL_1_0_URI,
+        NamespaceService.CONTENT_MODEL_1_0_URI,
+        NamespaceService.EMAILSERVER_MODEL_URI,
+        NamespaceService.EXIF_MODEL_1_0_URI,
+        NamespaceService.FORUMS_MODEL_1_0_URI,
+        NamespaceService.LINKS_MODEL_1_0_URI,
+        NamespaceService.REPOSITORY_VIEW_1_0_URI
+    };
 
-    /**
-     * Indentity service
-     */
+    /** Indentity service */
     private IdentifierService identifierService;
 
-    /**
-     * Extended permission service
-     */
+    /** Extended permission service */
     private ExtendedPermissionService extendedPermissionService;
 
-    /**
-     * Extended security service
-     */
+    /** Extended security service */
     private ExtendedSecurityService extendedSecurityService;
 
-    /**
-     * File plan service
-     */
+    /** File plan service */
     private FilePlanService filePlanService;
 
-    /**
-     * Records management notification helper
-     */
+    /** Records management notification helper */
     private RecordsManagementNotificationHelper notificationHelper;
 
-    /**
-     * Policy component
-     */
+    /** Policy component */
     private PolicyComponent policyComponent;
 
-    /**
-     * Ownable service
-     */
+    /** Ownable service */
     private OwnableService ownableService;
 
-    /**
-     * Capability service
-     */
+    /** Capability service */
     private CapabilityService capabilityService;
 
-    /**
-     * Rule service
-     */
+    /** Rule service */
     private RuleService ruleService;
 
-    /**
-     * File folder service
-     */
+    /** File folder service */
     private FileFolderService fileFolderService;
 
-    /**
-     * Record folder service
-     */
+    /** Record folder service */
     private RecordFolderService recordFolderService;
 
-    /**
-     * File plan role service
-     */
+    /** File plan role service */
     private FilePlanRoleService filePlanRoleService;
 
-    /**
-     * Permission service
-     */
+    /** Permission service */
     private PermissionService permissionService;
 
-    /**
-     * Version service
-     */
+    /** Version service */
     private VersionService versionService;
 
-    /**
-     * Relationship service
-     */
+    /** Relationship service */
     private RelationshipService relationshipService;
 
-    /**
-     * Disposition service
-     */
+    /** Disposition service */
     private DispositionService dispositionService;
 
-    /**
-     * records management container type
-     */
+    /** records management container type */
     private RecordsManagementContainerType recordsManagementContainerType;
 
-    /**
-     * recordable version service
-     */
+    /** recordable version service */
     private RecordableVersionService recordableVersionService;
 
-    /**
-     * list of available record meta-data aspects and the file plan types the are applicable to
-     */
+    /** list of available record meta-data aspects and the file plan types the are applicable to */
     private Map<QName, Set<QName>> recordMetaDataAspects;
 
-    /**
-     * Freeze service
-     */
+    /** Freeze service */
     private FreezeService freezeService;
 
-    /**
-     * Namespace service
-     */
+    /** Namespace service */
     private NamespaceService namespaceService;
 
-    /**
-     * policies
-     */
+    /** policies */
     private ClassPolicyDelegate<BeforeFileRecord> beforeFileRecord;
     private ClassPolicyDelegate<OnFileRecord> onFileRecord;
     private ClassPolicyDelegate<BeforeRecordDeclaration> beforeRecordDeclarationDelegate;
@@ -369,7 +307,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
     }
 
     /**
-     * @param extendedSecurityService extended security service
+     * @param extendedSecurityService   extended security service
      */
     public void setExtendedSecurityService(ExtendedSecurityService extendedSecurityService)
     {
@@ -377,7 +315,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
     }
 
     /**
-     * @param filePlanService file plan service
+     * @param filePlanService   file plan service
      */
     public void setFilePlanService(FilePlanService filePlanService)
     {
@@ -393,7 +331,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
     }
 
     /**
-     * @param policyComponent policy component
+     * @param policyComponent   policy component
      */
     public void setPolicyComponent(PolicyComponent policyComponent)
     {
@@ -401,7 +339,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
     }
 
     /**
-     * @param ownableService ownable service
+     * @param ownableService    ownable service
      */
     public void setOwnableService(OwnableService ownableService)
     {
@@ -417,7 +355,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
     }
 
     /**
-     * @param ruleService rule service
+     * @param ruleService   rule service
      */
     public void setRuleService(RuleService ruleService)
     {
@@ -465,7 +403,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
     }
 
     /**
-     * @param relationshipService relationship service
+     * @param relationshipService   relationship service
      */
     public void setRelationshipService(RelationshipService relationshipService)
     {
@@ -473,7 +411,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
     }
 
     /**
-     * @param dispositionService disposition service
+     * @param dispositionService    disposition service
      */
     public void setDispositionService(DispositionService dispositionService)
     {
@@ -481,7 +419,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
     }
 
     /**
-     * @param recordsManagementContainerType records management container type
+     * @param recordsManagementContainerType    records management container type
      */
     public void setRecordsManagementContainerType(RecordsManagementContainerType recordsManagementContainerType)
     {
@@ -489,7 +427,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
     }
 
     /**
-     * @param recordableVersionService recordable version service
+     * @param recordableVersionService  recordable version service
      */
     public void setRecordableVersionService(RecordableVersionService recordableVersionService)
     {
@@ -544,11 +482,11 @@ public class RecordServiceImpl extends BaseBehaviourBean
      */
     @Override
     @Behaviour
-            (
-                    kind = BehaviourKind.CLASS,
-                    type = "rma:record",
-                    notificationFrequency = NotificationFrequency.TRANSACTION_COMMIT
-            )
+    (
+            kind = BehaviourKind.CLASS,
+            type = "rma:record",
+            notificationFrequency = NotificationFrequency.TRANSACTION_COMMIT
+    )
     public void onAddAspect(NodeRef nodeRef, QName aspect)
     {
         authenticationUtil.runAsSystem(new RunAsWork<Void>()
@@ -571,10 +509,10 @@ public class RecordServiceImpl extends BaseBehaviourBean
      */
     @Override
     @Behaviour
-            (
-                    kind = BehaviourKind.CLASS,
-                    type = "sys:noContent"
-            )
+    (
+            kind = BehaviourKind.CLASS,
+            type = "sys:noContent"
+    )
     public void onRemoveAspect(NodeRef nodeRef, QName aspect)
     {
         if (nodeService.hasAspect(nodeRef, ASPECT_RECORD))
@@ -595,11 +533,11 @@ public class RecordServiceImpl extends BaseBehaviourBean
      */
     @Override
     @Behaviour
-            (
-                    kind = ASSOCIATION,
-                    type = "rma:recordFolder",
-                    notificationFrequency = FIRST_EVENT
-            )
+    (
+       kind = ASSOCIATION,
+       type = "rma:recordFolder",
+       notificationFrequency = FIRST_EVENT
+    )
     public void onCreateChildAssociation(final ChildAssociationRef childAssocRef, final boolean bNew)
     {
         AuthenticationUtil.runAs(new RunAsWork<Void>()
@@ -610,10 +548,10 @@ public class RecordServiceImpl extends BaseBehaviourBean
                 try
                 {
                     NodeRef nodeRef = childAssocRef.getChildRef();
-                    if (nodeService.exists(nodeRef) &&
-                            !nodeService.hasAspect(nodeRef, ContentModel.ASPECT_TEMPORARY) &&
-                            !nodeService.getType(nodeRef).equals(TYPE_RECORD_FOLDER) &&
-                            !nodeService.getType(nodeRef).equals(TYPE_RECORD_CATEGORY))
+                    if (nodeService.exists(nodeRef)   &&
+                        !nodeService.hasAspect(nodeRef, ContentModel.ASPECT_TEMPORARY) &&
+                        !nodeService.getType(nodeRef).equals(TYPE_RECORD_FOLDER) &&
+                        !nodeService.getType(nodeRef).equals(TYPE_RECORD_CATEGORY))
                     {
                         // store information about the 'new' record in the transaction
                         // @since 2.3
@@ -622,7 +560,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
                         {
                             Set<NodeRef> newRecords = transactionalResourceHelper.getSet(KEY_NEW_RECORDS);
                             newRecords.add(nodeRef);
-                        } else
+                        }
+                        else
                         {
                             // if we are linking a record
                             NodeRef parentNodeRef = childAssocRef.getParentRef();
@@ -638,11 +577,13 @@ public class RecordServiceImpl extends BaseBehaviourBean
                         // recalculate disposition schedule for the record when linking it
                         dispositionService.recalculateNextDispositionStep(nodeRef);
                     }
-                } catch (RecordLinkRuntimeException e)
+                }
+                catch (RecordLinkRuntimeException e)
                 {
                     // rethrow exception
                     throw e;
-                } catch (AlfrescoRuntimeException e)
+                }
+                catch (AlfrescoRuntimeException e)
                 {
                     // do nothing but log error
                     LOGGER.warn("Unable to file pending record.", e);
@@ -695,18 +636,18 @@ public class RecordServiceImpl extends BaseBehaviourBean
      */
     @Override
     @Behaviour
-            (
-                    name = "onUpdateProperties",
-                    kind = BehaviourKind.CLASS,
-                    type = "rma:record"
-            )
+    (
+            name = "onUpdateProperties",
+            kind = BehaviourKind.CLASS,
+            type= "rma:record"
+    )
     public void onUpdateProperties(final NodeRef nodeRef, final Map<QName, Serializable> before, final Map<QName, Serializable> after)
     {
         if (AuthenticationUtil.getFullyAuthenticatedUser() != null &&
-                !AuthenticationUtil.isRunAsUserTheSystemUser() &&
-                nodeService.exists(nodeRef) &&
-                isRecord(nodeRef) &&
-                !transactionalResourceHelper.getSet(KEY_IGNORE_ON_UPDATE).contains(nodeRef))
+            !AuthenticationUtil.isRunAsUserTheSystemUser() &&
+            nodeService.exists(nodeRef) &&
+            isRecord(nodeRef) &&
+            !transactionalResourceHelper.getSet(KEY_IGNORE_ON_UPDATE).contains(nodeRef))
         {
             for (Map.Entry<QName, Serializable> entry : after.entrySet())
             {
@@ -724,32 +665,34 @@ public class RecordServiceImpl extends BaseBehaviourBean
                     // deal with date values, remove the seconds and milliseconds for the
                     // comparison as they are removed from the submitted for data
                     Calendar beforeCal = Calendar.getInstance();
-                    beforeCal.setTime((Date) beforeValue);
+                    beforeCal.setTime((Date)beforeValue);
                     Calendar afterCal = Calendar.getInstance();
-                    afterCal.setTime((Date) afterValue);
+                    afterCal.setTime((Date)afterValue);
                     beforeCal.set(Calendar.SECOND, 0);
                     beforeCal.set(Calendar.MILLISECOND, 0);
                     afterCal.set(Calendar.SECOND, 0);
                     afterCal.set(Calendar.MILLISECOND, 0);
                     propertyUnchanged = (beforeCal.compareTo(afterCal) == 0);
-                } else if ((afterValue instanceof Boolean) && (beforeValue == null) && (afterValue.equals(Boolean.FALSE)))
+                }
+                else if ((afterValue instanceof Boolean) && (beforeValue == null) && (afterValue.equals(Boolean.FALSE)))
                 {
                     propertyUnchanged = true;
-                } else
+                }
+                else
                 {
                     // otherwise
                     propertyUnchanged = EqualsHelper.nullSafeEquals(beforeValue, afterValue);
                 }
 
                 if (!propertyUnchanged &&
-                        !(ContentModel.PROP_CONTENT.equals(property) && beforeValue == null) &&
-                        !isPropertyEditable(nodeRef, property))
+                    !(ContentModel.PROP_CONTENT.equals(property) && beforeValue == null) &&
+                    !isPropertyEditable(nodeRef, property))
                 {
                     // the user can't edit the record property
                     throw new ModelAccessDeniedException(
                             "The user " + AuthenticationUtil.getFullyAuthenticatedUser() +
-                                    " does not have the permission to edit the record property " + property.toString() +
-                                    " on the node " + nodeRef.toString());
+                            " does not have the permission to edit the record property " + property.toString() +
+                            " on the node " + nodeRef.toString());
                 }
             }
         }
@@ -758,7 +701,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
     /**
      * Get map containing record metadata aspects.
      *
-     * @return {@link Map}<{@link QName}, {@link Set}<{@link QName}>>  map containing record metadata aspects
+     * @return  {@link Map}<{@link QName}, {@link Set}<{@link QName}>>  map containing record metadata aspects
+     *
      * @since 2.2
      */
     protected Map<QName, Set<QName>> getRecordMetadataAspectsMap()
@@ -816,7 +760,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
         {
             // get the current set of file plan types for this aspect
             filePlanTypes = getRecordMetadataAspectsMap().get(recordMetadataAspect);
-        } else
+        }
+        else
         {
             // create a new set for the file plan type
             filePlanTypes = new HashSet<QName>(1);
@@ -838,7 +783,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
     }
 
     /**
-     * @see org.alfresco.module.org_alfresco_module_rm.record.RecordService#isRecordMetadataAspect(org.alfresco.service.namespace.QName)
+     *  @see org.alfresco.module.org_alfresco_module_rm.record.RecordService#isRecordMetadataAspect(org.alfresco.service.namespace.QName)
      */
     @Override
     public boolean isRecordMetadataAspect(QName aspect)
@@ -858,7 +803,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
         {
             ClassDefinition classDefinition = propertyDefinition.getContainerClass();
             if (classDefinition != null &&
-                    getRecordMetadataAspectsMap().containsKey(classDefinition.getName()))
+                getRecordMetadataAspectsMap().containsKey(classDefinition.getName()))
             {
                 result = true;
             }
@@ -961,7 +906,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
                         {
                             // move the document into the file plan
                             nodeService.moveNode(nodeRef, newRecordContainer, ContentModel.ASSOC_CONTAINS, parentAssoc.getQName());
-                        } finally
+                        }
+                        finally
                         {
                             behaviourFilter.enableBehaviour();
                         }
@@ -1000,12 +946,14 @@ public class RecordServiceImpl extends BaseBehaviourBean
 
                                 // set the extended security
                                 extendedSecurityService.set(nodeRef, readersAndWriters);
-                            } finally
+                            }
+                            finally
                             {
                                 ruleService.enableRules();
                             }
                         }
-                    } finally
+                    }
+                    finally
                     {
                         ruleService.enableRuleType("outbound");
                     }
@@ -1046,7 +994,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
                 LOGGER.debug(msg);
                 throw new RecordCreationException(msg);
             }
-        } else
+        }
+        else
         {
             // verify that the provided file plan is actually a file plan
             if (!filePlanService.isFilePlan(filePlan))
@@ -1162,7 +1111,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
                         // create a copy of the original state and add it to the unfiled record container
                         FileInfo recordInfo = fileFolderService.copy(nodeRef, unfiledRecordFolder, null);
                         record = recordInfo.getNodeRef();
-                    } finally
+                    }
+                    finally
                     {
                         recordsManagementContainerType.enable();
                     }
@@ -1173,7 +1123,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
                     try
                     {
                         nodeService.removeAspect(record, ContentModel.ASPECT_VERSIONABLE);
-                    } finally
+                    }
+                    finally
                     {
                         behaviourFilter.enableBehaviour(ContentModel.ASPECT_VERSIONABLE);
                     }
@@ -1196,14 +1147,16 @@ public class RecordServiceImpl extends BaseBehaviourBean
                     if (originalAssocs == null)
                     {
                         nodeService.removeAspect(record, ContentModel.ASPECT_COPIEDFROM);
-                    } else
+                    }
+                    else
                     {
                         for (AssociationRef originalAssoc : originalAssocs)
                         {
                             nodeService.createAssociation(record, originalAssoc.getTargetRef(), ContentModel.ASSOC_ORIGINAL);
                         }
                     }
-                } catch (FileNotFoundException e)
+                }
+                catch (FileNotFoundException e)
                 {
                     throw new AlfrescoRuntimeException("Can't create recorded version, because copy fails.", e);
                 }
@@ -1219,7 +1172,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
     /**
      * Helper to get the latest version record for a given document (ie non-record)
      *
-     * @param nodeRef node reference
+     * @param nodeRef   node reference
      * @return NodeRef  latest version record, null otherwise
      */
     private NodeRef getLatestVersionRecord(NodeRef nodeRef)
@@ -1274,7 +1227,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
         if (type == null)
         {
             type = ContentModel.TYPE_CONTENT;
-        } else if (!dictionaryService.isSubClass(type, ContentModel.TYPE_CONTENT))
+        }
+        else if (!dictionaryService.isSubClass(type, ContentModel.TYPE_CONTENT))
         {
             throw new AlfrescoRuntimeException("Record can only be created from a sub-type of cm:content.");
         }
@@ -1319,7 +1273,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
                 }
 
             });
-        } finally
+        }
+        finally
         {
             enablePropertyEditableCheck();
         }
@@ -1344,7 +1299,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
             authenticationUtil.runAsSystem(new RunAsWork<Void>()
             {
                 @Override
-                public Void doWork() throws Exception
+                public Void doWork() throws Exception 
                 {
                     nodeService.addAspect(document, RecordsManagementModel.ASPECT_RECORD, null);
 
@@ -1357,7 +1312,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
                     return null;
                 }
             });
-        } finally
+        }
+        finally
         {
             ruleService.enableRules();
             enablePropertyEditableCheck();
@@ -1391,9 +1347,9 @@ public class RecordServiceImpl extends BaseBehaviourBean
 
     /**
      * Helper method to 'file' a new document that arrived in the file plan structure.
-     * <p>
-     * TODO atm we only 'file' content as a record .. may need to consider other types if we
-     * are to support the notion of composite records.
+     *
+     *  TODO atm we only 'file' content as a record .. may need to consider other types if we
+     *       are to support the notion of composite records.
      *
      * @param record node reference to record (or soon to be record!)
      */
@@ -1405,8 +1361,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
         // we only support filling of content items
         // TODO composite record support needs to file containers too
         QName type = nodeService.getType(record);
-        if (ContentModel.TYPE_CONTENT.equals(type) ||
-                dictionaryService.isSubClass(type, ContentModel.TYPE_CONTENT))
+        if (ContentModel.TYPE_CONTENT.equals(type)  ||
+            dictionaryService.isSubClass(type, ContentModel.TYPE_CONTENT))
         {
             // fire before file record policy
             beforeFileRecord.get(getTypeAndApsects(record)).beforeFileRecord(record);
@@ -1464,10 +1420,10 @@ public class RecordServiceImpl extends BaseBehaviourBean
 
                     // get record property values
                     final Map<QName, Serializable> properties = nodeService.getProperties(nodeRef);
-                    final String recordId = (String) properties.get(PROP_IDENTIFIER);
-                    final String documentOwner = (String) properties.get(PROP_RECORD_ORIGINATING_USER_ID);
-                    final String originalName = (String) properties.get(PROP_ORIGIONAL_NAME);
-                    final NodeRef originatingLocation = (NodeRef) properties.get(PROP_RECORD_ORIGINATING_LOCATION);
+                    final String recordId = (String)properties.get(PROP_IDENTIFIER);
+                    final String documentOwner = (String)properties.get(PROP_RECORD_ORIGINATING_USER_ID);
+                    final String originalName = (String)properties.get(PROP_ORIGIONAL_NAME);
+                    final NodeRef originatingLocation = (NodeRef)properties.get(PROP_RECORD_ORIGINATING_LOCATION);
 
                     // we can only reject if the originating location is present
                     if (originatingLocation != null)
@@ -1496,7 +1452,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
                         {
                             fileFolderService.rename(nodeRef, originalName);
 
-                            String name = (String) nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
+                            String name = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
                             LOGGER.debug("Rename {} to {}", name, originalName);
                         }
 
@@ -1523,7 +1479,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
                         // send an email to the record creator
                         notificationHelper.recordRejectedEmailNotification(nodeRef, recordId, documentOwner);
                     }
-                } finally
+                }
+                finally
                 {
                     ruleService.enableRules();
                 }
@@ -1540,7 +1497,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
                 for (QName aspect : aspects)
                 {
                     if (RM_URI.equals(aspect.getNamespaceURI()) ||
-                            RecordableVersionModel.RMV_URI.equals(aspect.getNamespaceURI()))
+                        RecordableVersionModel.RMV_URI.equals(aspect.getNamespaceURI()))
                     {
                         nodeService.removeAspect(nodeRef, aspect);
                     }
@@ -1551,7 +1508,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
 
                     // Do not attempt to clean up rendition nodes which are not children of their source node.
                     final boolean renditionRequiresCleaning = nodeService.exists(renditionNode) &&
-                            renditionAssoc.isPrimary();
+                                                              renditionAssoc.isPrimary();
 
                     if (renditionRequiresCleaning)
                     {
@@ -1607,7 +1564,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
             for (AccessPermission perm : perms)
             {
                 if ((perm.getPermission().contains(RMPermissionModel.EDIT_NON_RECORD_METADATA) ||
-                        perm.getPermission().contains(RMPermissionModel.EDIT_RECORD_METADATA)))
+                     perm.getPermission().contains(RMPermissionModel.EDIT_RECORD_METADATA)))
                 {
                     LOGGER.debug("     ... " + perm.getAuthority() + " - " + perm.getPermission() + " - " + perm.getAccessStatus().toString());
                 }
@@ -1624,7 +1581,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
         if (result)
         {
             LOGGER.debug(" ... property marked as always editable.");
-        } else
+        }
+        else
         {
             boolean allowRecordEdit = false;
             boolean allowNonRecordEdit = false;
@@ -1639,8 +1597,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
                 allowNonRecordEdit = true;
             }
 
-            if (AccessStatus.ALLOWED.equals(accessRecord) ||
-                    AccessStatus.ALLOWED.equals(accessDeclaredRecord))
+            if (AccessStatus.ALLOWED.equals(accessRecord)  ||
+                AccessStatus.ALLOWED.equals(accessDeclaredRecord))
             {
                 LOGGER.debug(" ... user has edit record or declared metadata capability");
                 allowRecordEdit = true;
@@ -1650,25 +1608,29 @@ public class RecordServiceImpl extends BaseBehaviourBean
             {
                 LOGGER.debug(" ... so all properties can be edited.");
                 result = true;
-            } else if (allowNonRecordEdit && !allowRecordEdit)
+            }
+            else if (allowNonRecordEdit && !allowRecordEdit)
             {
                 // can only edit non record properties
                 if (!isRecordMetadata(filePlan, property))
                 {
                     LOGGER.debug(" ... property is not considered record metadata so editable.");
                     result = true;
-                } else
+                }
+                else
                 {
                     LOGGER.debug(" ... property is considered record metadata so not editable.");
                 }
-            } else if (!allowNonRecordEdit && allowRecordEdit)
+            }
+            else if (!allowNonRecordEdit && allowRecordEdit)
             {
                 // can only edit record properties
                 if (isRecordMetadata(filePlan, property))
                 {
                     LOGGER.debug(" ... property is considered record metadata so editable.");
                     result = true;
-                } else
+                }
+                else
                 {
                     LOGGER.debug(" ... property is not considered record metadata so not editable.");
                 }
@@ -1681,7 +1643,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
     /**
      * Helper method that indicates whether a property is considered record metadata or not.
      *
-     * @param property property
+     * @param property  property
      * @return boolea   true if record metadata, false otherwise
      */
     private boolean isRecordMetadata(NodeRef filePlan, QName property)
@@ -1701,7 +1663,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
         if (parent != null && TYPE_NON_ELECTRONIC_DOCUMENT.equals(parent.getName()))
         {
             result = false;
-        } else
+        }
+        else
         {
             // check the URI's
             result = RECORD_MODEL_URIS.contains(property.getNamespaceURI());
@@ -1736,7 +1699,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
      * Helper method to determine whether a property is protected at a dictionary definition
      * level.
      *
-     * @param property property qualified name
+     * @param property  property qualified name
      * @return booelan  true if protected, false otherwise
      */
     private boolean isProtectedProperty(QName property)
@@ -1796,7 +1759,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
         if (!nodeService.hasAspect(nodeRef, typeQName))
         {
             nodeService.addAspect(nodeRef, typeQName, null);
-        } else
+        }
+        else
         {
             LOGGER.info(I18NUtil.getMessage(MSG_NODE_HAS_ASPECT, nodeRef.toString(), typeQName.toString()));
         }
@@ -1812,7 +1776,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
         ParameterCheck.mandatory("recordFolder", recordFolder);
 
         // ensure we are linking a record to a record folder
-        if (isRecord(record) && isRecordFolder(recordFolder))
+        if(isRecord(record) && isRecordFolder(recordFolder))
         {
             // ensure that we are not linking a record to an existing location
             List<ChildAssociationRef> parents = nodeService.getParentAssocs(record);
@@ -1833,14 +1797,15 @@ public class RecordServiceImpl extends BaseBehaviourBean
 
             // create a secondary link to the record folder
             nodeService.addChild(
-                    recordFolder,
-                    record,
-                    ContentModel.ASSOC_CONTAINS,
-                    QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, name));
+                recordFolder,
+                record,
+                ContentModel.ASSOC_CONTAINS,
+                QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, name));
 
             // recalculate disposition schedule for the record when linking it
             dispositionService.recalculateNextDispositionStep(record);
-        } else
+        }
+        else
         {
             // can only link a record to a record folder
             throw new RecordLinkRuntimeException("Can only link a record to a record folder.");
@@ -1848,6 +1813,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
     }
 
     /**
+     *
      * @param record
      * @param recordFolder
      */
@@ -1867,7 +1833,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
                 {
                     // we can't link a record to an incompatible disposition schedule
                     throw new RecordLinkRuntimeException("Cannot link a record to a record folder with an incompatible retention schedule.  "
-                            + "They must either both be record level or record folder level retentions.");
+                                                     + "They must either both be record level or record folder level retentions.");
                 }
             }
         }
@@ -1883,7 +1849,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
         ParameterCheck.mandatory("recordFolder", recordFolder);
 
         // ensure we are unlinking a record from a record folder
-        if (isRecord(record) && isRecordFolder(recordFolder))
+        if(isRecord(record) && isRecordFolder(recordFolder))
         {
             // check that we are not trying to unlink the primary parent
             NodeRef primaryParent = nodeService.getPrimaryParent(record).getParentRef();
@@ -1897,7 +1863,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
 
             // recalculate disposition schedule for record after unlinking it
             dispositionService.recalculateNextDispositionStep(record);
-        } else
+        }
+        else
         {
             // can only unlink a record from a record folder
             throw new RecordLinkRuntimeException("Can only unlink a record from a record folder.");
@@ -1909,11 +1876,11 @@ public class RecordServiceImpl extends BaseBehaviourBean
      */
     @Override
     @Behaviour
-            (
-                    kind = BehaviourKind.CLASS,
-                    type = "rma:record",
-                    notificationFrequency = TRANSACTION_COMMIT
-            )
+    (
+            kind = BehaviourKind.CLASS,
+            type = "rma:record",
+            notificationFrequency = TRANSACTION_COMMIT
+    )
     public void onContentUpdate(NodeRef nodeRef, boolean newContent)
     {
         if (nodeService.exists(nodeRef) && !nodeService.hasAspect(nodeRef, ContentModel.ASPECT_HIDDEN) && !nodeService.hasAspect(nodeRef, ContentModel.ASPECT_LOCKABLE))
@@ -1926,7 +1893,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
     /**
      * Invoke invokeBeforeRecordDeclaration policy
      *
-     * @param nodeRef node reference
+     * @param nodeRef       node reference
      */
     protected void invokeBeforeRecordDeclaration(NodeRef nodeRef)
     {
@@ -1940,7 +1907,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
     /**
      * Invoke invokeOnRecordDeclaration policy
      *
-     * @param nodeRef node reference
+     * @param nodeRef       node reference
      */
     protected void invokeOnRecordDeclaration(NodeRef nodeRef)
     {
@@ -1954,7 +1921,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
     /**
      * Invoke invokeBeforeRecordRejection policy
      *
-     * @param nodeRef node reference
+     * @param nodeRef       node reference
      */
     protected void invokeBeforeRecordRejection(NodeRef nodeRef)
     {
@@ -1968,7 +1935,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
     /**
      * Invoke invokeOnRecordRejection policy
      *
-     * @param nodeRef node reference
+     * @param nodeRef       node reference
      */
     protected void invokeOnRecordRejection(NodeRef nodeRef)
     {
@@ -1981,17 +1948,17 @@ public class RecordServiceImpl extends BaseBehaviourBean
 
     /**
      * RM-5244 - workaround to make sure the incomplete aspect is removed
-     *
+     * 
      * @param nodeRef the node to reevaluate for
      */
     private void reevaluateIncompleteTag(NodeRef nodeRef)
     {
         /*
          * Check if the node has the aspect because the reevaluation is expensive.
-         * If the node doesn't have the aspect it means IncompleteNodeTagger didn't load before TransactionBehaviourQueue
+         * If the node doesn't have the aspect it means IncompleteNodeTagger didn't load before TransactionBehaviourQueue 
          * and we don't need to reevaluate.
          */
-        if (nodeService.hasAspect(nodeRef, ContentModel.ASPECT_INCOMPLETE))
+        if(nodeService.hasAspect(nodeRef, ContentModel.ASPECT_INCOMPLETE))
         {
             incompleteNodeTagger.beforeCommit(false);
         }
@@ -2162,4 +2129,4 @@ public class RecordServiceImpl extends BaseBehaviourBean
         localName = MessageFormat.format("{0}CustomProperties", localName);
         return QName.createQName(RM_CUSTOM_URI, localName);
     }
-}
+}
\ No newline at end of file
diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/rule/FilePlanRuleInheritanceTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/rule/FilePlanRuleInheritanceTest.java
index b465953eae..857310927d 100644
--- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/rule/FilePlanRuleInheritanceTest.java
+++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/rule/FilePlanRuleInheritanceTest.java
@@ -76,6 +76,7 @@ public class FilePlanRuleInheritanceTest extends BaseRMTestCase
         doBehaviourDrivenTest(new BehaviourDrivenTest()
         {
             private NodeRef filePlan = null;
+            private Rule rule = null;
             private List<Rule> rules = null;
             
             public void given()
@@ -83,24 +84,24 @@ public class FilePlanRuleInheritanceTest extends BaseRMTestCase
                 filePlan = createFilePlan();
                 
                 // create a rule that applies to childre
-                Action completeRecordAction = actionService.createAction(DeclareRecordAction.NAME);                
-                Rule rule = new Rule();
+                Action completeRecordAction = actionService.createAction(DeclareRecordAction.NAME);
+                rule = new Rule();
                 rule.setRuleType("inbound");
                 rule.setAction(completeRecordAction);
                 rule.applyToChildren(true);
-                
+            }
+
+            public void when()
+            {
                 // save rule on file plan root parent folder
                 ruleService.saveRule(folder, rule);
             }
-            
-            public void when()
+
+            public void then()
             {
                 // get rules, including those inherited
                 rules = ruleService.getRules(filePlan, true);
-            }   
-            
-            public void then()
-            {
+
                 // rules aren't inhreited from file plan root parent folder
                 assertEquals(0, rules.size());
             }
@@ -121,31 +122,32 @@ public class FilePlanRuleInheritanceTest extends BaseRMTestCase
         {
             private NodeRef filePlan = null;
             private List<Rule> rules = null;
-            
+            private Rule rule = null;
+
             public void given()
             {
                 filePlan = createFilePlan();
                 
                 // create a rule that applies to childre
-                Action completeRecordAction = actionService.createAction(DeclareRecordAction.NAME);                
-                Rule rule = new Rule();
+                Action completeRecordAction = actionService.createAction(DeclareRecordAction.NAME);
+                rule = new Rule();
                 rule.setRuleType("inbound");
                 rule.setAction(completeRecordAction);
                 rule.applyToChildren(true);
-                
+            }
+
+            public void when()
+            {
                 // save rule on file plan root
                 ruleService.saveRule(filePlan, rule);
             }
-            
-            public void when()
+
+            public void then()
             {
                 // get rules, including those inherited
                 NodeRef unfiledRecordContainer = filePlanService.getUnfiledContainer(filePlan);
                 rules = ruleService.getRules(unfiledRecordContainer, true);
-            }   
-            
-            public void then()
-            {
+
                 // rules aren't inhreited from file plan root
                 assertEquals(0, rules.size());
             }
@@ -164,31 +166,32 @@ public class FilePlanRuleInheritanceTest extends BaseRMTestCase
         {
             private NodeRef filePlan = null;
             private List<Rule> rules = null;
-            
+            private Rule rule = null;
+
             public void given()
             {
                 filePlan = createFilePlan();
                 
                 // create a rule that applies to childre
-                Action completeRecordAction = actionService.createAction(DeclareRecordAction.NAME);                
-                Rule rule = new Rule();
+                Action completeRecordAction = actionService.createAction(DeclareRecordAction.NAME);
+                rule = new Rule();
                 rule.setRuleType("inbound");
                 rule.setAction(completeRecordAction);
                 rule.applyToChildren(true);
-                
+            }
+
+            public void when()
+            {
                 // save rule on file plan root
                 ruleService.saveRule(filePlan, rule);
             }
-            
-            public void when()
+
+            public void then()
             {
                 // get rules, including those inherited
                 NodeRef container = filePlanService.getHoldContainer(filePlan);
                 rules = ruleService.getRules(container, true);
-            }   
-            
-            public void then()
-            {
+
                 // rules aren't inhreited from file plan root
                 assertEquals(0, rules.size());
             }
@@ -207,31 +210,32 @@ public class FilePlanRuleInheritanceTest extends BaseRMTestCase
         {
             private NodeRef filePlan = null;
             private List<Rule> rules = null;
-            
+            private Rule rule = null;
+
             public void given()
             {
                 filePlan = createFilePlan();
                 
                 // create a rule that applies to childre
-                Action completeRecordAction = actionService.createAction(DeclareRecordAction.NAME);                
-                Rule rule = new Rule();
+                Action completeRecordAction = actionService.createAction(DeclareRecordAction.NAME);
+                rule = new Rule();
                 rule.setRuleType("inbound");
                 rule.setAction(completeRecordAction);
                 rule.applyToChildren(true);
-                
+            }
+
+            public void when()
+            {
                 // save rule on file plan root
                 ruleService.saveRule(filePlan, rule);
             }
-            
-            public void when()
+
+            public void then()
             {
                 // get rules, including those inherited
                 NodeRef container = filePlanService.getTransferContainer(filePlan);
                 rules = ruleService.getRules(container, true);
-            }   
-            
-            public void then()
-            {
+
                 // rules aren't inhreited from file plan root
                 assertEquals(0, rules.size());
             }
@@ -251,31 +255,32 @@ public class FilePlanRuleInheritanceTest extends BaseRMTestCase
             private NodeRef filePlan = null;
             private NodeRef recordCategory = null;
             private List<Rule> rules = null;
-            
+            private Rule rule = null;
+
             public void given()
             {
                 filePlan = createFilePlan();
                 recordCategory = filePlanService.createRecordCategory(filePlan, GUID.generate());
                 
                 // create a rule that applies to childre
-                Action completeRecordAction = actionService.createAction(DeclareRecordAction.NAME);                
-                Rule rule = new Rule();
+                Action completeRecordAction = actionService.createAction(DeclareRecordAction.NAME);
+                rule = new Rule();
                 rule.setRuleType("inbound");
                 rule.setAction(completeRecordAction);
                 rule.applyToChildren(true);
-                
+            }
+
+            public void when()
+            {
                 // save rule on file plan root
                 ruleService.saveRule(filePlan, rule);
             }
-            
-            public void when()
+
+            public void then()
             {
                 // get rules, including those inherited
                 rules = ruleService.getRules(recordCategory, true);
-            }   
-            
-            public void then()
-            {
+
                 // rules aren't inhreited from file plan root
                 assertEquals(1, rules.size());
             }