From 85287fd5466a1beb3410556aca23e0942f6de0ac Mon Sep 17 00:00:00 2001
From: Ross Gale <ross.gale@alfresco.com>
Date: Tue, 20 Mar 2018 16:52:39 +0000
Subject: [PATCH] RM-2004 adding update to use enterprise files for all besides
 recordsPermissionModel

---
 .../rm-capabilities-fileplan-context.xml          | 10 ----------
 .../model/recordsPermissionModel.xml              | 15 +++++++++------
 .../rm-ui-evaluators-context.xml                  |  6 ------
 .../security/rm-default-roles-bootstrap.json      |  6 ++----
 .../capability/RMPermissionModel.java             |  2 --
 5 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-fileplan-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-fileplan-context.xml
index 3065a1db5a..c285a9fb16 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-fileplan-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-fileplan-context.xml
@@ -20,16 +20,6 @@
       <property name="index" value="30" />
    </bean>
 
-   <bean id="rmAddExemptionsCapability"
-         parent="declarativeCapability">
-      <property name="name" value="AddExemption" />
-      <property name="permission" value="AddExemption" />
-      <property name="group">
-         <ref bean="configGroup" />
-      </property>
-      <property name="index" value="100" />
-   </bean>
-
    <!--  Unassignable Capabilities -->
 
    <bean id="rmCreateRootRecordCategoryCapability"
diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/model/recordsPermissionModel.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/model/recordsPermissionModel.xml
index 97ccb0ed45..1beb5e880a 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/model/recordsPermissionModel.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/model/recordsPermissionModel.xml
@@ -96,7 +96,9 @@
             <includePermissionGroup type="rma:filePlanComponent" permissionGroup="DeleteHold"/>
             <includePermissionGroup type="rma:filePlanComponent" permissionGroup="EditHold"/>
             <includePermissionGroup type="rma:filePlanComponent" permissionGroup="EndRetention"/>
-            <includePermissionGroup type="rma:filePlanComponent" permissionGroup="AddExemption" />
+
+
+           <includePermissionGroup type="rma:filePlanComponent" permissionGroup="AddExemptions" />
 
         </permissionGroup>
 
@@ -188,10 +190,15 @@
         <permissionGroup name="EditHold" expose="false" allowFullControl="false"/>
         <permissionGroup name="EndRetention" expose="false" allowFullControl="false"/>
 
-       <permissionGroup name="AddExemption" expose="false" allowFullControl="false" />
+
+       <permissionGroup name="AddExemptions" expose="false" allowFullControl="false" />
 
         <!--  End -->
 
+       <permission name="_AddExemptions" expose="false">
+          <grantedToGroup permissionGroup="AddExemptions" />
+       </permission>
+
         <permission name="_ReadRecords" expose="false">
             <grantedToGroup permissionGroup="ReadRecords"/>
         </permission>
@@ -496,10 +503,6 @@
             <grantedToGroup permissionGroup="EndRetention"/>
         </permission>
 
-       <permission name="_AddExemption" expose="false">
-          <grantedToGroup permissionGroup="AddExemption" />
-       </permission>
-
     </permissionSet>
 
 </permissions>
\ No newline at end of file
diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
index 44fbb328a5..3c12a64720 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
@@ -925,10 +925,4 @@
       <property name="capability" value="MoveDmRecords"/>
    </bean>
 
-   <bean id="jsonConversionComponent.addExemption"
-         parent="jsonConversionComponent.baseAction">
-      <property name="name" value="addExemption" />
-      <property name="capability" value="AddExemption" />
-   </bean>
-
 </beans>
\ No newline at end of file
diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json
index 3f7adf40dc..5771b8d991 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json
@@ -74,8 +74,7 @@
           "FileUnfiledRecords",
           "RejectRecords",
           "LinkToRecords",
-          "ManageAccessControls",
-        "AddExemption"
+          "ManageAccessControls"
       ]
    },
    {
@@ -220,8 +219,7 @@
           "FileHoldReport",
           "DeleteHold",
           "EditHold",
-          "EndRetention",
-        "AddExemption"
+          "EndRetention"
       ]
    }
 ]
\ No newline at end of file
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMPermissionModel.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMPermissionModel.java
index 9066d0ca05..04df05b91d 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMPermissionModel.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMPermissionModel.java
@@ -134,6 +134,4 @@ public interface RMPermissionModel
     String CREATE_HOLD = "CreateHold";
     String ADD_TO_HOLD = "AddToHold";
     String REMOVE_FROM_HOLD = "RemoveFromHold";
-
-    String ADD_EXEMPTIONS = "AddExemptions";
 }