From c68ed17d2d3b718f3377829d01f79559a9184ab9 Mon Sep 17 00:00:00 2001
From: Roy Wetherall <roy.wetherall@alfresco.com>
Date: Thu, 5 Sep 2013 00:47:15 +0000
Subject: [PATCH] RM-914: "Retain" action is absent

 * ensured scheduled job executes retain successfully
 * added UI action "End Retention" .. allowing user to manually end the retention when eligible



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@54955 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../rm-capabilities-condition-context.xml     |  7 ++++++
 .../rm-capabilities-disposition-context.xml   | 22 ++++++++++++++++++-
 .../rm-action-context.xml                     |  4 +++-
 .../rm-ui-evaluators-context.xml              | 12 ++++++++++
 4 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml
index 921eb9cf91..25be236296 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml
@@ -128,6 +128,13 @@
     	<property name="dispositionService" ref="DispositionService"/>
     	<property name="dispositionAction" value="cutoff"/>
     </bean>
+    
+    <bean id="capabilityCondition.retentionIsScheduled"
+          parent="capabilityCondition.base"
+          class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.IsScheduledCapabilityCondition">
+    	<property name="dispositionService" ref="DispositionService"/>
+    	<property name="dispositionAction" value="retain"/>
+    </bean>
 
     <bean id="capabilityCondition.isTransferAccession"
           parent="capabilityCondition.base"
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-disposition-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-disposition-context.xml
index 54dfef60c4..dff8fdc8ad 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-disposition-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-disposition-context.xml
@@ -3,7 +3,7 @@
 
 <beans>
    <!--  Assignable Capabilities -->
-
+   
    <!--  Cut off -->
    <bean id="rmApproveRecordsScheduledForCutoffCapability"
       parent="declarativeCapability">
@@ -273,5 +273,25 @@
          </list>
       </property>
    </bean>
+   
+   <!--  End Rentention -->
+   <bean id="rmEndRetentionCapability"
+      parent="declarativeCapability">
+      <property name="name" value="EndRetention"/>
+      <property name="private" value="true"/>
+      <property name="kinds">
+         <list>
+            <value>RECORD_FOLDER</value>
+            <value>RECORD</value>
+         </list>
+      </property>
+      <property name="conditions">
+         <map>
+            <entry key="capabilityCondition.filling" value="true"/>
+            <entry key="capabilityCondition.frozenOrFrozenChildren" value="false"/>
+            <entry key="capabilityCondition.retentionIsScheduled" value="true" />
+         </map>
+      </property>
+   </bean>
 
 </beans>
\ No newline at end of file
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
index 949ee1fb7c..c948e7743b 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
@@ -267,7 +267,7 @@
 
    <bean id="retain_proxy" parent="rmProxyAction" >
       <property name="target">
-         <bean id="retain" class="org.alfresco.module.org_alfresco_module_rm.action.impl.RetainAction" parent="rmAction" depends-on="rmFileRecordsCapability"/>
+       	<ref bean="retain"/>  
       </property>
       <property name="interceptorNames">
          <list>
@@ -275,6 +275,8 @@
          </list>
       </property>
    </bean>
+   
+   <bean id="retain" class="org.alfresco.module.org_alfresco_module_rm.action.impl.RetainAction" parent="rmAction"/>
 
    <!-- open record folder -->
 
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
index b77a3b7096..1882213abc 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
@@ -758,5 +758,17 @@
          </set>
       </property>
    </bean>
+   
+   <bean id="jsonConversionComponent.endRetention"
+         parent="jsonConversionComponent.baseAction">
+      <property name="name" value="endRetention"/>
+      <property name="kinds">
+         <set>
+            <value>RECORD</value>
+            <value>RECORD_FOLDER</value>
+         </set>
+      </property>
+      <property name="capability" value="EndRetention" />
+   </bean>
 
 </beans>