Commit Graph

1532 Commits

Author SHA1 Message Date
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
Tuna Aksoy
40ea38c9b5 RM-2191 ("Create Category" and "Manage Permissions" buttons are enabled for user with read-only permissions)
+review RM @rwetherall

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@102636 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-24 14:23:03 +00:00
Roy Wetherall
3bc42959e3 RM-2072: Concurrency exceptions and deadlocks on Records Management "File to" rule
* unit test provides easy way to reproduce (number of batches and size configurable)
* 500 docs now being added via described scenario
* extended security props no longer being set up the hierarchy (which was leading to terminal deadlocks)

+review RM @taksoy



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@102486 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-24 04:16:59 +00:00
Tuna Aksoy
78b31a0e89 RM-2072 (Concurrency exceptions and deadlocks on Records Management "File to" rule)
* Fixed the failing test

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@102279 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-22 08:42:38 +00:00
Tuna Aksoy
f86103cd13 RM-2072 (Concurrency exceptions and deadlocks on Records Management "File to" rule)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@102269 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-21 19:25:32 +00:00
Tuna Aksoy
7d1aa04d04 RM-2072 (Concurrency exceptions and deadlocks on Records Management "File to" rule)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@102267 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-21 17:49:48 +00:00
Tuna Aksoy
0a4f80ea5b RM-1100 (Uncaught LockAcquisitionException in RM 2.0.4)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@102242 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-21 13:07:27 +00:00
Tuna Aksoy
3efe5b4202 RM-2072 (Concurrency exceptions and deadlocks on Records Management "File to" rule)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@102241 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-21 13:06:53 +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
f38f208b48 RM-2045 Fix classification model file.
Previously I renamed the method, but missed the xml reference to it.

+review RM-25

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@102163 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-20 09:56: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
17ca9d431f RM-2045 Update unit test to use level ids, rather than levels.
+review RM-25

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@102158 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-20 08:39:08 +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
69dda6b842 Added the classification reason property values
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@102128 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-17 15:33:30 +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
Tuna Aksoy
64c560c4f2 RM-2044 (Add "Classified" aspect)
* title and description properties have been added

+review RM-24

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101975 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-15 23:30:42 +00:00
Tuna Aksoy
d1cbf11baf RM-2044 (Add "Classified" aspect)
* title and description have been added to classified-content-model.properties
 * initialClassification and currentClassification have been made mandatory and protected

+review RM-24

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101974 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-15 23:02:27 +00:00
Tuna Aksoy
67977fe5e8 RM-2044 (Add "Classified" aspect)
Forgot to add classification level constraint

+review RM-24

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101973 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-15 22:30: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
Tuna Aksoy
e533c53f3d Fixed failing unit test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101803 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-14 12:51:47 +00:00
Tuna Aksoy
21b85e8380 RM-1994 (Classification hierarchy integration tests)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101793 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-14 09:53:38 +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
ab404e87c2 RM-1994 (Classification hierarchy integration tests)
- Removed the contains methods as the test cases are already covered

+review RM-19

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101608 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-10 10:20:27 +00:00
Tuna Aksoy
03cf643c3f Classification hierarchy integration tests.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101603 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-10 09:45:36 +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
Tom Page
27a0affb19 Rename ExceptionUtils.intercept to expectedException.
+review RM-10

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