From 9e93ad5f101bcf7dd6c2c39d1643efbf6290da79 Mon Sep 17 00:00:00 2001
From: Tom Page <tom.page@alfresco.com>
Date: Tue, 13 Oct 2015 13:43:36 +0000
Subject: [PATCH] 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
---
 .../module/org_alfresco_module_rm/caveat/rm-caveats.json      | 4 ++--
 .../org_alfresco_module_rm/caveat/scheme/CaveatGroupType.java | 4 ++--
 .../caveat/rm-caveats-duplicateMarkIdInDifferentGroups.json   | 2 +-
 .../resources/alfresco/caveat/rm-caveats-malformedJSON.json   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/caveat/rm-caveats.json b/rm-server/config/alfresco/module/org_alfresco_module_rm/caveat/rm-caveats.json
index 5c5a1b68ba..e744ba86f1 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/caveat/rm-caveats.json
+++ b/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" :
       [
          {
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatGroupType.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatGroupType.java
index c86183b649..1b0d397a60 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatGroupType.java
+++ b/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
 }
diff --git a/rm-server/unit-test/resources/alfresco/caveat/rm-caveats-duplicateMarkIdInDifferentGroups.json b/rm-server/unit-test/resources/alfresco/caveat/rm-caveats-duplicateMarkIdInDifferentGroups.json
index c5b8b6ce01..c9fc56cab3 100644
--- a/rm-server/unit-test/resources/alfresco/caveat/rm-caveats-duplicateMarkIdInDifferentGroups.json
+++ b/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" :
       [
          {
diff --git a/rm-server/unit-test/resources/alfresco/caveat/rm-caveats-malformedJSON.json b/rm-server/unit-test/resources/alfresco/caveat/rm-caveats-malformedJSON.json
index 9296c5d2a7..0b8e302ce2 100644
--- a/rm-server/unit-test/resources/alfresco/caveat/rm-caveats-malformedJSON.json
+++ b/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" :
       [
          {