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
Neil McErlean
48702f9045 Additional checkin related to RM-2291. Change the unit test so that it validates only the levels configured by the user (in .json file) and excludes the built-in special case of Unclassified. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@106141 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-15 13:24:16 +00:00
Neil McErlean
60e9d56536 Implementation of new tests as part of RM-2241. 
Test to ensure the Unclassified abbreviation ('U') is rejected when duplicated by end user configuration.
Test to ensure any duplicate abbreviations are rejected.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@106134 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-15 12:04:27 +00:00
Neil McErlean
454e8d9669 Slight change following review comments. Doesn't affect test execution. 
--This mine, and those below, will be ignored--

M    ClassificationServiceBootstrapUnitTest.java


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@106120 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-15 09:27:43 +00:00
Tuna Aksoy
e1a8997524 RM-2130 (Check classification after method execution, filtering results where appropriate) 
+review RM-94

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/ENFORCE@106104 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-14 22:32:59 +00:00
Tuna Aksoy
d34aafea84 RM-2130 (Check classification after method execution, filtering results where appropriate) 
+review RM-94

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/ENFORCE@106103 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-14 21:05:58 +00:00
Tuna Aksoy
3fd9a59e14 RM-2280 (Move the code for checking if the content is classified to the service layer) 
* moved the check to content classification service
   
+review RM-87

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@106090 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-12 20:39:33 +00:00
Tom Page
417164c7cb RM-2217 Allow null as a filter value. 
Also add a few unit tests for the file.

+review RM-96

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@106034 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-12 13:19:08 +00:00
Tuna Aksoy
55f79a339c RM-2260 (Users with read&file permissions on content can not classify it if they are not the owners) 
+review RM @rwetherall

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@106030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-12 12:57:09 +00:00
Tom Page
680eb43441 RM-2217 Filtering with special characters - fix backslash. 
+review RM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@106011 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-12 10:09:21 +00:00
Tuna Aksoy
cc8fdb71b1 RM-2130 (Check classification after method execution, filtering results where appropriate) 
* Initial (early) commit to get feedback from the review
 * The "check" method will be changed later

+review RM @rwetherall

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/ENFORCE@105923 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-11 09:37:24 +00:00
Neil McErlean
073f64f8ba RM-2235. Changed Unclassified to 'U', which is the ID and abbreviation for unclassified. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@105782 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-09 09:21:39 +00:00
Tuna Aksoy
9c2d1c0632 RM-2280 (Move the code for checking if the content is classified to the service layer) 
* Added integration tests
   
+review RM-87

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@105748 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-08 13:53:44 +00:00
David Webster
0f9e721af1 Clean up unnecessary translation 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@105742 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-08 12:54:59 +00:00
David Webster
75901a2903 RM-2219: We don't need to translate springloaded.properties 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@105738 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-08 11:29:11 +00:00
Tuna Aksoy
7fbf213c78 RM-2280 (Move the code for checking if the content is classified to the service layer) 
+review RM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@105735 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-08 11:03:19 +00:00
Neil McErlean
35be98e133 Slight refactor of test code for improved readability following review. Part of RM-2235. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@105718 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-08 09:30:42 +00:00
Neil McErlean
d341e3fdc5 Initial implementation of RM-2238, RM-2288, RM-2289 & RM-2290. Classification Abbreviations and tests. 
In fact, this is pretty much done. Still to do: Unclassified Abbreviation.

New class ClassificationLevelValidation which contains the various validation checks for level abbreviations. Unit tests for same. This new class is used by ClassificationServiceBootstrap.
Added a new exception type just so that we have somewhere to store any illegal characters in a level abbreviation.
Had to change the classification level IDs to “TS”, “S” & “C” as “Confidential” has a length > 10. I’d been thinking of doing this is a separate commit but the additional validation requires that we do it now.
Minor fallout in test code due to ID changes.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@105641 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-05 15:58:10 +00:00
Tuna Aksoy
edaad604fa In the user security clearance page if users cannot be found an error message should not be displayed. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@105631 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-05 14:28:04 +00:00
David Webster
ab9a0e7cac WIP: Make it easier for whole team to validate/format JS code. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@105622 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-05 13:48:00 +00:00
Tuna Aksoy
35db56b736 RM-2260 (Users with read&file permissions on content can not classify it if they are not the owners) 
* Fixed failing integration test

+review RM-83

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@105567 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-05 09:31:43 +00:00
Tuna Aksoy
3428ce40e6 RM-2129 (Check classification before method execution) 
+review RM-69

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/ENFORCE@105565 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-05 08:51:17 +00:00
Tuna Aksoy
d9dc7c7e52 RM-2260 (Users with read&file permissions on content can not classify it if they are not the owners) 
+review RM @rwetherall

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@105541 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-04 15:41:00 +00:00
Neil McErlean
149bcaf2d5 Fix for slight coding issue - note there are no recorded problems from this. 
Replaced String == with String.equals.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@105496 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-03 20:23:04 +00:00
Tuna Aksoy
ce10e38225 RM-2247 (Add classification banner to document details) 
RM-2248 (Add classification banner to record details)

