inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,695 Commits 330 Branches 2,178 Tags
c29b51f179f1b0cf7720c77b76c30b47e84dbae3
Commit Graph

1695 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Pierre Huynh
07309c3c98 Created tag for RM 2.2.1 release 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100299 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-27 11:42:09 +00:00
Tom Page
a0635a4344 RM-2027 Refactor mock authentication code. 
Create a new class to handle creation of the mock authentication util.
It would be nice to always use it as a factory to create a mock util, but
unfortunately this causes many of the existing unit tests to fail. Something
clever is happening in org.mockito.MockitoAnnotations.initMocks(Object) that
I currently don't understand.

+review RM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100292 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-27 11:30:20 +00:00
Neil McErlean
8ba7667e65 Work on RM-2027. Addition of the Java API code to retrieve classification reasons and some of the test code associated with that. WIP. Test code not complete. +review RM 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-27 09:27:20 +00:00
Neil McErlean
de4cf99217 Refactoring test code to separate it from BaseUnitTest. RM-2027. +review RM 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100172 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-26 15:07:28 +00:00
Tom Page
cafe9cfeda RM-2074 Fix comment and imports. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100140 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-26 11:04:06 +00:00
Tom Page
f4997f59f7 RM-2074 Bootstrap initial classification reasons. 
+review RM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100134 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-26 10:43:48 +00:00
Neil McErlean
523f5dca4f Second and final tranche of post-code-review changes for RM-1945 & RM-1946. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100094 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-25 19:39:09 +00:00
Tom Page
073b02c89b Add explicit mention that the mocked methods are generics using Objects. 
These five lines were causing errors for me using Eclipse configured to
the Sun jdk1.8. Apparently there was no issue in IntelliJ and everything
worked fine from the command line before and after.

+review RM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100076 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-25 15:31:08 +00:00
Neil McErlean
3eea37206e First updates following code review on RM-1945 & RM-1946. Thanks Roy & Tom! 
Renamed a public service method to getClassificationLevels.
Removed a redundant test method.
Code tidying.
Various internal renames to help readability.
Slight javadoc improvements.
Also some trivial changes like fixing typos and copyright years etc.
Removing warnings from within AuthenticationUtil blocks allows IntelliJ to fold them to Java 8 closure format. (fistpump).  


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100020 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-24 21:15:22 +00:00
Neil McErlean
e5c337f3d6 RM-1945 & RM-1946. Honestly! This stuff works on my machine! Slight change to pom definition of unit-test resource dir. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100019 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-24 20:22:52 +00:00
Neil McErlean
540ef1f1e0 More tidyup following RM-1945 & RM-1946. The maven-based build did not define a test-resources directory for unit-test code. Now it does. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100018 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-24 20:19:33 +00:00
Neil McErlean
52c9c95980 Added unit tests to test suite for RM-1945 and RM-1946. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@99995 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-24 17:06:34 +00:00
Neil McErlean
c8d6a69d4c Build fix. Removed the init-method declaration (related to RM-1945 & RM-1946). 
I actually thought I'd done this in the previous commit, but I hadn't. (blush).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@99974 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-24 13:42:58 +00:00
Neil McErlean
b2a8ec792f Tidyup as part of RM-1945 and RM-1946. Attempt to fix the failing build. 
Although the Alfresco server starts fine on my machine, there is a timing/dependency issue which means that on Bamboo, ClassificationServiceImpl.initConfiguredClassificationLevels attempts to use the Alfresco DB before it is fully ready.
This check-in changes the service startup so that instead of using a spring init-method, it uses a LifecycleBean to run the initialisation after the server has fully started up.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@99962 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-24 11:32:44 +00:00
David Webster
4b7c864532 Require 5.0.1 and newer Aikau 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/dwebster-relationship-refactor@99944 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-24 09:28:10 +00:00
Neil McErlean
803b792883 A preliminary and speculative fix to the RM startup sequencing issues caused by the addition of the ClassificationService (as part of RM-1945, RM-1946). 
I've moved the declaration of the service spring bean further down the list - notably beyond the RM patches.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@99936 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-23 23:06:46 +00:00
Neil McErlean
2de84b9b21 Initial creation of ClassificationService, as part of RM-1945 and RM-1946. 
This check-in adds the basic ClassificationService API, its initial implementation, ClassificationServiceImpl, along with some basic support types such as ClassificationServiceException (for service-specific exceptions) and Configuration.
It also adds unit tests ClassificationServiceImplUnitTest and ConfigurationUnitTest.

The ClassificationService begins our support for ‘Classified Records’, whereby Alfresco content can be given a ClassificationLevel and thereafter will only be accessible to users with the appropriate security clearance.

The vanilla service includes a default set, rm-classification-levels.json (Top Secret etc) which links through to the i18n’d display data via rm-classification.properties in the usual way.

The service is defined in its own spring context file, rm-classified-records-context.xml, as it is distinct from the file plan and should be applicable to content outside that file plan.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@99932 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-23 18:22:26 +00:00
Tom Page
80bb3323a0 Update rm-server build.xml to create target directory. 
If the target directory already exists then the step is passed over.

