RM-2604 Rename caveat group types.

Now we have HIERARCHICAL, USER_REQUIRES_ALL and USER_REQUIRES_ANY.

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

rm-server/config/alfresco/module/org_alfresco_module_rm/caveat/rm-caveats.json

@@ -24,7 +24,7 @@
       "id"           : "nationality",
       "displayLabel" : "rm.caveat.nationality.label",
       "description"  : "rm.caveat.nationality.description",
-      "type"         : "CUMULATIVE_AVAILABILITY",
+      "type"         : "USER_REQUIRES_ANY",
       "marks" :
       [
          {
@@ -45,7 +45,7 @@
       "id"           : "training",
       "displayLabel" : "rm.caveat.training.label",
       "description"  : "rm.caveat.training.description",
-      "type"         : "CUMULATIVE_SECURITY",
+      "type"         : "USER_REQUIRES_ALL",
       "marks" :
       [
          {

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatGroupType.java

@@ -30,7 +30,7 @@ public enum CaveatGroupType
     /** Each mark in the group implies all earlier marks also apply. */
     HIERARCHICAL,
     /** Many marks may be applied to content, and users need all marks to access it. */
-    CUMULATIVE_SECURITY,
+    USER_REQUIRES_ALL,
     /** Many marks may be applied to content, and users can access it with any one mark. */
-    CUMULATIVE_AVAILABILITY
+    USER_REQUIRES_ANY
 }

rm-server/unit-test/resources/alfresco/caveat/rm-caveats-duplicateMarkIdInDifferentGroups.json

@@ -16,7 +16,7 @@
       "id"           : "nationality",
       "displayLabel" : "rm.caveat.nationality.group",
       "description"  : "rm.caveat.nationality.description",
-      "type"         : "CUMULATIVE_AVAILABILITY",
+      "type"         : "USER_REQUIRES_ANY",
       "marks" :
       [
          {

rm-server/unit-test/resources/alfresco/caveat/rm-caveats-malformedJSON.json

@@ -24,7 +24,7 @@
       "id"           : "nationality",
       "displayLabel" : "rm.caveat.nationality.group",
       "description"  : "rm.caveat.nationality.description",
-      "type"         : "CUMULATIVE_AVAILABILITY",
+      "type"         : "USER_REQUIRES_ANY",
       "marks" :
       [
          {