inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,759 Commits 325 Branches 2,188 Tags
feb9bc09c7d55c8906ebbc1f93e98ffcbe9e597c
Commit Graph

2759 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tatyana Valkevych
26ba242066 Merged V2.2.1.x (2.2.1.3) to V2.2 
114608: Merged DEV to V2.2.1.x
      114604: MNT-14900 : Alfresco doesn't work with Records Management
         - Fixed the circular reference problem from Spring config xml using NonBlockingLazyInitTargetSource


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@114900 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-21 12:27:06 +00:00
Tuna Aksoy
2b46d5043f RM-2702 (RM HEAD does not work with Alfresco 5.1.b-EA) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@114809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-20 15:54:56 +00:00
Tuna Aksoy
5553043b6e RM-2702 (RM HEAD does not work with Alfresco 5.1.b-EA) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@114791 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-20 14:01:30 +00:00
Alexandru Balmus
2fa3bf1a55 RM-2391 : The Audit Log GET requests have to verify first which user is logged in and to which data it has access. 
- Implemented final fix and added a unit test.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@114786 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-20 13:25:39 +00:00
Tatyana Valkevych
bb0fa6f8cd Updated version to 2.2.1.3 and dependency.share.po.version to 4.2.5-SNAPSHOT in pom.xml files 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@114687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-19 14:39:39 +00:00
Tuna Aksoy
6742e89e1a Removed warnings 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@114685 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-19 14:07:16 +00:00
Tuna Aksoy
98969f47cf Added .ant-targets-build.xml to svn:ignore list 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@114681 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-19 13:48:13 +00:00
Tuna Aksoy
523103653b Deleted .ant-targets-build.xml from the code base 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@114680 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-19 13:46:34 +00:00
Tuna Aksoy
597406765d Updated the svn:ignore list 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@114677 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-19 13:37:48 +00:00
Tuna Aksoy
00b205e9b6 Updated Alfresco dependency to 5.1.b-EA 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@114676 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-19 13:32:19 +00:00
Tuna Aksoy
699f82abcb RM-2669 (Spike: Investigate RM Enterprise approach) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@114662 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-19 10:41:28 +00:00
Tuna Aksoy
82265f9a04 RM-2669 (Spike: Investigate RM Enterprise approach) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@114661 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-19 10:37:22 +00:00
Tuna Aksoy
22af8a7422 RM-2669 (Spike: Investigate RM Enterprise approach) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@114660 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-19 10:36:41 +00:00
Alexandru Balmus
1e21cd4e6b Update version to 2.2.1.3 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@114609 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-16 14:26:34 +00:00
Alexandru Balmus
5effcfdec3 Merged DEV to V2.2.1.x 
114604: MNT-14900 : Alfresco doesn't work with Records Management
      - Fixed the circular reference problem from Spring config xml using NonBlockingLazyInitTargetSource

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@114608 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-16 14:26:00 +00:00
Alexandru Balmus
dbbe428c37 Reverse merged V2.2.1.x 
<<< Need to use a different approach. >>>
         Merged DEV to V2.2.1.x
            114241: MNT-14900 : Alfresco doesn't work with Records Management
               - Fixed problem with circular references during Spring dependency injection process

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@114605 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-16 14:14:03 +00:00
Tom Page
131eef36b1 RM-2585 Make CaveatSchemeService extend the RM base service. 
Also call through to getGroupById method where appropriate.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/caveatmarkdatatype@114452 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-15 13:35:59 +00:00
Alexandru Balmus
670ca476a4 Merged DEV to V2.2.1.x 
114241: MNT-14900 : Alfresco doesn't work with Records Management
      - Fixed problem with circular references during Spring dependency injection process

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@114437 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-15 13:18:14 +00:00
Neil McErlean
d6a5e3841b RM-2585. Super-basic CaveatSchemeService. 
This checkin is so simple that no test code is yet needed.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/caveatmarkdatatype@114424 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-15 10:41:24 +00:00
Tuna Aksoy
530a3b7889 RM-2669 (Spike: Investigate RM Enterprise approach) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/Enterprise/recordsmanagement/alfresco-rm-server-enterprise/trunk@114397 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-15 08:29:11 +00:00
Tom Page
58601c5f83 RM-2604 Fix incorrectly named resources. 
Also remove duplication of ids in test where this isn't relevant. Thanks
Oana for spotting this.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/caveatmarkdatatype@114361 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-14 15:47:31 +00:00
Tom Page
788a590361 Uncomment and fix a couple of classification tests. 
+review RM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/caveatmarkdatatype@114360 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-14 15:47:29 +00:00
Tom Page
e16f9ebdf8 RM-2586 Replace classification I18N properties with caveat ones. 
Need to check with Gloria that this is the right way to change the key.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/caveatmarkdatatype@114359 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-14 15:47:27 +00:00
Tom Page
c1fa9a7fc2 RM-2586 Refactor the classification loader to use the caveat config. 
Remove the old classification level configuration files.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/caveatmarkdatatype@114358 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-14 15:47:25 +00:00
Tom Page
a24c57aed8 RM-2586 Add CaveatMark as an optional member of ClassificationLevel. 
Currently caveats have no support for the "Unclassified" classification
level, which makes the code a lot more complicated.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/caveatmarkdatatype@114357 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-14 15:47:19 +00:00
Tom Page
66384de5c2 RM-2586 Add method on CaveatDAOInterface to get a single group. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/caveatmarkdatatype@114356 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-14 15:47:17 +00:00
Tom Page
e0d4480a59 RM-2604 Replace SMAP generics with ImmutableMap<String, CaveatGroup>. 
Sorry to anyone who was hoping to create other implementations of the SMAP
interface.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/caveatmarkdatatype@114320 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-14 09:34:21 +00:00
Neil McErlean
9fbb7924ce Trivial change to one line of javadoc. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/caveatmarkdatatype@114294 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-13 20:22:02 +00:00
Tom Page
ac0c84d838 RM-2604 Fun with generics and add missing @Test annotation. 
(Thanks Neil).

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/caveatmarkdatatype@114266 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-13 13:43:38 +00:00
Tom Page
9e93ad5f10 RM-2604 Rename caveat group types. 
Now we have HIERARCHICAL, USER_REQUIRES_ALL and USER_REQUIRES_ANY.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/caveatmarkdatatype@114265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-13 13:43:36 +00:00
Tom Page
56948b989c RM-2604 Change how caveat marks are stored in groups. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/caveatmarkdatatype@114264 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-13 13:43:35 +00:00
Tom Page
13df9ccdd7 RM-2604 Addressing code review comments. 
Add overrides for standard Object methods. Make entity fields final where
possible. Add new constructors to entities, and include defaults for display
label and description I18N keys. Also add validation of entity parameters.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/caveatmarkdatatype@114263 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-13 13:43:34 +00:00
Tom Page
ee30fadc79 RM-2604 Add an example of a cumulative security caveat. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/caveatmarkdatatype@114262 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-13 13:43:31 +00:00
Andreea Dragoi
c09a3731ee RM-2522 : Select "Download Zip" (rm-download-zip) on RM Transfer Target inside RM Transfer view throws 400 Bad Request: Node is not fileplan 
- used isFilePlan method from FilePlanService instead of old check

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@114258 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-13 13:32:34 +00:00
Tom Page
1e109021eb RM-2604 Bootstrap the CaveatDAO and create the Spring context file. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/caveatmarkdatatype@114175 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-12 14:52:21 +00:00
Tom Page
cb4823f9eb RM-2604 Unit tests for loading the caveat configuration JSON. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/caveatmarkdatatype@114111 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-12 10:35:22 +00:00
Tom Page
14d9e3a532 RM-2604 Change the group type enumeration after comparison with requirements. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/caveatmarkdatatype@114110 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-12 10:35:21 +00:00
Tom Page
a8ad030a6a RM-2604 Implementation of JSON-based caveat DAO. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/caveatmarkdatatype@114109 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-12 10:35:19 +00:00
Tom Page
5b4d7c7988 RM-2604 Move CaveatException back to the main source. 
This was moved by accident as it was hidden among the legacy classes.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/caveatmarkdatatype@114108 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-12 10:35:18 +00:00
Roy Wetherall
3299fa8c86 Move existing caveat code into compatibility area for later refactor and deprecation. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/caveatmarkdatatype@114090 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-12 01:00:49 +00:00
Tom Page
4938e307ea RM-2604 Create CaveatDAOInterface and caveat scheme objects. 
+review RM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/caveatmarkdatatype@114079 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-09 15:24:04 +00:00
Gloria Broadbent
e20467fea5 JAPANESE: Updated RM 3.0 files based on EN-RM-rev113669 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@113700 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-05 14:29:53 +00:00
Gloria Broadbent
6cf064af54 FRENCH: Updated RM 3.0 files based on EN-RM-rev113669 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@113698 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-05 14:27:46 +00:00
Gloria Broadbent
4141c91c19 GERMAN: Updated RM 3.0 files based on EN-RM-rev113669 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@113697 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-05 14:26:12 +00:00
Tuna Aksoy
f4655ad402 RM-2477 (The downgrade instructions are not required when only one of the Downgrade date or event is completed) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@113480 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-09-30 14:32:11 +00:00
Tom Page
378d897fb6 Revert "RM-2606 Classify the head of the version history." 
This reverts commit ffc29c05d4643780c9dcbb568eb0a89838009886.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@113431 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-09-30 10:27:58 +00:00
David Webster
4fe3b948c5 RM-2548: Admin's security clearance should not be editable. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@113335 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-09-29 10:05:44 +00:00
Neil McErlean
773f964620 Fixing findbugs errors: "Method checks the result of a new allocation" and "Overzealous casting". 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@113200 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-09-28 12:02:26 +00:00
Neil McErlean
1a71eafaf5 ServiceBaseImpl.instanceOfCache is a collection that only grows and never has elements removed. findbugs flags this as a 'scary' error therefore I'm changing it from a HashMap to a WeakHashMap. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@113199 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-09-28 11:58:55 +00:00
Neil McErlean
f554073a2a Fix 6 instances of 'scary' findbugs issue: "Method creates local variable-based synchronized collection " 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@113198 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-09-28 11:49:20 +00:00