Commit Graph

1532 Commits

Author SHA1 Message Date
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
Tuna Aksoy
36e35457ec RM-2160 (Update Classify Action config once users with security clearances exist)
+review RM-57

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104346 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-18 13:21:49 +00:00
Tuna Aksoy
31bb13aa1f RM-2160 (Update Classify Action config once users with security clearances exist)
+review RM @rwetherall @dwebster

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104308 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-15 16:20:16 +00:00
David Webster
d7f0120fa1 RM-2197: Adds missing unit tests, as identified by Tom during +review RM-56
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-15 16:09:36 +00:00
David Webster
be7142f439 RM-2197: restrict restrictList access, as suggested by Tom and Tuna during +review RM-56
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104305 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-15 16:07:20 +00:00
David Webster
c24df57404 RM-2197: Minor comment fix as pointed out by Tom during +review RM-56
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104304 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-15 16:06:16 +00:00
David Webster
b253e192d5 RM-2120: More accurate error checking in test, as almost suggested by Neil during +review RM-46
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104296 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-15 14:51:56 +00:00
David Webster
a8864e85f0 RM-2197: Set permissions on newly created API call.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104247 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-15 10:05:32 +00:00
David Webster
e5c5b2f9b5 RM-2197: Create REST GET API to return clearance levels
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104246 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-15 10:04:52 +00:00
Tuna Aksoy
a917639be9 RM-2228 (The Unclassified option is displayed twice as a option in Classification levels drop down from Classify Content)
+review RM @rwetherall

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104245 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-15 10:03:51 +00:00
David Webster
0a20c4db5a RM-2197: Extend Java service to return a list of security clearances the user can see.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104244 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-15 10:02:23 +00:00
Roy Wetherall
f0a50ac432 Added 'hasClearance' method to SecurityClearanceService to support EntryVoter and AfterInvocationProvider implementations
* relates to RM-2129 & RM-2130
 * added 'getCurrentClassification" method to ClassificationService
 * added concept of system classification level "Unclassified" .. it no longer is required to be specified in the JSON bootstrap since this is a well known and alway required basic classification level
 * added concept of system security clearance level "No Clearance" .. automatically added and relates to unclassified classificaiton level
 * unit tests updated and added
 * started to move some of the logic out of unit test base class and into helper library called 'AlfMock'!



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104229 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-15 03:21:08 +00:00
David Webster
0b70bfa133 RM-2120: Add error handling (and test) as suggested by Neil during + review RM-46
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104157 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-14 10:58:19 +00:00
Roy Wetherall
8b18d50208 RM-2198: Can't classify a frozen record.
* server integration tests added
 * UI integration tests added (based on adjusted acceptance critera on RM-2052)



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104141 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-14 04:14:30 +00:00
Tuna Aksoy
21893ae3f2 RM-2206 (Dynamic test suite configuration)
+review RM-49

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104045 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-12 19:58:34 +00:00
Tuna Aksoy
1a33dfc7e7 RM-2206 (Dynamic test suite configuration)
+review RM-49

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104044 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-12 19:16:04 +00:00
Tuna Aksoy
bb5b98d7cf RM-2206 (Dynamic test suite configuration)
+review RM @rwetherall

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104021 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-12 15:22:11 +00:00
Tuna Aksoy
33f2483f40 Fixed test name in the AllUnitTestSuite
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103976 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-11 14:38:03 +00:00
Tom Page
df8bf4aa4b RM-2197 Replace "No Clearance" with "Unclassified" in list of levels.
Created a notion of clearance level distinct from (but related to)
classification level. A clearance level references the highest
classification level it has access to. A SecurityClearance now contains a
ClearanceLevel, which in turn contains a ClassificationLevel.

Created a ClearanceLevelManager and initialise it at the same time as the
ClassificationLevelManager.

+review RM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103929 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-11 08:16:03 +00:00
Roy Wetherall
4cf80a2901 RM-2186: Complete records can not be classified
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103923 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-11 01:25:11 +00:00
Tom Page
0cf19c441c Revert RM-2123 Update Java API to filter with current user's clearance.
The circular dependency causes a problem when loading the Spring context.
Reverting to rethink the approach.

