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,513 Commits 330 Branches 2,178 Tags
9365daaafaadf4c6458261aa95423ccb7b567d18
Commit Graph

1365 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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