Commit Graph

1439 Commits

Author SHA1 Message Date
Tuna Aksoy
cf287b5d62 RM-3132 (Update license headers) 2016-03-11 17:28:49 +00:00
Tuna Aksoy
2649d94a4a RM-3132 (Update license headers) 2016-03-11 17:05:12 +00:00
Tuna Aksoy
c68713ad5d RM-3132 (Update license headers) 2016-03-11 16:50:48 +00:00
Tuna Aksoy
a2d696d4a5 RM-3132 (Update license headers) 2016-03-11 16:44:23 +00:00
Tuna Aksoy
e7be7ea22e RM-3082 (Update RM Community dependency to 5.1.e) 2016-03-11 09:57:41 +00:00
Tom Page
6023c9e61a Revert "Revert "Merge branch 'feature/RM-3063_Creation_of_Groups_and_Marks' into 'master'""
This reverts commit 4ada2b5bf0.
2016-03-08 10:26:12 +00:00
Tom Page
4ada2b5bf0 Revert "Merge branch 'feature/RM-3063_Creation_of_Groups_and_Marks' into 'master'"
This reverts commit ff362d5213, 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
f1ac097a2b Add missing headers 2016-03-08 12:17:01 +11:00
Roy Wetherall
e1e630a93e Merge remote-tracking branch 'origin/release/V2.4' 2016-03-08 11:44:25 +11:00
nmcerlean
8824fc342b 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
4deba195ea updated and added headers where required. 2016-03-07 15:05:05 +11:00
Roy Wetherall
c01deb55b9 Merge branch 'release/V2.4' of gitlab.alfresco.com:records-management/records-management into RM-2969_UpdateLicenseHeaders 2016-03-07 14:19:08 +11:00
Roy Wetherall
59bf1cf1a0 Review feedback. 2016-03-07 11:06:43 +11:00
Ana Bozianu
94f74b5fcb Merge release/V2.4 into master 2016-03-04 17:37:03 +02:00
Roy Wetherall
95610f4bfc Add missing headers 2016-03-04 10:16:19 +11:00
Roy Wetherall
509ae8e8d6 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
ea350e988c Improve configuration of license plugin in POMs 2016-03-04 08:59:15 +11:00
Ana Bozianu
c8bdafe3b4 RM-2770 - run check on transaction commit when the encryption key will also be stored 2016-03-03 18:17:17 +02:00
Roy Wetherall
cc5444bff2 Fix build failure 2016-03-03 14:50:24 +11:00
Roy Wetherall
1988b7b503 Merge remote-tracking branch 'origin/release/V2.4' 2016-03-03 14:14:58 +11:00
Roy Wetherall
587a6377a1 Merge remote-tracking branch 'origin/release/V2.4' 2016-03-03 14:02:18 +11:00
Roy Wetherall
78fcda90a7 Use POM hierarchy to remove plugin configuration duplication 2016-03-03 13:07:19 +11:00
Roy Wetherall
9085014d54 Merge remote-tracking branch 'origin/release/v2.4' into feature/RM-2700_CommunityOnEnterprise 2016-03-03 11:16:11 +11:00
Roy Wetherall
18c618a919 Review feedback 2016-03-03 10:50:16 +11:00
Roy Wetherall
d165a43353 Refresh license headers to include changes to community license and module description 2016-03-03 10:38:37 +11:00
Roy Wetherall
9b2f975ed4 Ensure license header does not appear before import statements in JS files. 2016-03-02 11:59:19 +11:00
Roy Wetherall
9371461975 update POM config to fix issues on Bamboo 2016-03-02 10:38:33 +11:00
nmcerlean
a4d8483125 Added javadoc to explain how to use smuggleCheckedExceptions utility method. 2016-03-01 20:45:55 +00:00
nmcerlean
513f9c64c5 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
6b8851b201 Merge branch 'release/V2.4' of gitlab.alfresco.com:records-management/records-management into RM-2969_UpdateLicenseHeaders 2016-03-01 13:16:51 +11:00
Roy Wetherall
412353c044 Add managed license headers to community projects for java, js and ftl source files. 2016-03-01 13:06:00 +11:00
Roy Wetherall
2bbdd7cd48 Remove old license headers 2016-03-01 12:53:30 +11:00
Roy Wetherall
ddc33b1fa4 Extended configuration to cover share community, added file exclusions. 2016-03-01 11:35:28 +11:00
Roy Wetherall
ac9ba4bb1c Added update header plugin to community repo 2016-03-01 10:58:56 +11:00
Roy Wetherall
c5be9defff Added update-file-header goal 2016-02-29 15:11:07 +11:00
Roy Wetherall
e5e5597efc Fixed issues with detecting correct license 2016-02-29 13:52:17 +11:00
Ana Bozianu
3125a6e4b3 Merge release/2.4 into master 2016-02-26 11:00:00 +02:00
Roy Wetherall
0f80b9f992 Unit test for module compatibility component 2016-02-26 11:51:08 +11:00
Ana Bozianu
cfc9c6988f RM-2994 : fixed issue
- issue title: Copy/Move/Link actions don't take place and errors are thrown when running rules that perform them.
   - regression caused by RM-2072 merged forward from v2.2
   - the retrying transaction helper was missing from copyTo, moveTo and linkTo beans and was causing NullPointerException
   - createOrResolvePath method calls getContext on a node created in the current transaction which is not visible in the new transaction and it throws a FileNotFoundException
      - solution: I moved the creation of the new transaction after the context was retrieved as the concurrency exception reported in RM-2072 was being caused by property updates
