inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,254 Commits 325 Branches 2,188 Tags
ce60d3e89f9bf41ea45793f9ff9f0a9a6fd2903a
Commit Graph

5254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Roy Wetherall
58de73c238 Create branch for 2.2.1 hot fixes. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@101976 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-15 23:50:23 +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
David Webster
99576a26a3 RM-2087: Relationship refactor merge from dev branch. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101740 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-13 10:03:32 +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
Tom Page
62d4ef1f71 RM-2075 Create test classification reasons resource. 
Use the same path as the production resource, so that the when testing
the test resource is picked up in preference.

+review RM-16

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101336 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-08 10:26:02 +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
d2b1949dad commit merge info 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@101233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-07 11:08:36 +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
8b62190595 RM-193 (Roles are displayed incorrectly in User Rights Report) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@101230 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-07 10:16:15 +00:00
Tom Page
8403b07d42 RM-2075 Integration test for classification reasons. 
Currently just checks the bootstrapped config file has been loaded and
is exposed over the API.

+review RM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101228 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-07 09:35:10 +00:00
Roy Wetherall
37a950d211 Temp removal of unreliable tests from Bamboo build. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101223 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-07 00:12:55 +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
Tom Page
0f7bac797a RM-2028 Add new test file to test suite. 
+review RM-14

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101116 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-02 11:08:24 +00:00
Tom Page
1449f2163b RM-2028 Test for get classification reasons API. 
+review RM-14

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101108 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-02 10:02:58 +00:00