Commit Graph

276 Commits

Author SHA1 Message Date
tiagos
687c042980 Merge remote-tracking branch 'origin/release/V3.2.0.x' into HEAD 2020-09-17 19:40:25 +01:00
tiagos
c4e8addf5d [MNT-21818] Created RMContainerCacheManager to isolate the new cache. Updated BaseRMTestCase and FilePlanService interface and implementation according to the new manager 2020-09-15 16:23:34 +01:00
tiagos
877eb50189 [MNT-21818] Added onCreateNode and onAddAspect policies 2020-09-15 03:51:06 +01:00
tiagos
3148372e04 [MNT-21818] BehaviourDrivenTest after method 2020-09-14 23:15:59 +01:00
tiagos
eb79016d90 [MNT-21818] Added behavior to update cache. Changed clear method. 2020-09-14 22:00:02 +01:00
tiagos
f25c804a54 [MNT-21818] Perform cache cleaning after each test is run 2020-09-11 01:39:29 +01:00
Sara Aspery
6c57774ca7 Update license headers 2020-02-18 11:10:36 +02:00
Sara Aspery
2933ce1e6c Merge branch 'release/V3.1' into release/V3.2 2020-02-18 11:07:45 +02:00
Roxana Lucanu
d7b0c08916 Merge branch 'release/V3.1' into merge-3.2/RM-7065_RetentionScheduleInheritance 2020-01-28 15:18:35 +02:00
Roxana Lucanu
6a65308383 Merge branch 'release/V3.0' into merge-3.1/RM-7065_RetentionScheduleInheritance 2020-01-28 09:50:28 +02:00
Roxana Lucanu
2ddd48d23d RM-7065 Merge branch 'release/V2.7' into merge-3.0/RM-7065_RetentionScheduleInheritance 2020-01-27 17:18:24 +02:00
Roxana Lucanu
5a645d39ed RM-7065 merge to v2.7 2020-01-27 11:12:48 +02:00
Roxana Lucanu
aaf18955be Revert "Merge branch 'merge-2.7/RM-7065_MNT-20822' into 'release/V2.7'"
This reverts merge request !1353
2020-01-27 08:43:09 +00:00
Roxana Lucanu
7b6db44df4 Merge branch 'release/v2.6' into merge-2.7/RM-7065_MNT-20822 2020-01-20 12:44:41 +02:00
Roxana Lucanu
490051aa21 Merge branch 'feature-2.5/RM-7065_RetentionScheduleInheritanceRecordLevel' into 'release/V2.5'
RM-7065 Add write transaction in a read only one for creating a node