2016-02-25 19:37:14 +02:00
Roy Wetherall
1c3a369faa Use context refresh event to ensure handler is called 2016-02-25 12:02:13 +11:00
Roy Wetherall
e2421d514e Merge branch 'release/V2.4' of gitlab.alfresco.com:records-management/records-management into feature/RM-2700_CommunityOnEnterprise 2016-02-25 10:42:21 +11:00
Ana Bozianu
985c77ece6 Merge branch 'feature-2.4/RM-2937_RecordDestructionKeepingMetadata' into 'release/V2.4'
Feature 2.4/rm 2937 record destruction keeping metadata

RM-2937 - The destruction of records can not be completed if the metadata is set to be maintained after destruction.

The issue reproduces only if image magic is correctly installed. If the node to be destroyed has associated renditions cleaning the rendition's content is failing because there is no capability to allow the operation. This in a regression from 2.3 where method security was disabled for the class that was deleting the thumbnails.

The code has been refactored in 2.4 and the content cleaning is performed in a new class. ExtendedContentDestructionComoponent uses the NodeService interface which enforces method security. ExtendedContentDestructionComoponent  extends ContentDestructionComoponent from community which uses the nodeService implementation. I fixed it by using the implementation directly.

After fixing the issue I noticed the renditions nodes are not deleted which is a regression from 2.3 and there is no comment to specify this was intended so I deleted the rendition node.

I noticed that the method ContentDestructionComponent.destroyContent has the parameter includeRenditions which is not being used in the code. We are deleting the rendition even if this boolean is set to false. Should I fix it with this issue or should we raise another issue for this problem. Please advise.

See merge request !39
2016-02-23 09:54:52 +00:00
Ana Bozianu
156fc5b48e Merge release/2.4 into master 2016-02-22 16:16:38 +02:00
Ana Bozianu
2d473a865e Merge branch 'feature-2.4/RM-2996_UploadUnfiledReacordsWithRuleOnFilePlan' into 'release/V2.4'
Feature 2.4/rm 2996 upload unfiled reacords with rule on file plan

RM-2996 - Files can not be uploaded in Unfiled Records if the File Plan has rules defined applying to sub-folders

The execution of rules as well as RM's RecordsManagementContainer.onCreateChildAssociation behavior fire before transaction commit and is unpredictable which one will run first. If the rule runs first the newly uploaded node doesn't have rma:filePlanComponent set at the time the method shouldRuleBeAppliedToNode executes. Calling recordService.isFiled(nodeRef)) will trigger capability check among which ViewRecordsCapability will check if the record has the rma:filePlanComponent aspect.

As a fix I ran the code from shouldRuleBeAppliedToNode method as system to avoid capability check.

I am aware the fix is a workaround but I think this is part of a bigger problem. The rules are fired before transaction commit and may conflict with other behaviors registered on transaction commit. However, we cannot add the aspect earlier in RM.

See merge request !37
2016-02-22 08:54:59 +00:00
Ana Bozianu
dbf123af83 RM-2937 - The destruction of records can not be completed if the metadata is set to be maintained after destruction.
- removed nodeService and eagerContentStoreCleaner from rm.contentDestructionComponent bean as they are already set on contentDestructionComponent
   - fixed the ignored boolean
2016-02-19 13:31:17 +02:00
Tom Page
573b9e3b9f Merge release/V2.4 into master. 2016-02-18 11:10:10 +00:00
Ana Bozianu
19b36d664f RM-2937 - The destruction of records can not be completed if the metadata is set to be maintained after destruction.
- ExtendedContentDestructionComoponent uses the NodeService interface which enforces capability check. ExtendedContentDestructionComoponent  extends ContentDestructionComoponent from community which uses the nodeService implementation. I fixed it by using the implementation directly.
   - After fixing the issue I noticed the renditions nodes are not deleted which is a regression from 2.3 and there is no comment to specify this was intended so I deleted the rendition node.
2016-02-18 12:18:00 +02:00
Tom Page
2bd1f7cdf9 Merge release/V2.3 into release/V2.4. 2016-02-18 09:29:01 +00:00
Ana Bozianu
3700a455c9 RM-2996 - Files can not be uploaded in Unfiled Records if the File Plan has rules defined applying to sub-folders.
- recordService.isFiled(nodeRef) fires capability check which conflicts with RM behavior so I run shouldRuleBeAppliedToNode code as system to skip capability check
   - this approach is a workaround
2016-02-17 15:37:19 +02:00
Tuna Aksoy
43412d9211 Merge branch 'feature/RM-2685_caveatGroupsView_UI' into 'master'
Feature/rm 2685 caveat groups view ui

See merge request !34
2016-02-15 20:22:04 +00:00