+review RM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@105441 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-03 09:46:09 +00:00
Tom Page
dd05b5914c Change TestNG reporting format back to default. 
Hopefully this will provide us with chronological information and we may
be able to use this to find out why the two intermittent tests are failing.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@105333 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-02 14:44:40 +00:00
Tom Page
e98c269c49 Fix a few places I missed refactoring. 
Hopefully this will fix the build.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@105318 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-02 11:17:19 +00:00
Tom Page
ea0548bdf8 Rename ClassificationService to ClassificationSchemeService. 
Also rename ClassificationServiceException to ClassificationException.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@105317 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-02 10:20:37 +00:00
Tom Page
1becb69355 Fix failing test on Sonar build. 
Avoid calling the I18N utility by checking the display label key directly.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@105312 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-02 09:21:30 +00:00
Tuna Aksoy
7a558aa3d8 Fixed compilation issue 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/ENFORCE@105294 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-01 16:46:59 +00:00
Tuna Aksoy
e46ec39aa7 RM-2208 (Prevent classification of shared content) 
+review RM @rwetherall

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@105284 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-01 13:32:12 +00:00
Tuna Aksoy
1acae0e403 RM-2203 (Show selected classification reason id's rather than description) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@105215 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-01 10:08:26 +00:00
Roy Wetherall
0b23552722 First pass at classification interceptor 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/ENFORCE@105194 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-01 08:20:12 +00:00
Roy Wetherall
3922228237 Dev branch for classification enforcement work 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/ENFORCE@105193 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-01 08:18:44 +00:00
Tom Page
16bde534af Use mock in unit test for ClearanceLevelManager. 
Although I'm not sure exactly why this unit test failed on the Sonar build,
it seems sensible to remove the dependency on another class by using a mock.

+review RM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@105192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-06-01 07:59:10 +00:00
Tuna Aksoy
c203ac2548 RM-2270: Fixed bean definition 
+review RM-67

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@105023 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-29 11:48:33 +00:00
David Webster
6f4775a393 RM-2270: WIP: Extending QuickShareService to prevent classified content being shared. Checking in for +review @taksoy @tpage @rweatherall @nmcerlean 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@105022 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-29 10:53:36 +00:00
Tuna Aksoy
4d29332cb6 RM-2268 (If the currentPage attribute value is changed to a invalid one in the URL the Security Clearance page is not displayed in error) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104905 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-27 15:59:48 +00:00
Tom Page
5c077ef098 RM-2124 Fix typo in assertion message. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104769 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-22 14:48:16 +00:00
Tom Page
f083b3cf22 RM-2124 Application context tests for restricted classification. 
+review RM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104751 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-22 13:20:01 +00:00
Tom Page
587786c2de RM-2123 Ensure user has clearance to classify content. 
Also add clearance check method into security profile.

+review RM-58

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104750 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-22 13:20:00 +00:00
Tom Page
3dc6ed9a71 RM-2123 Use runAsAuthentication instead of actual authentication. 
Check that the user the command is run as has clearance to view the
classification levels, rather than the user that initiated the command.

+review RM-58

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104729 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-22 08:43:12 +00:00
Tom Page
833142e8f7 RM-2123 Make new patch for 3.0 apply to anything from before it. 
+review RM-58

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104728 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-22 08:43:10 +00:00
Tom Page
90be46f97e RM-2123 Fix comparator to be the correct way around. 
Also add application context tests to cover this case.

+review RM-58

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104700 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-20 15:39:46 +00:00
Tom Page
80634961a9 RM-2123 Move clearance checking to SecurityClearanceService. 
Refactor ContentClassificationService#hasClearance so that it calls out to
SecurityClearanceService#isCurrentUserClearedForClassification. Restrict
isCurrentUserClearedForClassification so that it only applies to the current
authenticated user (we don't need to use it for anything else).  Also
extract classification level comparison to a new class.

+review RM-58

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104568 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-20 08:28:46 +00:00
Tom Page
d4b7eaa3bc RM-2123 Don't create a user called system. 
Also add special check in clearance service that gives system user maximum
clearance.

+review RM-58

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104480 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-19 09:57:02 +00:00
Tuna Aksoy
4f5b1eb69a Removed warnings 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104477 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-18 21:24:33 +00:00
Tuna Aksoy
df58ce99a7 RM-2204 (Hover over classification reason id on properties page reveals nothing) 
+review RM @rwetherall

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104476 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-18 21:22:17 +00:00
Neil McErlean
672253dda2 Added some javadoc to clarify that ExceptionUtils.expectedException doesn't try to work around checked exceptions. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104391 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-18 15:11:16 +00:00
Tom Page
5f6cf2187a RM-2123 Give clearance to the admin and system users. 
Make sure this is executed as a patch and also bootstrapped into a clean
system using the BootstrapImporterModuleComponent.

Also restrict access to the classification levels (via the get API) to
only the levels that the user has clearance to.

+review RM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104376 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-18 15:03:59 +00:00
Tom Page
582c179382 RM-2123 Create a new service for content classification. 
Move methods to do with content from the ClassificationService and the
SecurityClearanceService into the ContentClassificationService.

Remove the dependency of SecurityClearanceService on ClassificationService
which will allow us to reverse this dependency in the next commit.  This is
needed in order to filter classifications by the current user's clearance.
Nb. This included adding a method in the SecurityClearanceService called
isClearedForClassification, which looks quite similar to a new API Roy
created hasClearance (see ContentClassificationService).  In the future we
should look to see if we can consolidate these.

Remove dependency of ClassificationServiceBootstrap on the services, so that
it can be passed into them. This allows us to provide access to the POJO
managers in the services (this is made harder as the POJO managers aren't
Spring beans).  In order to initialise these objects, change the POJO
managers to use setters rather than constructor arguments. This allows us
to store a reference to the manager before the data has been loaded.

Move the attribute service keys for classification levels and reasons into
the ClassifiedContentModel.

Expect NO_CLEARANCE to be passed into the ClearanceLevelManager, as
otherwise we have to have logic to exclude it (see initialise in the old
SecurityClearanceService) and then more logic to include it again (see the
old constructor for ClearanceLevelManager).

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104375 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-18 15:03:57 +00:00