Tom Page 869ffc7aeb Revert "Merge branch 'feature/RM-3063_Creation_of_Groups_and_Marks' into 'master'" ...

This reverts commit 65a6771cc9, reversing
changes made to 878b423b305633aac5ca7c80cec3ee3e1c148cfe.

Conflicts:
	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtils.java
	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtilsUsageExamplesUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/templates/webscripts/org/alfresco/rma/caveat/caveatgroup.delete.json.ftl
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/templates/webscripts/org/alfresco/rma/caveat/caveatgroup.post.json.ftl
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/templates/webscripts/org/alfresco/rma/caveat/caveatgroup.put.json.ftl
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/templates/webscripts/org/alfresco/rma/caveat/caveatmark.delete.json.ftl
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/templates/webscripts/org/alfresco/rma/caveat/caveatmark.post.json.ftl
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/templates/webscripts/org/alfresco/rma/caveat/caveatmark.put.json.ftl
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/model/CaveatModel.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatGroup.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatSchemeService.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatBase.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupDelete.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupPost.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupPut.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatMarkDelete.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatMarkPost.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatMarkPut.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupDeleteUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupPostUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupPutUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupsGetUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatMarkPostUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatTestUtils.java

2016-03-08 10:17:31 +00:00

..

org/alfresco

Revert "Merge branch 'feature/RM-3063_Creation_of_Groups_and_Marks' into 'master'"

2016-03-08 10:17:31 +00:00