+review RM-47



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103856 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-08 09:26:27 +00:00
Tom Page
3590b9327d RM-2123 Update Java API to filter with current user's clearance.
+review RM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103851 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-08 08:11:58 +00:00
David Webster
d1dc0d1875 RM-2120: Add unit test for usersecurityclearance.put webscript & add it (and get) to test suite
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103829 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-07 14:04:26 +00:00
David Webster
b56bacc2bf RM-2120: Configure the ACL to allow setUserSecurityClearance
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103828 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-07 14:03:18 +00:00
David Webster
35afc42a8c RM-2120: Add Java backed webscript to set the security clearance for a specified user
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103827 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-07 14:01:56 +00:00
David Webster
98155a3147 RM-2119: Update Java API to return the security clearance object when setting it.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103826 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-07 13:58:16 +00:00
David Webster
61721ee21b RM-2120: Create lib file for usersecurityclearance item macro
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103825 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-07 13:55:05 +00:00
Tom Page
abcd43455c RM-2119 Don't need to explicitly apply the aspect.
By setting the property on the node the aspect will be applied
automatically if it hasn't already been applied.

+review RM-45

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103786 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-07 07:59:44 +00:00
Neil McErlean
10f9e47e01 Code review of RM-2113. Minor clarification in javadoc.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-06 16:29:06 +00:00
Neil McErlean
568a7c1dc8 Moer RM-2113 review comments. Renaming SecurityClearance.getClassificationLevel to getClearanceLevel
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103782 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-06 16:26:50 +00:00
Neil McErlean
52e8e73ba0 RM-2113. Acting on review comments.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-06 16:11:16 +00:00
Tom Page
fae0db60f0 RM-2119 Cast String to Serializable so that this compiles under Java 7.
+review RM-45

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103780 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-06 15:39:07 +00:00
Tom Page
07ce45fec8 RM-2119 Java API to change a user's security clearance.
+review RM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103777 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-06 15:27:35 +00:00
Neil McErlean
a0c9b6dc73 Initial unit tests for RM-2113.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103745 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-06 07:33:24 +00:00
Tuna Aksoy
1b1056523d RM-2114 (REST API to GET users security clearance)
+review RM-43

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103743 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-05 21:54:49 +00:00
Roy Wetherall
c236f4b086 Added complete set of classification reasons from specification
* relates to RM-1266 (Exploratory testing)
  * note that these default values will be changed before delivery to something more neutral, but for now they give us a better representative set of data to work with.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103679 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-04 02:20:57 +00:00
Tuna Aksoy
405ff33dfc RM-2114 (REST API to GET users security clearance)
+review RM-43

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103667 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-02 15:20:52 +00:00
Tuna Aksoy
8991afd16d RM-2114 (REST API to GET users security clearance)
+review RM-43

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103502 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-01 16:46:18 +00:00
Tuna Aksoy
e7b7ae394f Removed warnings
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103492 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-01 16:32:06 +00:00
Neil McErlean
381f281e8d RM-2113. A null-valued search term in the user query is allowed.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103489 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-01 14:43:37 +00:00
Neil McErlean
812753a249 RM-2113 Ensure that the number of users returned in a query has an accurate total count.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103488 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-01 14:41:00 +00:00
Neil McErlean
648fa3001c Edits following review of RM-2113 code.
I have changed the SecurityClearanceService query API so that it accepts a single Java object containing all the configurable options for such a query. Sensible default values are set where possible. The query object follows the Builder pattern so it should be easier to use the defaults in a query and still possible to change those defaults ifnecessary.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103471 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-01 09:50:59 +00:00
Tuna Aksoy
97f3a271c5 RM-2115 (View Security Clearance UI)
+review RM-44

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103421 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-30 19:36:15 +00:00
Tuna Aksoy
8ba922a986 RM-2114 (REST API to GET users security clearance)
+review RM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103359 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-30 15:24:37 +00:00
Neil McErlean
f7f8dcdc91 Slight refactor/improvement to SecurityClearanceService as part of reviewing RM-2113.
The API had been dealing with Pair<PersonInfo, ClassificationLevel> objects and I've extracted that out
into its own type: SecurityClearance. Should make some of the code more readable.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103133 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-29 14:18:36 +00:00
Tuna Aksoy
a581ed30ed Merged BRANCHES/V2.3 to RM HEAD:
103080: Fixed merge issue

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103087 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-29 12:10:40 +00:00