Commit Graph

219 Commits

Author SHA1 Message Date
Tuna Aksoy
5d1d814e13 RM-3132 (Update license headers) 2016-03-11 17:28:49 +00:00
Tuna Aksoy
224b1c4116 RM-3132 (Update license headers) 2016-03-11 17:05:12 +00:00
Tuna Aksoy
2e3a1fa270 RM-3132 (Update license headers) 2016-03-11 16:50:48 +00:00
Tuna Aksoy
9ab4e9e17e RM-3132 (Update license headers) 2016-03-11 16:44:23 +00:00
Tom Page
26070c66c5 Revert "Revert "Merge branch 'feature/RM-3063_Creation_of_Groups_and_Marks' into 'master'""
This reverts commit 869ffc7aeb.
2016-03-08 10:26:12 +00:00
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
Roy Wetherall
0131a72e8b Merge remote-tracking branch 'origin/release/V2.4' 2016-03-08 11:44:25 +11:00
nmcerlean
f1e1f21886 Merge remote-tracking branch 'origin/master' into feature/RM-3063_Creation_of_Groups_and_Marks 2016-03-07 14:55:03 +00:00
Roy Wetherall
6ba4cabab4 Add missing headers 2016-03-04 10:16:19 +11:00
Roy Wetherall
1b0c83bf02 Merge branch 'release/V2.4' of gitlab.alfresco.com:records-management/records-management into RM-2969_UpdateLicenseHeaders 2016-03-04 09:05:15 +11:00
Roy Wetherall
f98f0cb32b Refresh license headers to include changes to community license and module description 2016-03-03 10:38:37 +11:00
nmcerlean
f3a0b84515 Added javadoc to explain how to use smuggleCheckedExceptions utility method. 2016-03-01 20:45:55 +00:00
nmcerlean
45d0ef093e Added additional utility methods and types for easier use of Java 8 lambdas with checked exceptions. 2016-03-01 19:01:06 +00:00
Roy Wetherall
be365f98ba Add managed license headers to community projects for java, js and ftl source files. 2016-03-01 13:06:00 +11:00
Roy Wetherall
5059bd7cec Remove old license headers 2016-03-01 12:53:30 +11:00
Roy Wetherall
246823beab Fixed issues with detecting correct license 2016-02-29 13:52:17 +11:00
Roy Wetherall
29a1f134b7 Unit test for module compatibility component 2016-02-26 11:51:08 +11:00
Tom Page
9091ab29c9 Merge release/V2.3 into release/V2.4. 2016-02-18 09:29:01 +00:00
Tuna Aksoy
402fc1b831 RM-2940 (Create parent pom.xml file above rm-community and rm-enterprise) 2016-01-31 20:11:15 +00:00