See merge request records-management/records-management!1344
2020-01-14 19:02:48 +02:00
Sara Aspery
f90586ce32 Update license headers 2020-01-02 20:19:58 +00:00
Sara Aspery
16b6678fd3 Merge branch 'release/V3.1' into release/V3.2 2020-01-02 20:15:28 +00:00
Sara Aspery
fb014ba5dc Merge branch 'release/V3.0' into release/V3.1 2020-01-02 18:21:48 +00:00
Sara Aspery
304180f49e Merge branch 'release/V2.7' into release/V3.0
# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/apiTesting/SearchClassifiedContent.java
#	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/job/AutomaticDispositionTest.java
#	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RMCaveatConfigServiceImplTest.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/util/SecurityMarkChecker.java
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/DocumentSearchClassificationEnforcementTest.java
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/RecordSearchClassificationEnforcementTest.java
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/SavedSearchClassificationEnforcementTest.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/util/SecurityMarkCheckerUnitTest.java
2020-01-02 16:15:49 +00:00
Sara Aspery
5849812683 Update license headers 2020-01-02 15:05:02 +00:00
Sara Aspery
1f7a81fd45 Merge branch 'release/V2.6' into release/V2.7
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/AbstractSecureItem.java
2020-01-02 14:19:01 +00:00
Sara Aspery
8ae4ef6290 Update license headers 2020-01-02 13:57:59 +00:00
Roxana Lucanu
3c13cba8b5 Merge branch 'release/V3.1' into merge-3.2/RM-7060_FixSearchAspect 2019-12-10 09:09:56 +02:00
Roxana Lucanu
7d4dc81cb3 Merge branch 'release/V3.0' into merge-3.1/RM-7060_FixSearchAspect 2019-12-09 14:39:06 +02:00
Roxana Lucanu
d67218cbb1 Merge branch 'release/V2.7' into merge-3.0/RM-7060_FixSearchAspect 2019-12-09 10:49:30 +02:00
Roxana Lucanu
26cd72a416 Merge branch 'release/V2.6' into merge-2.7/RM-7060_FixSearchAspect 2019-12-04 15:44:29 +02:00
Roxana Lucanu
2afd579818 Merge branch 'release/V2.5' into merge-2.6/RM-7060_FixSearchAspect 2019-12-03 11:58:42 +02:00
Roxana Lucanu
23300d09cd RM-7060 Fix integration tests 2019-11-27 11:28:32 +02:00
cagache
e220aeb3c5 Replace exception messages in tests 2019-10-11 09:32:58 +03:00
cagache
045f19f8d9 Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/MNT-20740_BinDuplicationHotFix
# Conflicts:
#	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/util/ContentBinDuplicationUtilityUnitTest.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/content/ContentDestructionComponentUnitTest.java
2019-09-03 10:10:18 +03:00
Roy Wetherall
e282c0584e Fix issue with inaccurate results returning from content URL query
* added integration test for MNT scenarios
* checked for nodeId's that don't exist in query results
* changed DAO method to return set of node references rather tha nodeId strings
* turned off logging by default
2019-08-29 12:28:04 +10:00
Roy Wetherall
4518cd8615 Add logging to rm query DAO implementation 2019-08-29 09:50:57 +10:00
Ross Gale
b84870aa4f Merge branch 'feature/RM-6873_RemoveActiveContentFromHold' into 'master'
RM-6873 adding code to allow for the removal of active content from a hold

See merge request records-management/records-management!1216
2019-08-21 08:44:56 +01:00
Ross Gale
e9319efcf0 RM-6873 adding code review changes 2019-08-20 13:58:26 +01:00
Ross Gale
cd10d7eb7e RM-6873 adding code review changes 2019-08-20 13:57:42 +01:00
Ross Gale
b14b52dd92 RM-6873 adding code review changes 2019-08-20 13:56:14 +01:00
cagache
b9039afde2 RM-6926 Don't trigger onUpdateProperties policy when a frozen node is added to another hold 2019-08-20 14:56:46 +03:00
Ross Gale
23b762c661 Merge branch 'feature/RM-6904_PreventUpdateHeldActiveContent' into feature/RM-6873_RemoveActiveContentFromHold 2019-08-19 15:47:32 +01:00
cagache
ceb4768e5a Check exception messages 2019-08-19 17:12:58 +03:00
cagache
a080939d04 Throw PermissionDeniedException instead of AccessDeniedException and internationalized the messages. 2019-08-19 15:02:40 +03:00
cagache
16b2e0203d RM-6906 Add integration tests for prevent update of held content. Added fix to not trigger onUpdateProperties policy when removing the frozen aspect. 2019-08-16 16:10:09 +03:00
Ross Gale
25fc9aaf2c RM-6873 sonar update 2019-08-14 13:40:39 +01:00
Ross Gale
8aef468927 RM-6873 code review changes 2019-08-14 11:20:18 +01:00
Ross Gale
7bc485ebac RM-6873 adding code to allow for the removal of active content from a hold 2019-08-09 10:06:30 +01:00
cagache
71b50078cc code review comments 2019-08-06 13:45:53 +03:00
cagache
0a1962d0b7 code review comments 2019-08-02 17:31:02 +03:00
cagache
970330b2c5 Removed printed exception 2019-08-02 15:38:54 +03:00
cagache
f62235bd01 code review comments 2019-08-01 16:02:55 +03:00
cagache
3d7b5df3c9 Added IT and unit tests for add file to hold 2019-07-25 17:51:17 +03:00
cagache
3cc0f925ba Add IT to check that active content can be added to a hold by admin user 2019-07-25 11:07:36 +03:00