Merged DEV/BUGFIXING/HEAD-2014_12_09 to HEAD

r92551: RM-1646 Also added the schema patch for the EndRetention capability
r92431: RM-1646: Added End Retention permission to role assignable permissions. End Retention capability is now available only if the user has the associated permission.

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

rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-disposition-context.xml

@@ -157,6 +157,30 @@
       <property name="index" value="120" />
    </bean>
 
+	
+   <!--  End Rentention -->
+   <bean id="rmEndRetentionCapability"
+      parent="declarativeCapability">
+      <property name="name" value="EndRetention"/>
+      <property name="permission" value="EndRetention" />
+      <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>
+      <property name="group"><ref bean="dispositionAndTransfersGroup"/></property>
+      <property name="index" value="70" />
+   </bean>
+   
+   
    <!--  Non-assignable Capabilities -->
 
    <bean id="rmInitiateAllTransfersCapability"
@@ -286,24 +310,5 @@
       </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>

rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties

@@ -56,6 +56,7 @@ capability.DeleteRecords.title=Delete Records
 capability.TriggerAnEvent.title=Trigger An Event
 capability.FileDestructionReport.title=File Destruction Report
 capability.FileTransferReport.title=File Transfer Report
+capability.EndRetention.title=End Retention
 
 # Hold Controls
 capability.group.holdControls.title=Hold Controls

rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsPermissionModel.xml

@@ -95,6 +95,7 @@
             <includePermissionGroup type="rma:filePlanComponent" permissionGroup="FileHoldReport"/>
             <includePermissionGroup type="rma:filePlanComponent" permissionGroup="DeleteHold"/>
             <includePermissionGroup type="rma:filePlanComponent" permissionGroup="EditHold"/>
+            <includePermissionGroup type="rma:filePlanComponent" permissionGroup="EndRetention"/>
         </permissionGroup>
 
         <permissionGroup name="Filing" allowFullControl="false" expose="true">
@@ -183,6 +184,7 @@
         <permissionGroup name="FileHoldReport" expose="false" allowFullControl="false"/>
         <permissionGroup name="DeleteHold" expose="false" allowFullControl="false"/>
         <permissionGroup name="EditHold" expose="false" allowFullControl="false"/>
+        <permissionGroup name="EndRetention" expose="false" allowFullControl="false"/>
 
         <!--  End -->
 
@@ -486,6 +488,10 @@
             <grantedToGroup permissionGroup="EditHold"/>
         </permission>
         
+        <permission name="_EndRetention" expose="false">
+            <grantedToGroup permissionGroup="EndRetention"/>
+        </permission>        
+        
     </permissionSet>
 
 </permissions>

rm-server/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml

@@ -9,7 +9,7 @@
       <property name="description" value="RM patch executer"/>
       <property name="sinceVersion" value="2.2"/>
       <property name="executeOnceOnly" value="false"/>
-      <property name="moduleSchema" value="1011"/>      
+      <property name="moduleSchema" value="1012"/>      
       <property name="attributeService" ref="AttributeService" />   
       <property name="dependsOn">
       	<list>

rm-server/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v23-context.xml

@@ -22,5 +22,16 @@
       <property name="targetSchema" value="1011"/>
 	  <property name="recordsManagementEventService" ref="recordsManagementEventService"/>
    </bean>
+   
+   <bean id="rm.endRetenionCapabilityPatch"
+         parent="rm.parentModulePatch"
+         class="org.alfresco.module.org_alfresco_module_rm.patch.v23.RMv23EndRetentionCapabilityPatch">
+      <property name="description" value="Add EndRetenion capability."/>
+      <property name="fixesToSchema" value="1011"/>
+      <property name="targetSchema" value="1012"/>
+      <property name="filePlanService" ref="FilePlanService"/>
+      <property name="permissionService" ref="permissionService"/>
+      <property name="authorityService" ref="authorityService"/>
+   </bean>
 
 </beans>

rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json

@@ -143,7 +143,8 @@
           "RemoveFromHold",
           "FileHoldReport",
           "DeleteHold",
-          "EditHold"
+          "EditHold",
+          "EndRetention"
       ]
    },
    {
@@ -215,7 +216,8 @@
           "RemoveFromHold",
           "FileHoldReport",
           "DeleteHold",
-          "EditHold"
+          "EditHold",
+          "EndRetention"
       ]
    }
 ]