inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,622 Commits 335 Branches 2,191 Tags
f7e69629bb30f15ca8b17d598775e1ee2faaedcc
Commit Graph

5622 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Page
27a0affb19 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
62d4ef1f71 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
23d426c963 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
9b0ad4aeca 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
e091c3bb81 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
727fe84e22 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
0c59fe8c8e 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
61f2545ea6 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
c18089a3f0 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
e4d9b538fb 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
d2b1949dad 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
9151884349 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
8b62190595 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
8403b07d42 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
37a950d211 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
8b5b5db788 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
0f7bac797a 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
1449f2163b 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
993faa1b01 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
cbc45dbb36 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
60bf456fab 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
500c5d5174 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
0a23666cca 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
c0dd5503e7 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
f3cb6506bc 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
d0ca266dd8 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
1ff6385d64 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
aa6c4aff42 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
3702cc9e66 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
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
Alexandru Balan
af1329f2a5 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
c77dc45437 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
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
Jean-Pierre Huynh
905594baf1 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
9f29970973 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
14515ccf49 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
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