Commit Graph

1592 Commits

Author SHA1 Message Date
Tuna Aksoy
896f01f1b8 RM-1994 (Classification hierarchy integration tests)
- Removed the contains methods as the test cases are already covered

+review RM-19

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101608 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-10 10:20:27 +00:00
Tuna Aksoy
9602bb0c88 Classification hierarchy integration tests.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101603 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-10 09:45:36 +00:00
Tuna Aksoy
11a515e666 RM-1842 (View users security clearance)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101590 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-09 18:14:48 +00:00
Roy Wetherall
200d7c7277 Add stub classified content model
* model I18n added
 * added Java contanstants via interface for convenience
 * includes a couple of renames for consistency
 * relates to RM-1947

+review RM-18



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101539 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-09 02:24:39 +00:00
Roy Wetherall
16d04e84b3 Reduce number of compilation warnings and re-format where nessesary.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101538 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-09 01:58:11 +00:00
Tom Page
2ae7a18fc9 RM-1947 Restrict the classification levels shown to a user.
Currently we don't check what classification level the user has, and
instead assume that they have the highest security clearance. The work
to assign a security clearance to a user will be in RM-2112.

+review RM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101413 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 14:55:58 +00:00
Tom Page
d7ab9b5480 Rename ExceptionUtils.intercept to expectedException.
+review RM-10

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101338 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 10:32:40 +00:00
Tom Page
a932b34621 RM-2075 Create test classification reasons resource.
Use the same path as the production resource, so that the when testing
the test resource is picked up in preference.

+review RM-16

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101336 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 10:26:02 +00:00
Tuna Aksoy
df9ab69ab8 RM-1827 ("Declare" actions become available for user only after re-login)
* Changes reverted

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101292 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 09:18:58 +00:00
Alexandru Balan
385fb32397 Merged BRANCHES/V2.3 to HEAD:
101283: RM-2092 - fixed the re-association when copying a record

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101284 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 07:19:20 +00:00
Alexandru Balan
6c2ec73ea5 RM-2092 - fixed the re-association when copying a record
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@101283 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 07:11:24 +00:00
Tuna Aksoy
9365daaafa 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@101281 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-07 20:07:52 +00:00
Tuna Aksoy
3395a70900 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@101279 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-07 19:48:57 +00:00
Tom Page
5ea9e93c51 Minor changes to WebScriptUtils.
I'm not sure which static import was being used previously, but since we
had an explicit reference to lang3 I went with that.

+review RM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101243 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-07 13:55:44 +00:00
Tom Page
b8e6ea3912 RM-2028 Create util method to validate classification fields.
Also change the freemarker script to use the built-in JSON escaping.

+review RM-14

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101242 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-07 13:55:42 +00:00
Tuna Aksoy
cfb69a4a04 Merged BRANCHES/V2.3 to RMHEAD:
101232: Merged BRANCHES/V2.2 to BRANCHES/V2.3:
        101230: RM-193 (Roles are displayed incorrectly in User Rights Report)
   101233: commit merge info

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101234 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-07 11:13:41 +00:00
Tuna Aksoy
83cbedac31 commit merge info
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@101233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-07 11:08:36 +00:00
Tuna Aksoy
a475460272 Merged BRANCHES/V2.2 to BRANCHES/V2.3:
101230: RM-193 (Roles are displayed incorrectly in User Rights Report)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@101232 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-07 11:06:58 +00:00
Tuna Aksoy
4f4bd07440 RM-193 (Roles are displayed incorrectly in User Rights Report)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@101230 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-07 10:16:15 +00:00
Tom Page
fb23d33db5 RM-2075 Integration test for classification reasons.
Currently just checks the bootstrapped config file has been loaded and
is exposed over the API.