Also avoid downloading transitive dependencies when getting solr4-config.zip,
as this caused issues on my machine, and the dependencies are not necessary
anyway.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@99837 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-20 15:52:00 +00:00
David Webster
5fdf284407 Creating dev branch until HEAD can be switched to 5.0.1. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/dwebster-relationship-refactor@99836 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-20 15:32:34 +00:00
Tuna Aksoy
793107f6ae Aikau dependency changes were not reflected in the RM project 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@99531 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-16 21:07:08 +00:00
Tuna Aksoy
3da7a6b9b3 Extracted the property for minification in to the build.properties file 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@99525 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-16 16:29:24 +00:00
Tuna Aksoy
4a3f5baf85 Minification step has been extracted to a separate profile 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@99523 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-16 16:15:07 +00:00
Roy Wetherall
f85c2be09b Merged V2.3 to HEAD: 
99472: Merged V2.2 to V2.3:
        99471: RM-2058: RM Manager can't access Users and Groups (after upgarde)
   99473: Fix merge error (RM-2058)



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@99474 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-16 01:26:19 +00:00
Roy Wetherall
24362e6b43 Fix merge error (RM-2058) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@99473 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-16 00:39:30 +00:00
Roy Wetherall
4fc222e655 Merged V2.2 to V2.3: 
99471: RM-2058: RM Manager can't access Users and Groups (after upgarde)



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@99472 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-16 00:17:26 +00:00
Roy Wetherall
c03b3eb232 RM-2058: RM Manager can't access Users and Groups (after upgarde) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99471 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-15 23:48:58 +00:00
Tuna Aksoy
24791c832a RM-2019 (Testing maven SDK evaluation) 
* Fixed incremental build
   * Fixed dependency inclusion

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@99375 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-12 23:19:50 +00:00
Roy Wetherall
e9471b310f 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)



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99374 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-12 23:14:33 +00:00
Neil McErlean
2829d1f468 RM-1888 Switching the main pom file to use Java 7 for /main code and Java 8 for /test code. 
This will require a change in the Bamboo build plan (to use a 1.8 JDK)
and will require developers to set their JAVA_HOME to a 1.8 JDK too.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@99356 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-12 14:34:11 +00:00
Tuna Aksoy
1a977aa1dc RM-2019 (Testing maven SDK evaluation) 
* Fixed MySQL issues

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@99236 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-11 11:41:34 +00:00
Tuna Aksoy
383fea40c4 RM-2019 (Testing maven SDK evaluation) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@99123 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-10 13:25:48 +00:00
Roy Wetherall
b605635eb6 Merged HEAD to V2.2: 
89735: RM-1677- No items error for RM Admin if record was declared from moderated/private site

* fixes RM-2018



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99089 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-10 04:32:04 +00:00
Roy Wetherall
ef7c4d6761 RM-2026: Unable to complete historical records when mandatory meta-data missing 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99088 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-10 03:10:49 +00:00
Roy Wetherall
f5e632899a Upgrade Alfresco version to 4.2.4.6 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99087 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-10 03:09:44 +00:00
Roy Wetherall
29e366cfab Merged V2.3 to V2.2: 
96580: RM-1904 (SubCategory moved to root have inheritance on)



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99086 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-09 21:57:32 +00:00
Roy Wetherall
c753763291 Merged V2.3 to V2.2: 
92881: RM-1799 (Root category is not displayed for the non-rm-admin user who created it)



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99085 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-09 21:53:53 +00:00
Roy Wetherall
51b24c7f54 Merged V2.3 to V2.2 : 
93334: RM-1822 (Non-system-admin user not allowed to read inheritable permissions)



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99084 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-09 21:50:25 +00:00
Tuna Aksoy
27f748a946 Removed warning 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@99004 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-07 21:36:38 +00:00
Tatiana Kalinovskaya
2d71bc2275 RM-1727 (Error on Folder/record details page when user have no permissions on parent category) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@98884 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-06 14:27:45 +00:00
Gloria Broadbent
3ca79c1e33 RUSSIAN: Updated bundle for RM 2.2.1 based on EN-rev98763 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@98845 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-06 10:53:09 +00:00
Gloria Broadbent
cf9568214b SPANISH: Updated bundle for RM 2.2.1 based on EN-rev98763 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@98840 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-06 10:49:48 +00:00
Tuna Aksoy
91ed65df5c Added transfer test suite 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@98500 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-03 20:11:59 +00:00
Tuna Aksoy
c6607e16c5 RM-1827 ("Declare" actions become available for user only after re-login) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@98379 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-02 21:58:14 +00:00
Tuna Aksoy
5f4ab82c22 Merged BRANCHES/V2.3 to HEAD: 
98190: RM-1980 (Can't delete version record if it is the last version of the document)
   98191: RM-1981 (Cant reject the record that has any version records)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@98215 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-02-27 11:05:33 +00:00
Tuna Aksoy
c182bbafd0 RM-1981 (Cant reject the record that has any version records) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@98191 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-02-26 21:13:55 +00:00
Tuna Aksoy
f3e0d2d2d1 RM-1980 (Can't delete version record if it is the last version of the document) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@98190 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-02-26 21:10:51 +00:00
Tuna Aksoy
46a3ebbe87 Merged BRANCHES/V2.3 to HEAD: 
98004: NORWEGIAN (Bokmal): Updated files as per EN-RM-rev97654
   98005: RUSSIAN: Updated files as per EN-RM-rev97654
   98006: BRAZILIAN PORTUGUESE: Updated files as per EN-RM-rev97654
   98007: SIMPLIFIED CHINESE: Updated files as per EN-RM-rev97654

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@98023 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-02-25 13:53:33 +00:00
Gloria Broadbent
2c371d9eb1 SIMPLIFIED CHINESE: Updated files as per EN-RM-rev97654 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@98007 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-02-25 12:57:07 +00:00
Gloria Broadbent
e77ddf81eb BRAZILIAN PORTUGUESE: Updated files as per EN-RM-rev97654 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@98006 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-02-25 12:55:33 +00:00
Gloria Broadbent
f14313efdb RUSSIAN: Updated files as per EN-RM-rev97654 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@98005 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-02-25 12:54:50 +00:00