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
5,254 Commits 325 Branches 2,188 Tags
ce60d3e89f9bf41ea45793f9ff9f0a9a6fd2903a
Commit Graph

5254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tuna Aksoy
8055a726ab 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
939ac857f1 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
8f526a4104 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
da0fbf84f4 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
8ada0bd9e2 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
71bc13dc98 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
d880d5219a 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
c61531a1bc 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
726e0fdc7b 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
b6fea0405f 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
e080f6e188 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
468c2fdcf4 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
9f1900f06c 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
29e74d6460 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
b1dc644ebd 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
57319d1134 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
184df4ccf3 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
94c313c3e7 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
82d8b6c9b9 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
df8ca7c009 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
3d14480ed1 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
d320c22c32 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
ae286c7ff0 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
f8fb90f85a 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
f0d16a33e9 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
5ce532a4e8 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
99e3e2c3d8 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
2929528213 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
3967339eaf 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
72cc82ee87 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
48e056af67 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
701f39d4d5 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
205ffc8073 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
67d4e29eb7 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
f2cf0f40ba 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
9b1cc2636d 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
a2b6bffbbd 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
a68492eccc 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
0f918b3e50 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
ce3a3a1f6d 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
d9fdc81a33 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
0b01a6c9ef 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
bb4dced286 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
bb9e6a473b 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
Tom Page
9d7f3c2b36 RM-2606 Classify the head of the version history. 
As the version store does not allow editing properties or aspects, we
instead delete the head and recreate it using the classified version of the
file.

Note that classifying some content does not classify all versions, only the
current one. This currently causes other aspects to be added to the history
node, I'm not sure this is the right behaviour, but it felt like an edge
case...

+review RM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@113116 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-09-25 15:00:06 +00:00
Tom Page
105529aa37 Removing unnecessary apostrophe whose escaping was causing issues for translation. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@112962 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-09-24 10:48:24 +00:00
Tom Page
e19ee446de Fix typo identified during translation. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@112961 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-09-24 10:48:23 +00:00
Tom Page
6c128520ee Merged BRANCHES/V2.3 to HEAD: 
112606: Merged BRANCHES/V2.2 to BRANCHES/V2.3:
        97445: (RECORD ONLY) RM-1932 Changed the notification frequency based on 2.3 code changes
   112629: Merged BRANCHES/V2.2 to BRANCHES/V2.3:
        99084: (RECORD ONLY) Merged V2.3 to V2.2 :
             93334: RM-1822 (Non-system-admin user not allowed to read inheritable permissions)
        99085: (RECORD ONLY) Merged V2.3 to V2.2:
             92881: RM-1799 (Root category is not displayed for the non-rm-admin user who created it)
        99086: (RECORD ONLY) Merged V2.3 to V2.2:
             96580: RM-1904 (SubCategory moved to root have inheritance on)
   112663: Merged BRANCHES/V2.2 to BRANCHES/V2.3:
        99087: Upgrade Alfresco version to 4.2.4.6
        99088: RM-2026: Unable to complete historical records when mandatory meta-data missing
        99089: Merged HEAD to V2.2:
             89735: RM-1677- No items error for RM Admin if record was declared from moderated/private site
   112665: Fix merge - delete duplicate method.
   112694: Merged BRANCHES/V2.2 to BRANCHES/V2.3:
        98839: GERMAN: Updated bundle for RM 2.2.1 based on EN-rev98763
        98840: SPANISH: Updated bundle for RM 2.2.1 based on EN-rev98763
        98841: FRENCH: Updated bundle for RM 2.2.1 based on EN-rev98763
        98842: ITALIAN: Updated bundle for RM 2.2.1 based on EN-rev98763
        98843: JAPANESE: Updated bundle for RM 2.2.1 based on EN-rev98763
        98844: DUTCH: Updated bundle for RM 2.2.1 based on EN-rev98763
        98845: RUSSIAN: Updated bundle for RM 2.2.1 based on EN-rev98763
        98846: BRAZILIAN PORTUGUESE: Updated bundle for RM 2.2.1 based on EN-rev98763
        98847: SIMPLIFIED CHINESE: Updated bundle for RM 2.2.1 based on EN-rev98763
        98848: BRAZILIAN PORTUGUESE: Updated file and remove of wrongly named file for RM 2.2.1 based on EN-rev98763
        98849: ALL LANG: remove file that does not need to be localised
   112700: Merged BRANCHES/V2.2 to BRANCHES/V2.3:
        99374: (RECORD ONLY) Merged V2.3 to V2.1.1:
             96823: RM-1903 (Can't manage permissions without "Manage Access Controls" capability)
             97435: RM-1903: Can't manage permissions without "Manage Access Controls" capability
             97436: RM-1903 - updates to unit tests
             97595: RM-1903 (Can't manage permissions without "Manage Access Controls" capability)
        111023: RM-2566 : [RM] Incorrect message appears on the "Requested information" text box
             - replaced <constraint type="Mandatory"> with mandatory="true"
        112550: Merged BRANCHES/V2.1 to BRANCHES/V2.2:
             112549: Update module version to 2.1.2 after merge of hot fix branch.
        112668: Merged BRANCHES/V2.1 to BRANCHES/V2.2:
             70625: (RECORD ONLY) Added JIRA-Ticket Info
             71381: (RECORD ONLY) Fixed RM 2.1 to get it working with Alfresco 4.2.2
   112951: Merged BRANCHES/V2.2 to BRANCHES/V2.3:
        112947: RM-2617 Remove duplicate token from end of localised strings.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@112953 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-09-24 09:35:52 +00:00
Ana Bozianu
273e625a9c Merged V2.3 to HEAD 
112691: MNT-14728 : CLONE for HF - RM: Not all files are found when searching for a keyword using advanced search.
      - partial workaround (the elements can be scrolled down but the total result number is still wrong)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@112944 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-09-24 08:07:39 +00:00