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
6,415 Commits 324 Branches 2,170 Tags
ffa8053444d4af85b51a07692749f886355bae4a
Commit Graph

957 Commits

Author SHA1 Message Date
Roy Wetherall
6486923ca8 RM-3181, RM-3195: ensure JSON conversion component works when no file plan is found 2016-04-06 10:24:27 +10:00
Roy Wetherall
d5031599fa RM-3181 and RM-3195 - error accessing caveatConfig.json after modifications 
Caveat config file had filePlanComponent applied, but wasn't contained
within a file plan.
 2016-04-05 14:38:36 +10:00
Ana Bozianu
1c3cc3bbe4 Merge release/V2.4 into master 2016-04-04 09:55:10 +03:00
Roy Wetherall
2858241aed Merge branch 'feature-2.4/RM-3077_LinkedAndCutOffRecordsPropertiesNotAvailableForUsersWithNoAccessToLinkedFolder' into 'release/V2.4' 
Feature 2.4/rm 3077 linked and cut off records properties not available for users with no access to linked folder

Uses runAsSystem for obtaining instructions, recordCategory and categoryId in RecordsManagementNodeFormFilter.AddTransientProperties()

See merge request !94
 2016-04-04 01:59:29 +01:00
Ana Bozianu
5487aa1773 RM-2967 - added exists, null and empty checks to solve the problems 2016-04-01 19:02:29 +03:00
Silviu Dinuta
9908fc0c3d RM-3077 : Used runAsSystem to obtain disposition instructions, 
recordCategory and
categoryId
 2016-04-01 12:40:41 +03:00
Tuna Aksoy
5c30de9bb3 Merge branch 'release/V2.4' 
Conflicts:
	rm-community/rm-community-share/pom.xml
	rm-enterprise/rm-enterprise-share/pom.xml
 2016-03-31 15:29:35 +01:00
Roy Wetherall
ad07c548ee Merge branch 'release/V2.4' of gitlab.alfresco.com:records-management/records-management into feature-2.4/RM-3148-RuleInheritancePatch 2016-03-30 09:44:33 +11:00
Ana Bozianu
a8fd5726f2 Merge release/V2.4 into master 2016-03-24 14:39:40 +02:00
Roy Wetherall
813d3dee13 RM-3148 - File Plan containers rule inheritance patch implementation 2016-03-24 13:07:56 +11:00
Ana Bozianu
33e90196de RM-3000 - fixed issue for setPropertyValue, executeScript and sendEmail and added unit test 2016-03-23 13:03:34 +02:00
Tuna Aksoy
c33a401a3d RM-3132 (Update license headers) 2016-03-16 10:40:33 +00:00
Tuna Aksoy
85f3bf9afc Merge branch 'release/V2.4' 2016-03-16 10:32:35 +00:00
Tuna Aksoy
8fcc027af0 RM-3132 (Update license headers) 2016-03-16 10:26:58 +00:00
Tuna Aksoy
e00becde59 Merge branch 'release/V2.4' 2016-03-15 15:08:17 +00:00
Tuna Aksoy
3ca80f293f 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
2dfc8d0f27 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
3768638ffe Remove now unessesary checks from rule execution (RM-3148) 2016-03-15 11:59:13 +11:00
Roy Wetherall
587a966477 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
ff1c81d825 RM-3132 (Update license headers) 2016-03-14 16:17:53 +00:00
Tuna Aksoy
f01d2e1d41 RM-3132 (Update license headers) 2016-03-14 16:07:46 +00:00
Tuna Aksoy
27c76455c8 RM-3132 (Update license headers) 2016-03-14 16:05:44 +00:00
Tuna Aksoy
4191ba9495 Reverted all license header related changes 2016-03-13 21:48:44 +00:00
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
Roy Wetherall
89b05b3502 Add missing headers 2016-03-08 12:17:01 +11:00
Roy Wetherall
0131a72e8b Merge remote-tracking branch 'origin/release/V2.4' 2016-03-08 11:44:25 +11: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
0254b5166a Merge remote-tracking branch 'origin/release/V2.4' 2016-03-03 14:14:58 +11:00
Roy Wetherall
c0d044a0ec Merge remote-tracking branch 'origin/release/V2.4' 2016-03-03 14:02:18 +11:00
Roy Wetherall
c3ea2b5317 Merge remote-tracking branch 'origin/release/v2.4' into feature/RM-2700_CommunityOnEnterprise 2016-03-03 11:16:11 +11:00
Roy Wetherall
b2b4db3e41 Review feedback 2016-03-03 10:50:16 +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
Roy Wetherall
2515ade37c 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
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
Ana Bozianu
45ff8cf39d Merge release/2.4 into master 2016-02-26 11:00:00 +02:00
Ana Bozianu
c2117b22f3 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
8436efbf1f Use context refresh event to ensure handler is called 2016-02-25 12:02:13 +11:00
Roy Wetherall
e0b203207f 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
a54f1d0284 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
58ae9344c1 Merge release/2.4 into master 2016-02-22 16:16:38 +02:00
Ana Bozianu
dd38661ede 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
e3580af85d 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
7f6e6725c0 Merge release/V2.4 into master. 2016-02-18 11:10:10 +00:00
Ana Bozianu
0f8f199f82 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