From 0ea934401677a458acf88196e402d4a9f9cd335c Mon Sep 17 00:00:00 2001
From: Tom Page <tom.page@alfresco.com>
Date: Wed, 9 Sep 2015 10:30:08 +0000
Subject: [PATCH] Merged BRANCHES/V2.1 to BRANCHES/V2.2:    111636: Merged
 BRANCHES/V2.1.0.x to BRANCHES/V2.1:         68559: Change base Alfresco
 version from 4.2.0-RC4 to 4.2.0         68568: Merge from HEAD to
 BRANCHES/V2.1.0.x         68569: Update module version to 2.1.0.1        
 76475: Merge HEAD to BRANCHES/V2.1.0.x:         76597: Merge HEAD to
 BRANCHES/V2.1.0.x:             74932: RM-1461: CLONE - RM slower then
 standard repo/sites when rendering document details when folder contains 15k
 documents         76598: Merged HEAD to BRANCHES/V2.1.0.x:             
 75102: RM Performance testing         76599: Update module version to 2.1.0.2
         76601: Merged HEAD to BRANCHES/V2.1.0.x:              75186: RM
 Performance Improvements         76673: Root container cache to improve
 unfiled record browse performance             * relates to RM-1594 and
 RM-1595         76850: RM performance enhancements             * serach
 improvements             * in-place record browse improvements             *
 saved search via file plan browse improvements         76851: Additional unit
 test to check extended security with cache is working as expected.        
 76852: Rollback checked in config         77709: RM-1630: Error on manage
 references page             * regression caused by performance improvements  
       84337: Update version to 2.1.0.3         84421: Transaction level
 cahcing of declarative capability evaluation         84676: Fix build        
 84677: Prevent unnessary repeated creation of QName         84678:
 Improvements to extended dynamic authorities             * requiredFor set   
          * direct access to extended permission information, not via service 
        84679: Correct requiredFor value         88087: RM-1661 (Performance
 on setting permissions at a high category level)         88092: RM-1661
 (Performance on setting permissions at a high category level)              *
 Fixed failing unit tests         88144: RM-1661 (Performance on setting
 permissions at a high category level)         88182: RM-1724 (Inheritance is
 not off for root categories, unfiled records, holds and transfers)        
 88192: RM-1661 (Performance on setting permissions at a high category level) 
             * Added unit tests         88193: RM-1661 (Performance on setting
 permissions at a high category level)              * Fixed failing unit tests
         88358: RM-1661 (Performance on setting permissions at a high category
 level)              * Added unit tests         88685: RM-1742 (Locally Set
 Permissions for moved Record duplicate parent folder Locally Set Permissions)
         88686: RM-1741 (Moved root category doesn't inherit permissions)     
    88687: RM-1741 (Moved root category doesn't inherit permissions)          
    * Unit test added         88688: RM-1742 (Locally Set Permissions for
 moved Record duplicate parent folder Locally Set Permissions)              *
 Unit test added         88691: RM-1745 (RM Admin role can only be added with
 read permission on the manage permission page)         88772: RM-1741 (Moved
 root category doesn't inherit permissions)         88860: RM-1661
 (Performance on setting permissions at a high category level)         88864:
 RM-1661 (Performance on setting permissions at a high category level)        
      * Fixed failing unit tests         88959: RM-1746 (Moved record/category
 always have the inheritance on)         88960: RM-1661 (Performance on
 setting permissions at a high category level)              * Fixed failing
 unit tests         88961: RM-1661 (Performance on setting permissions at a
 high category level)              * Fixed failing unit tests         88962:
 RM-1661 (Performance on setting permissions at a high category level)        
      * Fixed failing unit tests         91745: RM-1785 (RM: HF 2.1.0.3-33
 causes permissions to not be displayed in Share everywhere else in the repo) 
        91838: Update version to 2.1.0.4    111641: Update Alfresco to
 4.2.2.24.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@111776 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../extended-repository-context.xml           | 57 +++++++++++++++++++
 .../org_alfresco_module_rm/rm-job-context.xml |  2 +
 .../rm-service-context.xml                    |  1 +
 3 files changed, 60 insertions(+)

diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml
index 2b10615154..989dfc2be0 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml
@@ -3,12 +3,38 @@
 
 <beans>
 
+<<<<<<< .working
    <!-- extend node service security to report capability details on failure -->
    <bean id="rm.NodeService_security" abstract="true" class="org.alfresco.module.org_alfresco_module_rm.security.RMMethodSecurityInterceptor"/>
    <bean class="org.alfresco.module.org_alfresco_module_rm.util.BeanExtender">
       <property name="beanName" value="NodeService_security" />
       <property name="extendingBeanName" value="rm.NodeService_security" />
    </bean>
+=======
+   <!-- AVM Remote Store to ADM Remote Store migration patch -->
+  <!-- <bean id="patch.avmToAdmRemoteStore" class="org.alfresco.repo.admin.patch.impl.AVMToADMRemoteStorePatch" parent="basePatch">
+        <property name="id"><value>patch.avmToAdmRemoteStore</value></property>
+        <property name="description"><value>patch.avmToAdmRemoteStore.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>5011</value></property>
+        <property name="targetSchema"><value>5012</value></property>
+        <property name="requiresTransaction"><value>false</value></property>
+        <property name="fileFolderService" ref="fileFolderService" />
+        <property name="contentService" ref="contentService" />
+        <property name="siteService" ref="SiteService" />
+        <property name="ruleService" ref="ruleService" />
+        <property name="avmService" ref="AVMService" />
+        <property name="hiddenAspect" ref="hiddenAspect" />
+        <property name="avmStore"><value>sitestore</value></property>
+        <property name="avmRootPath"><value>/alfresco/site-data</value></property>
+        <property name="dependsOn" >
+            <list>
+                <ref bean="patch.migrateTenantsFromAttrsToTable" />
+                <ref bean="patch.migrateAttrTenants" />
+            </list>
+        </property>
+    </bean> -->
+>>>>>>> .merge-right.r111658
 
    <!-- extended file folder bean definition -->
    <bean id="rm.fileFolderService" abstract="true" class="org.alfresco.repo.model.filefolder.ExtendedFileFolderServiceImpl">
@@ -42,7 +68,12 @@
             </list>
         </property>
     </bean>
+<<<<<<< .working
     <bean id="ExtendedPermissionService_security" class="org.alfresco.module.org_alfresco_module_rm.security.RMMethodSecurityInterceptor">
+=======
+
+    <bean id="ExtendedPermissionService_security" class="org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityInterceptor">
+>>>>>>> .merge-right.r111658
         <property name="authenticationManager"><ref bean="authenticationManager"/></property>
         <property name="accessDecisionManager"><ref bean="accessDecisionManager"/></property>
         <property name="afterInvocationManager"><ref bean="afterInvocationManager"/></property>
@@ -67,11 +98,19 @@
             </value>
         </property>
     </bean>
+<<<<<<< .working
 
    <bean name="writersSharedCache" factory-bean="cacheFactory" factory-method="createCache">
       <constructor-arg value="cache.writersSharedCache"/>
    </bean>
 
+=======
+
+    <bean name="writersSharedCache" class="org.alfresco.repo.cache.DefaultSimpleCache">
+      <property name="maxItems" value="${cache.writersSharedCache.maxItems}"/>
+    </bean>
+
+>>>>>>> .merge-right.r111658
     <bean name="writersCache" class="org.alfresco.repo.cache.TransactionalCache">
       <property name="sharedCache">
          <ref bean="writersSharedCache" />
@@ -198,6 +237,7 @@
           <value>${rm.autocompletesuggestion.maxsuggestions.node}</value>
        </property>
     </bean>
+<<<<<<< .working
 
     <!-- Bootstrap node parameter processor  -->
     <bean id="nodeParameterSuggesterBootstrap" class="org.alfresco.repo.action.parameter.NodeParameterSuggesterBootstrap" init-method="init">
@@ -208,6 +248,9 @@
        </property>
     </bean>
 
+=======
+
+>>>>>>> .merge-right.r111658
     <bean id="dateParameterProcessor" parent="baseParamenterProcessor" class="org.alfresco.repo.action.parameter.DateParameterProcessor">
        <property name="name" value="date" />
        <property name="maximumNumberSuggestions">
@@ -235,6 +278,7 @@
         <property name="rulesDisabled">
             <value>false</value>
         </property>
+<<<<<<< .working
         <!--  Since RM 2.1 -->
         <property name="filePlanService" ref="FilePlanService" />
         <property name="runAsAdmin">
@@ -244,6 +288,19 @@
     </bean>
 
     <bean id="FormService_security" class="org.alfresco.module.org_alfresco_module_rm.security.RMMethodSecurityInterceptor">
+=======
+
+    	<!--  Since RM 2.1 -->
+    	<property name="filePlanAuthenticationService" ref="FilePlanAuthenticationService"/>
+    	<property name="filePlanService" ref="FilePlanService" />
+    	<property name="runAsRmAdmin">
+    		<value>${rm.rule.runasrmadmin}</value>
+    	</property>
+
+   </bean>
+
+    <bean id="FormService_security" class="org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityInterceptor">
+>>>>>>> .merge-right.r111658
         <property name="authenticationManager"><ref bean="authenticationManager"/></property>
         <property name="accessDecisionManager"><ref bean="accessDecisionManager"/></property>
         <property name="afterInvocationManager"><ref bean="afterInvocationManager"/></property>
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-job-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-job-context.xml
index 1a28ac1156..c975a79827 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-job-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-job-context.xml
@@ -94,6 +94,8 @@
          <ref bean="schedulerFactory" />
       </property>
       <property name="cronExpression">
+         
+         <!-- run at 3am -->
          <!-- <value>0 30 3 * * ?</value> -->
          <!-- <value>0/30 * * * * ?</value> -->
          <value>${rm.dispositionlifecycletrigger.cronexpression}</value>
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
index 016ae2361a..72735a2f1c 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
@@ -387,6 +387,7 @@
         <property name="nodeDAO" ref="nodeDAO" />
         <property name="siteService" ref="SiteService" />
         <property name="rootContainerCache" ref="rootContainerCache" />
+        <property name="rootContainerCache" ref="rootContainerCache" />
     </bean>
 
     <bean id="FilePlanService" class="org.springframework.aop.framework.ProxyFactoryBean">