Commit Graph

1494 Commits

Author SHA1 Message Date
Alexandru Balmus
b6fea0405f Merged DEV to V2.2.1.x
114604: MNT-14900 : Alfresco doesn't work with Records Management
      - Fixed the circular reference problem from Spring config xml using NonBlockingLazyInitTargetSource

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@114608 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-16 14:26:00 +00:00
Alexandru Balmus
e080f6e188 Reverse merged V2.2.1.x
<<< Need to use a different approach. >>>
         Merged DEV to V2.2.1.x
            114241: MNT-14900 : Alfresco doesn't work with Records Management
               - Fixed problem with circular references during Spring dependency injection process

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@114605 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-16 14:14:03 +00:00
Alexandru Balmus
9f1900f06c Merged DEV to V2.2.1.x
114241: MNT-14900 : Alfresco doesn't work with Records Management
      - Fixed problem with circular references during Spring dependency injection process

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@114437 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-15 13:18:14 +00:00
Roy Wetherall
2c3bdc01cd RM-2162: Records Management patch RMv22DODModelSeparationModulePatch taking too long with large amount of records
* added configuration property that allows existing DoD RM site to be converted to standard RM site
 * added deprecated properties back into rma namespace to avoid loss of data
 * patches to move properties into DoD namespace not executed if not required
 * removed a couple of references to moved properties that still existed
 * ensure address properties are moved if required

+review RM



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@103185 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-30 04:42:25 +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
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
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
439f4a574e .ant-targets-build.xml files added to svn:ignore
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@102700 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-26 14:19:21 +00:00
Tuna Aksoy
52c4c1a4f5 .ant-targets-build.xml files added to svn:ignore
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@102699 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-26 14:17:32 +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
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
Jean-Pierre Huynh
905594baf1 Correct RM 2.2.1 release tag.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/TAGS/V2.2.1@100309 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 11:51:18 +00:00
Jean-Pierre Huynh
9f29970973 Created tag for RM 2.2.1 release.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/TAGS/V2.2.1@100302 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 11:45:12 +00:00
Roy Wetherall
c03b3eb232 RM-2058: RM Manager can't access Users and Groups (after upgarde)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99471 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-15 23:48:58 +00:00
Tuna Aksoy
24791c832a RM-2019 (Testing maven SDK evaluation)
* Fixed incremental build
   * Fixed dependency inclusion

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@99375 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-12 23:19:50 +00:00
Roy Wetherall
e9471b310f Merged V2.3 to V2.1.1:
96823: RM-1903 (Can't manage permissions without "Manage Access Controls" capability)
   97435: RM-1903: Can't manage permissions without "Manage Access Controls" capability
   97436: RM-1903 - updates to unit tests
   97595: RM-1903 (Can't manage permissions without "Manage Access Controls" capability)



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99374 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-12 23:14:33 +00:00
Neil McErlean
2829d1f468 RM-1888 Switching the main pom file to use Java 7 for /main code and Java 8 for /test code.
This will require a change in the Bamboo build plan (to use a 1.8 JDK)
and will require developers to set their JAVA_HOME to a 1.8 JDK too.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@99356 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-12 14:34:11 +00:00
Tuna Aksoy
1a977aa1dc RM-2019 (Testing maven SDK evaluation)
* Fixed MySQL issues

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@99236 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-11 11:41:34 +00:00
Tuna Aksoy
383fea40c4 RM-2019 (Testing maven SDK evaluation)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@99123 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-10 13:25:48 +00:00
Roy Wetherall
b605635eb6 Merged HEAD to V2.2:
89735: RM-1677- No items error for RM Admin if record was declared from moderated/private site

* fixes RM-2018



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99089 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-10 04:32:04 +00:00
Roy Wetherall
ef7c4d6761 RM-2026: Unable to complete historical records when mandatory meta-data missing
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99088 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-10 03:10:49 +00:00
Roy Wetherall
f5e632899a Upgrade Alfresco version to 4.2.4.6
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99087 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-10 03:09:44 +00:00
Roy Wetherall
29e366cfab Merged V2.3 to V2.2:
96580: RM-1904 (SubCategory moved to root have inheritance on)



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99086 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-09 21:57:32 +00:00
Roy Wetherall
c753763291 Merged V2.3 to V2.2:
92881: RM-1799 (Root category is not displayed for the non-rm-admin user who created it)



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99085 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-09 21:53:53 +00:00
Roy Wetherall
51b24c7f54 Merged V2.3 to V2.2 :
93334: RM-1822 (Non-system-admin user not allowed to read inheritable permissions)



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99084 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-09 21:50:25 +00:00
Tuna Aksoy
27f748a946 Removed warning
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@99004 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-07 21:36:38 +00:00
Tatiana Kalinovskaya
2d71bc2275 RM-1727 (Error on Folder/record details page when user have no permissions on parent category)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@98884 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-06 14:27:45 +00:00
Gloria Broadbent
3ca79c1e33 RUSSIAN: Updated bundle for RM 2.2.1 based on EN-rev98763
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@98845 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-06 10:53:09 +00:00
Gloria Broadbent
cf9568214b SPANISH: Updated bundle for RM 2.2.1 based on EN-rev98763
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@98840 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-06 10:49:48 +00:00
Tuna Aksoy
91ed65df5c Added transfer test suite
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@98500 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-03 20:11:59 +00:00
Tuna Aksoy
c6607e16c5 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@98379 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-02 21:58:14 +00:00
Tuna Aksoy
5f4ab82c22 Merged BRANCHES/V2.3 to HEAD:
98190: RM-1980 (Can't delete version record if it is the last version of the document)
   98191: RM-1981 (Cant reject the record that has any version records)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@98215 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-27 11:05:33 +00:00
Tuna Aksoy
c182bbafd0 RM-1981 (Cant reject the record that has any version records)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@98191 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-26 21:13:55 +00:00
Tuna Aksoy
f3e0d2d2d1 RM-1980 (Can't delete version record if it is the last version of the document)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@98190 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-26 21:10:51 +00:00
Tuna Aksoy
46a3ebbe87 Merged BRANCHES/V2.3 to HEAD:
98004: NORWEGIAN (Bokmal): Updated files as per EN-RM-rev97654
   98005: RUSSIAN: Updated files as per EN-RM-rev97654
   98006: BRAZILIAN PORTUGUESE: Updated files as per EN-RM-rev97654
   98007: SIMPLIFIED CHINESE: Updated files as per EN-RM-rev97654

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@98023 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-25 13:53:33 +00:00
Gloria Broadbent
2c371d9eb1 SIMPLIFIED CHINESE: Updated files as per EN-RM-rev97654
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@98007 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-25 12:57:07 +00:00
Gloria Broadbent
e77ddf81eb BRAZILIAN PORTUGUESE: Updated files as per EN-RM-rev97654
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@98006 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-25 12:55:33 +00:00
Gloria Broadbent
f14313efdb RUSSIAN: Updated files as per EN-RM-rev97654
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@98005 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-25 12:54:50 +00:00
Gloria Broadbent
ce1a54172e NORWEGIAN (Bokmal): Updated files as per EN-RM-rev97654
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@98004 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-25 12:54:19 +00:00