+review RM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101228 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-07 09:35:10 +00:00
Roy Wetherall
bd2186e9dc Temp removal of unreliable tests from Bamboo build.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101223 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-07 00:12:55 +00:00
Tuna Aksoy
b9cebb788a 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@101192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-03 18:30:38 +00:00
Tom Page
0deb734625 RM-2028 Add new test file to test suite.
+review RM-14

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101116 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-02 11:08:24 +00:00
Tom Page
6dce11ce59 RM-2028 Test for get classification reasons API.
+review RM-14

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101108 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-02 10:02:58 +00:00
Roy Wetherall
ec3baee4c7 Upgrade Selenium dependaency to 2.45.0 and make minor improvements to unit test.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101089 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-02 05:11:01 +00:00
Tuna Aksoy
eeafedd88e RM-2028 Create a rest API to get classification reasons
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101049 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-01 13:30:18 +00:00
Tuna Aksoy
5bcfef5d8a Fix failing bamboo build and missing amp artefacts
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101044 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-01 12:30:12 +00:00
Tom Page
10e3036d05 RM-2028 Create a rest API to get classification reasons.
The API can be accessed through the following URI:
http://localhost:8080/alfresco/service/api/classification/reasons

Note that the private classificationService bean is currently being used
as there is an issue with the authentication when using the public bean.

Log error message contains:
Caused by: net.sf.acegisecurity.AccessDeniedException: Access is denied.
RM method security check was performed.
Failed on method:  getClassificationReasons()
; nested exception is net.sf.acegisecurity.AccessDeniedException: Access is denied.
	at org.alfresco.module.org_alfresco_module_rm.security.RMMethodSecurityInterceptor.beforeInvocation(RMMethodSecurityInterceptor.java:299)

+review RM @taksoy

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101042 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-01 12:27:01 +00:00
Tuna Aksoy
58cbb31951 set .idea, .iml and .eml to svn ignore
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101041 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-01 12:14:53 +00:00
Tuna Aksoy
859f6f1daa amp files were missing in the bamboo builds
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101040 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-01 12:03:38 +00:00
Tom Page
e0c15e68ff Extract the config file locations into the global properties file.
+review RM-12

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101024 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-01 09:18:00 +00:00
Tom Page
60db7465ea RM-2027 Admin user is always "admin", system user is always "system".
+review RM-9

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101018 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-01 07:35:11 +00:00
Tom Page
420cecd0c7 RM-2027 Use annotations to create mocks in unit tests.
+review RM-9

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-31 10:09:31 +00:00
Tom Page
c93dba7c42 RM-2027 Add option to specify user names in MockAuthenticationUtilHelper.
+review RM-9

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100775 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-31 08:15:35 +00:00
Alexandru Balan
51ff6a1851 Merged BRANCHES/V2.3 to HEAD:
100726: Merged BRANCHES/V2.2 to BRANCHES/V2.3:
      100725: RM-1586 : Add another search for the property in the case of legacy html encoded properties

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100730 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-30 15:36:14 +00:00
Tom Page
c0cf957490 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
Alexandru Balan
808ba031c1 Merged BRANCHES/V2.2 to BRANCHES/V2.3:
100725: RM-1586 : Add another search for the property in the case of legacy html encoded properties

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@100726 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-30 15:19:59 +00:00
Alexandru Balan
7bb27bbf7a RM-1586 : Add another search for the property in the case of legacy html encoded properties
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@100725 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-30 15:14:49 +00:00
Tom Page
f95eabd052 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
95262cfdc4 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
ad7ae82746 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
a734159cee 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
266baccb9d 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
720854e5f4 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
Jean-Pierre Huynh
3f11e1375c Correct RM 2.2.1 release tag.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/TAGS/V2.2.1@100309 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 11:51:18 +00:00
Jean-Pierre Huynh
7707171848 Created tag for RM 2.2.1 release.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/TAGS/V2.2.1@100302 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 11:45:12 +00:00
Jean-Pierre Huynh
a730ec3800 Wrong location for RM 2.2.1 release tag.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100300 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 11:44:10 +00:00
Jean-Pierre Huynh
03871bc687 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
928d9b3190 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
bb20d042cf 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