inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,239 Commits 324 Branches 2,170 Tags
bb48e4de97d2aaa0fda9aba105784bd6eefcfb82
Commit Graph

43 Commits

Author SHA1 Message Date
Tuna Aksoy
bb48e4de97 Merge branch 'release/V2.4' 2016-03-15 15:08:17 +00:00
Tuna Aksoy
1882c86a38 Merge branch 'release/V2.4' 
Conflicts:
	rm-automation/src/main/java/org/alfresco/po/rm/rules/fileplan/CreateFilePlanRulePage.java
	rm-community/.editorConfig
	rm-community/.jshintrc
	rm-community/pom.xml
	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/pom.xml
	rm-enterprise/rm-enterprise-repo/pom.xml
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/caveat-context.xml
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/context/webscript-context.xml
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/log4j.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/caveat-model.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_de.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_es.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_fr.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_it.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_ja.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_nb.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_nl.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_pt_BR.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_ru.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_zh_CN.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_de.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_es.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_fr.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_it.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_ja.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_nb.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_nl.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_pt_BR.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_ru.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_zh_CN.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/model/caveatModel.xml
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/module-context.xml
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/templates/webscripts/org/alfresco/rma/caveat/caveatgroups.get.json.ftl
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ClearanceForAdminBootstrapComponent.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatException.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatMarkingService.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatMarkingServiceImpl.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/dao/CaveatDAOCache.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/dao/CaveatDAOFromJSONBootstrap.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/dao/CaveatDAOInterface.java
	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/CaveatAccessUtility.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/CaveatMark.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/caveat/scheme/CaveatSchemeServiceImpl.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatUtils.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationLevelManager.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationSchemeServiceImpl.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/classification/permission/ClassificationPermissionPreProcessor.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupsGet.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/repo/jscript/app/CurrentClassificationPropertyDecorator.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/repo/quickshare/ExtendedQuickShareServiceImpl.java
	rm-enterprise/rm-enterprise-repo/src/main/properties/local/alfresco-global.properties
	rm-enterprise/rm-enterprise-repo/src/main/resources/alfresco/module/alfresco-rm-server-enterprise/classification/rm-classification-reasons.json
	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/caveat/CaveatsBootstrapTest.java
	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/ClassificationReasonsTest.java
	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/ClassifyTest.java
	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/ClassificationRestApiTest.java
	rm-enterprise/rm-enterprise-repo/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml
	rm-enterprise/rm-enterprise-repo/src/test/resources/alfresco/module/alfresco-rm-server-enterprise/classification/rm-classification-reasons.json
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatMarkingServiceImplUnitTestBase.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatMarkingServiceImpl_NodeRefUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatMarkingServiceImpl_UserUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/caveat/TestOnlyCaveatSchemeService.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/caveat/dao/CaveatDAOFromJSONBootstrapUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationLevelManagerUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/SecurityClearanceServiceImplUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/permission/ClassificationPermissionPreProcessorUnitTest.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/classification/ClassifyContentPostUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/repo/jscript/app/CurrentClassificationPropertyDecoratorUnitTest.java
	rm-enterprise/rm-enterprise-share/.jshintrc
	rm-enterprise/rm-enterprise-share/pom.xml
	rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/renderers/ClassificationLabel.js
 2016-03-15 12:10:53 +00:00
Roy Wetherall
209c3ed9a5 Merge branch 'release/V2.4' of gitlab.alfresco.com:records-management/records-management into feature-2.4/RM-3148-FilePlanInheritedRulesNotFiring 2016-03-15 11:59:32 +11:00
Roy Wetherall
44a188dabf Remove now unessesary checks from rule execution (RM-3148) 2016-03-15 11:59:13 +11:00
Roy Wetherall
e0cef2c6e1 Ensure that rules are not inherited onto the file plan, unfiled records, holds and transfers root containers (RM-3148) 2016-03-15 10:49:19 +11:00
Tuna Aksoy
80839e161e RM-3132 (Update license headers) 2016-03-14 16:17:53 +00:00
Tuna Aksoy
8237b6df2a RM-3132 (Update license headers) 2016-03-14 16:07:46 +00:00
Tuna Aksoy
ba3b6d337e RM-3132 (Update license headers) 2016-03-14 16:05:44 +00:00
Tuna Aksoy
b11ddb49e3 Reverted all license header related changes 2016-03-13 21:48:44 +00:00
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
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
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
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
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
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
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
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
Tom Page
9b755000e0 RM-2776 Move SortDirection to rm-community. 
This is a general-use enum, and so it should be somewhere fairly accessible.
 2016-02-15 14:24:46 +00:00
Roy Wetherall
3d9f2b0d7b Spring configuration for module compatibility component. 2016-02-11 14:42:23 +11:00
Roy Wetherall
753d072f51 Initial implementation 2016-02-10 12:02:37 +11:00
Tuna Aksoy
adf7e9630c RM-2940 (Create parent pom.xml file above rm-community and rm-enterprise) 2016-01-31 20:11:15 +00:00
Tuna Aksoy
75a8ddff22 RM-2940 (Create parent pom.xml file above rm-community and rm-enterprise) 2016-01-31 17:04:39 +00:00