Commit Graph

1592 Commits

Author SHA1 Message Date
Neil McErlean
22ead45f3f 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
40bfbb7cd4 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
d2ce0009d9 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
5ae80ab2b1 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
0d4ed55675 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
0cfc1a98bf 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
ff4fb3b7d0 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
43ada602f5 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
9189987e91 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
34ac9e0cc7 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
5451568517 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
a464c9ec8a 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
bcf5516259 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
aee333172a 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
2c6b254012 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
f3ac7e88d8 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
c5b73f9f70 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
d125fbeafc 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
45db660e13 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
a6e1a890ea 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
cac665797f 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
860e07b25a 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
0161f18ec6 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
433e949248 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
40eb638711 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
f733389709 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
dbb98e44b3 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
5d61d8c107 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
4978949842 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
79e31a391a 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
e5a8426a0f 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
62d442060d 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
1931466253 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
769ad9ad76 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
703441751f 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
2cb3dbb7b5 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
541880b226 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
db6cfb18da 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
4fa41e39dc 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
4ac32d51a6 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
737926abd6 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
db1ec1fae2 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
f212d67b58 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
faa1bc63fd 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
199bac798e 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
97cbbf5aaa 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
64278f7571 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
Gloria Broadbent
2e800af608 NORWEGIAN (Bokmal): Updated files as per EN-RM-rev97654
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@98004 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-25 12:54:19 +00:00
Tuna Aksoy
a06e943157 Merged BRANCHES/V2.3 to HEAD:
97717: RM-1651 (Capabilities for Copy to action)
   97718: RM-1956 (Create record capability allows user to edit metadata and copy category/folder /record)
   97786: RM-1972: Methods with invalid policy are granted access
       * invalid policy defintions now throw exception .. previously they just granted!
       * invalid capability definitions now throw exception .. previously they abstained with no message
       * reference to RM.Write removed and replaced with RM.Create or more appropriate permission check
       * adjustments to hold capabilities since they wheren't being exercised as we thought
       * ManageAccessRights no longer checks for frozen .. you should be able to manage the permissions of an object if it's frozen and you have the capability
       * Unit tests for new code and adjustments
       * Tweaks to existing integration tests where required
   97788: Attempt to fix failing Unit Tests that are passing locally.
   97789: Missed update .. fix build.
   97851: i18n changes
   97858: GERMAN: Updated files as per EN-RM-rev97654
   97860: SPANISH: Updated files as per EN-RM-rev97654
   97861: FRENCH: Updated files as per EN-RM-rev97654
   97862: ITALIAN: Updated files as per EN-RM-rev97654
   97863: JAPANESE: Updated files as per EN-RM-rev97654
   97864: DUTCH: Updated files as per EN-RM-rev97654
   97945: RM-1956: Create record capability allows user to edit metadata and copy category/folder /record
       * fixes issue relating to filing records with only CreateRecord capability
   97948: Prevent incompatiable disposition schedules from being linked together
       * the unpredicatable behaviour was caused by this incompatibility and the resulting uncertaintity over which level of dispostion would 'win'
       * RM-1963: It is not possible to cut off record scheduled for cut off if it's linked to a folder with disposition schedule with cut off step set on folder.
       * RM-1962: The disposition schedule steps are not working as expected on a record linked to a folder with disposition schedule on it's own.
   97949: RM-1973: Can't add to hold
   97950: RM-1959: User can add/remove relationship to/from record he has read-only permissions for

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@97988 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-25 11:35:00 +00:00
Roy Wetherall
0834d4961c RM-1959: User can add/remove relationship to/from record he has read-only permissions for
* integration tests
 * small fix to service implementation



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@97950 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-25 04:17:54 +00:00