Commit Graph

1346 Commits

Author SHA1 Message Date
Tom Page
f76c89397d Specify the ClassificationServiceDAO bean class in the context file.
Hopefully this will fix the 2^9+2^6 test failures.

+review RM-12

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100728 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-30 15:23:15 +00:00
Tom Page
9d6960cccd Wire the ClassificationServiceDAO using Spring injection.
Also small change to lower visibility of ClassificationServiceDAO member
variables from public to private.

+review RM @nmcerlean @rwetherall

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100721 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-30 14:49:10 +00:00
Tom Page
aaf87ad0bf RM-2027 Make class logger static final.
Previously the logger wasn't final to allow it to be set for unit testing.
We're only testing it in the one test, so instead use a mock log4j appender
to check that the message is received.

+review RM-11

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100717 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-30 14:15:24 +00:00
Tom Page
614eb89e52 Rename Configuration to ClassificationServiceDAO.
Also formatting changes as per code review comments.

+review RM-5

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-30 09:13:32 +00:00
Tom Page
53fc89c3ae RM-2027 Unit testing for classification reason loading.
+review RM @nmcerlean

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100355 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 16:43:59 +00:00
Neil McErlean
bfed925fa1 Forgot to add previous new tests to the suite. Doing that now.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100312 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 12:16:59 +00:00
Neil McErlean
bd54d94886 Helper class for dealing with exceptions in test code and some test code to test it. All based on Java 8.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100311 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 12:14:56 +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
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
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
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
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
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
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
Gloria Broadbent
ce1a54172e 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
12f08a799b 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
1140796017 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
Roy Wetherall
32db2c3ab0 RM-1973: Can't add to hold
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@97949 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-25 01:31:54 +00:00
Roy Wetherall
e1015363a7 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.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@97948 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-25 00:25:33 +00:00
Roy Wetherall
82e316d5aa 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



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@97945 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-24 21:38:10 +00:00
Gloria Broadbent
01a48c2213 DUTCH: Updated files as per EN-RM-rev97654
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@97864 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-24 12:53:05 +00:00
Gloria Broadbent
7b0294ab23 JAPANESE: Updated files as per EN-RM-rev97654
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@97863 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-24 12:52:33 +00:00
Gloria Broadbent
c38034690b ITALIAN: Updated files as per EN-RM-rev97654
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@97862 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-24 12:52:05 +00:00
Gloria Broadbent
a1870a874f FRENCH: Updated files as per EN-RM-rev97654
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@97861 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-24 12:51:34 +00:00