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,550 Commits 330 Branches 2,178 Tags
1f15eb7660905d8343d5c05393c23f794403de3b
Commit Graph

844 Commits

Author SHA1 Message Date
Neil McErlean
1f15eb7660 Initial implementations for RM-2112 and RM-2113. 
Added a securityClearance aspect to the classifiedContentModel.
   This can be applied to a user’s person node to give them clearance.
   TODO. Not clear how/if we can use this for groups of users.
Added a SecurityClearanceService which gets users’ security clearances.
Added a getDefaultClassificationLevel method to the ClassificationService.
  TODO This needs to be reviewed.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103042 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-29 09:37:16 +00:00
Tuna Aksoy
b786accb40 RM-2061 (Add classification properties to document details view) 
RM-2062 (Add classification properties to record details view)

+review RM-29

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@102759 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-27 13:45:05 +00:00
Tuna Aksoy
718b2eec44 RM-2193 (Cannot classify non electronic document) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@102702 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-26 20:02:30 +00:00
Tom Page
0d01f1c83f RM-2045 Check that content is not re-classified. 
Currently this is not supported, although it will be needed in the future.

Also take the opportunity to change the unit tests to use:
    when(x.y()).thenReturn(z));
rather than:
    doReturn(z).when(x).y();
This is because I noticed the javadoc for "doReturn" gives a good
explanation of when to use each (use the former whenever possible for
readability; use the latter if there's no choice).

+review RM-25

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@102231 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-21 08:06:31 +00:00
Tom Page
bf04115229 RM-2045 Fix references to "document" to refer to "content". 
We can use the same API to classify documents and records.

+review RM-25

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@102160 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-20 09:04:01 +00:00
Tom Page
a572fe0916 RM-2045 Add validation that the node is a content node. 
This is needed as the API method is specifically for content nodes. We
will deal with record nodes later, and possible folder nodes much later.

+review RM-25

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@102157 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-20 08:39:06 +00:00
Tuna Aksoy
f78917ea24 RM-2047 (Set classification repository action) 
* Unit test added

+review RM-28

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@102153 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-19 19:49:22 +00:00
Tuna Aksoy
641a5e77c0 RM-2045 (Java API to add a classification to a document) 
* Check the id's of classification reasons and level
 
+ review RM-25

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@102125 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-17 14:28:13 +00:00
Tuna Aksoy
4afa2f7dd1 RM-2047 (Set classification repository action) 
+review RM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@102123 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-17 14:08:53 +00:00
Tuna Aksoy
f1cefc629c RM-2045 (Java API to add a classification to a document) 
* Changed the code to save the id's of classification reasons and levels
 
+ review RM-25

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@102118 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-17 13:18:11 +00:00
Tom Page
5542fc7c81 RM-2045 Create Java API to classify a document. 
Create dedicated objects to handle queries against the list of configured
classification levels and reasons.

+review RM-25

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101986 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-16 10:07:07 +00:00
Tom Page
58859a13ac RM-2045 Update ClassificationService interface. 
This should allow Tuna to progress RM-2047.

+review RM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101932 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-15 14:13:47 +00:00
Tuna Aksoy
db4865e8f3 RM-2044 (Add "Classified" aspect) 
+review RM @rwetherall @tpage

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101929 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-15 14:01:09 +00:00
Tom Page
7d52c49b2b RM-1947 New constraint to avoid invalid classification levels. 
Create a service locator class to allow the non-Spring constraint to access
the Spring service.

+review RM-21

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-14 09:33:51 +00:00
Tuna Aksoy
f26b548d74 Removed warnings 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101611 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-10 10:41:43 +00:00
Tuna Aksoy
2cfcc0ac05 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
2cc8ad2843 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
bf91f5e1a1 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
e6121166fc 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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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