Commit Graph

1466 Commits

Author SHA1 Message Date
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
Tuna Aksoy
9c61babaea Fixed merge issue
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@103080 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-29 12:03:33 +00:00
Tuna Aksoy
bc6fe6156b Merged BRANCHES/V2.3 to RM HEAD:
103049: Merged BRANCHES/V2.2 to BRANCHES/V2.3:
        103037: Merged BRANCHES/V2.2.1.x to BRANCHES/V2.2:
             102241: RM-2072 (Concurrency exceptions and deadlocks on Records Management "File to" rule)
             102242: RM-1100 (Uncaught LockAcquisitionException in RM 2.0.4)
             102267: RM-2072 (Concurrency exceptions and deadlocks on Records Management "File to" rule)
             102269: RM-2072 (Concurrency exceptions and deadlocks on Records Management "File to" rule)
             102279: RM-2072 (Concurrency exceptions and deadlocks on Records Management "File to" rule)
             102486: RM-2072: Concurrency exceptions and deadlocks on Records Management "File to" rule
             102636: RM-2191 ("Create Category" and "Manage Permissions" buttons are enabled for user with read-only permissions)
             102675: RM-2190 (Concurrency exception when upload document to several folders with rules configured to file records)
             102687: RM-2192 (User has no access to the recorded document after it was filed)
             102698: Removed warnings
             102699: .ant-targets-build.xml files added to svn:ignore
             102700: .ant-targets-build.xml files added to svn:ignore
             102701: RM-2190 (Concurrency exception when upload document to several folders with rules configured to file records)
             102756: RM-2192 (User has no access to the recorded document after it was filed)
             102762: Commented out intermittently failing test
             102795: (RECORD ONLY) Deploy RM 2.2.1.1 on Maven Repository
             102807: (RECORD ONLY) Changed the artifact version to 2.2.1.2-SNAPSHOT

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103059 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-29 11:05:41 +00:00
Tuna Aksoy
7945e4319e Merged BRANCHES/V2.2 to BRANCHES/V2.3:
103037: Merged BRANCHES/V2.2.1.x to BRANCHES/V2.2:
        102241: RM-2072 (Concurrency exceptions and deadlocks on Records Management "File to" rule)
        102242: RM-1100 (Uncaught LockAcquisitionException in RM 2.0.4)
        102267: RM-2072 (Concurrency exceptions and deadlocks on Records Management "File to" rule)
        102269: RM-2072 (Concurrency exceptions and deadlocks on Records Management "File to" rule)
        102279: RM-2072 (Concurrency exceptions and deadlocks on Records Management "File to" rule)
        102486: RM-2072: Concurrency exceptions and deadlocks on Records Management "File to" rule
        102636: RM-2191 ("Create Category" and "Manage Permissions" buttons are enabled for user with read-only permissions)
        102675: RM-2190 (Concurrency exception when upload document to several folders with rules configured to file records)
        102687: RM-2192 (User has no access to the recorded document after it was filed)
        102698: Removed warnings
        102699: .ant-targets-build.xml files added to svn:ignore
        102700: .ant-targets-build.xml files added to svn:ignore
        102701: RM-2190 (Concurrency exception when upload document to several folders with rules configured to file records)
        102756: RM-2192 (User has no access to the recorded document after it was filed)
        102762: Commented out intermittently failing test
        102795: (RECORD ONLY) Deploy RM 2.2.1.1 on Maven Repository
        102807: (RECORD ONLY) Changed the artifact version to 2.2.1.2-SNAPSHOT

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@103049 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-29 10:39:57 +00:00
Neil McErlean
b945155b24 Additional small change for RM-2113. Needed to make a public API method callable (security interception).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103043 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-29 09:48:30 +00:00
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
f695bcab1a Merged BRANCHES/V2.2.1.x to BRANCHES/V2.2:
102241: RM-2072 (Concurrency exceptions and deadlocks on Records Management "File to" rule)
   102242: RM-1100 (Uncaught LockAcquisitionException in RM 2.0.4)
   102267: RM-2072 (Concurrency exceptions and deadlocks on Records Management "File to" rule)
   102269: RM-2072 (Concurrency exceptions and deadlocks on Records Management "File to" rule)
   102279: RM-2072 (Concurrency exceptions and deadlocks on Records Management "File to" rule)
   102486: RM-2072: Concurrency exceptions and deadlocks on Records Management "File to" rule
   102636: RM-2191 ("Create Category" and "Manage Permissions" buttons are enabled for user with read-only permissions)
   102675: RM-2190 (Concurrency exception when upload document to several folders with rules configured to file records)
   102687: RM-2192 (User has no access to the recorded document after it was filed)
   102698: Removed warnings
   102699: .ant-targets-build.xml files added to svn:ignore
   102700: .ant-targets-build.xml files added to svn:ignore
   102701: RM-2190 (Concurrency exception when upload document to several folders with rules configured to file records)
   102756: RM-2192 (User has no access to the recorded document after it was filed)
   102762: Commented out intermittently failing test
   102795: (RECORD ONLY) Deploy RM 2.2.1.1 on Maven Repository
   102807: (RECORD ONLY) Changed the artifact version to 2.2.1.2-SNAPSHOT

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@103037 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-29 08:35:10 +00:00
Tuna Aksoy
992a4a9fea Changed the artifact version to 2.2.1.2-SNAPSHOT
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@102807 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-27 16:54:55 +00:00
Tuna Aksoy
a31a1acdf6 Deploy RM 2.2.1.1 on Maven Repository
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@102795 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-27 16:19:12 +00:00
Tuna Aksoy
ca6315f3d4 Commented out intermittently failing test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@102762 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-27 13:47:32 +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
bdf680f034 RM-2192 (User has no access to the recorded document after it was filed)
+review RM-37

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@102756 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-27 13:21:10 +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
Tuna Aksoy
7a2582961c RM-2190 (Concurrency exception when upload document to several folders with rules configured to file records)
* Increased the time for the thread to finish the job

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@102701 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-26 15:02:11 +00:00
Tuna Aksoy
f37a5090b4 Removed warnings
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@102698 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-26 14:15:02 +00:00
Tuna Aksoy
67157be80e RM-2192 (User has no access to the recorded document after it was filed)
+review RM @rwetherall

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@102687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-25 13:51:08 +00:00
Tuna Aksoy
5015fd62ea RM-2190 (Concurrency exception when upload document to several folders with rules configured to file records)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@102675 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-24 23:26:37 +00:00