Commit Graph

5898 Commits

Author SHA1 Message Date
Alan Davis
4f30a54465 Merged 5.2.N (5.2.1) to HEAD (5.2)
126098 amukha: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      126058 jkaabimofrad: ACE-5001: Added a utility class to calculate the number of days between the start and end dates, so we could have a single source when dealing with such functionality. Also, changed the RepoUsageComponentImpl class to use this util class.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127841 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 08:35:08 +00:00
Alan Davis
412d05e36a Merged 5.2.N (5.2.1) to HEAD (5.2)
126063 aleahu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      126025 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         125910 rmunteanu: MNT-15553 : Inconsistent search result with .eml files.
            - Fix transformation for eml files containing nested alternative parts.
            - Added test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127840 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 08:35:01 +00:00
Alan Davis
1ee2b7c45d Merged 5.2.N (5.2.1) to HEAD (5.2)
126008 aleahu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125935 aleahu: MNT-16155 : Change source headers to new version
         - fixed more license headers


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127838 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 08:34:49 +00:00
Alan Davis
6f41025dda Merged 5.2.N (5.2.1) to HEAD (5.2)
126007 aleahu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125933 aleahu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125907 mward: ACE-5052: close PrintWriter


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127837 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 08:34:43 +00:00
Alan Davis
ce5a675361 Merged 5.2.N (5.2.1) to HEAD (5.2)
126004 aleahu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125892 adragoi: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         125842 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4) (PARTIAL MERGE)
            125700 adavis: Merged V4.2.5 (4.2.5.7) to V4.2-BUG-FIX (4.2.7)
               125698: Merged DEV to V4.2.5 (4.2.5.7)
                  125677 arebegea: MNT-15219 : Excel (.xlsx) containing xmls (shapes/drawings) with multi byte characters may cause OutOfMemory in Tika
                     - Should not have updated version.properties as the original commit needs to be merged forwards.,
               125696: Merged DEV to V4.2.5 (4.2.5.7)
                  125677 arebegea: MNT-15219 : Excel (.xlsx) containing xmls (shapes/drawings) with multi byte characters may cause OutOfMemory in Tika
                     - Modified tika parser and tika core jars to allow some configuration parameters to be sent from Alfresco side using the metadata map parameter
                     - Excluded by default the parsing of drawings/shapes xmls because there was little valuable data that could be extracted from those xmls


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127835 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 08:34:29 +00:00
Alan Davis
640535fd09 Merged 5.2.N (5.2.1) to HEAD (5.2)
126003 aleahu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125891 adragoi: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         125841 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            125680 sglover: Merged BRANCHES/DEV/SG/MNT15914 to V4.2-BUG-FIX (4.2.7)
                  125540 sglover MNT-15914 "Add multi-threaded workers for FixedAclUpdater"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127834 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 08:34:20 +00:00
Alan Davis
61837639c8 Merged 5.2.N (5.2.1) to HEAD (5.2)
125866 adragoi: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125833 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         125718 cpopa: MNT-15160 : Unable to transform DWT/XLAM files to JPEG
               - Disabled ImageMagick support for DWT mimetype


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127825 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-04 12:45:41 +00:00
Alan Davis
e3b9a10990 Merged 5.2.N (5.2.1) to HEAD (5.2)
125865 adragoi: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125832 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         125670 abalmus: MNT-16188 : [Kerberos] Users Search doesn't work
            MNT-15038 : Unexpected behavior when disabling Active Directory user (New feature to sync userAccountControl)
               - Fixed NPE in AuthenticationServiceImpl.getAuthenticationEnabled (I guess sometimes the PersonService bean is not injected)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127824 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-04 12:45:34 +00:00
Alan Davis
9221d7a08b Merged 5.2.N (5.2.1) to HEAD (5.2)
125859 adragoi: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125817 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125673 abalmus: MNT-15421 : Intermittent failure SubsystemsTest.testAbstractPropertyBackedBean_performEarlyPropertyChecks_PortEarlyPropertyChecker
            - Fixed intermittently failing test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127820 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-04 11:01:10 +00:00
Alan Davis
b13e0dc4c4 Merged 5.2.N (5.2.1) to HEAD (5.2)
125798 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125734 rmunteanu: MNT-16201 : Failing test: AJExtensionsCompileTest
         - Fixed failing tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127819 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-04 11:01:03 +00:00
Alan Davis
92da0aaddd Merged 5.2.N (5.2.1) to HEAD (5.2)
125797 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125702 mward: ACE-5052: backed out r125594:125595
      Closing the file results in the channel being closed, so we can't do that.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127818 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-04 11:00:57 +00:00
Alan Davis
1ad1f74dc8 Merged 5.2.N (5.2.1) to HEAD (5.2)
125793 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125629 abalmus: MNT-15038 : Unexpected behavior when disabling Active Directory user (New feature to sync userAccountControl)
         - Fixed build on 5.1.N (Plat) due to new license header plugin checks (updated headers to the 3 new files)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127814 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-04 11:00:31 +00:00
Alan Davis
b4576ce3ca Merged 5.2.N (5.2.1) to HEAD (5.2)
125792 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125621 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         125577 abalmus: MNT-15038 : Unexpected behavior when disabling Active Directory user (New feature to sync userAccountControl)
            - Implemented new requirements and tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127813 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-04 11:00:24 +00:00
Alan Davis
bd2cf2c35d Merged 5.2.N (5.2.1) to HEAD (5.2)
125790 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125618 rmunteanu: MNT-16155 : Change source headers to new version
         - fixed more license headers


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127812 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-04 11:00:15 +00:00
Alan Davis
84841e063f Merged 5.2.N (5.2.1) to HEAD (5.2)
125788 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125606 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125515 slanglois: MNT-16155 Update source headers - add new Copyrights for Java and JSP source files + automatic check in the build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127810 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 17:08:06 +00:00
Alan Davis
12769c2923 Merged 5.2.N (5.2.1) to HEAD (5.2)
125783 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:45:04 +00:00
Alan Davis
91eb2644ad Merged 5.2.N (5.2.1) to HEAD (5.2)
125781 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125603 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125484 slanglois: MNT-16155 Update source headers - remove old Copyrights from Java and JSP dource files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:40:56 +00:00
Alan Davis
6a300d8dd7 Merged 5.2.N (5.2.1) to HEAD (5.2)
125780 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125602 adragoi: MNT-16175 : CLONE - Time Consumed for Updating Folder Permission
         - added setInheritParentPermissions implementation to fix compilation error 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127807 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:12:21 +00:00
Alan Davis
cca0b3eb91 Merged 5.2.N (5.2.1) to HEAD (5.2)
125779 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125597 mward: ACE-5052: close stream


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127806 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:12:16 +00:00
Alan Davis
c8bb6ae44a Merged 5.2.N (5.2.1) to HEAD (5.2)
125778 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125596 mward: ACE-5052: added comment regarding close() expectations.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127805 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:12:10 +00:00
Alan Davis
a4bd3de5c5 Merged 5.2.N (5.2.1) to HEAD (5.2)
125777 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125595 mward: ACE-5052: close file


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127804 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:12:04 +00:00
Alan Davis
3bc4a6b0fe Merged 5.2.N (5.2.1) to HEAD (5.2)
125776 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125594 mward: ACE-5052: close file


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127803 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:11:58 +00:00
Alan Davis
a1f642e420 Merged 5.2.N (5.2.1) to HEAD (5.2)
125775 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125593 mward: ACE-5052: close stream


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127802 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:11:53 +00:00
Alan Davis
6310574263 Merged 5.2.N (5.2.1) to HEAD (5.2)
125773 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125591 mward: ACE-5052: close FileInputStream


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127800 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:11:42 +00:00
Alan Davis
c89f1f5315 Merged 5.2.N (5.2.1) to HEAD (5.2)
125772 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125587 mward: ACE-5052: close spring application context in FTPServerBean


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127799 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:11:36 +00:00
Alan Davis
4ca7800805 Merged 5.2.N (5.2.1) to HEAD (5.2)
125771 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125586 mward: ACE-5052: close spring application context in CIFSServerBean


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127798 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:11:30 +00:00
Alan Davis
c952c8d8b9 Merged 5.2.N (5.2.1) to HEAD (5.2)
125767 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125473 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         125055 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4) (PARTIAL MERGE)
            124999 adragoi: Merged DEV to V4.2-BUG-FIX (4.2.7)
               124402 adragoi: MNT-15368 : Time Consumed for Updating Folder Permission
                  - implemented an approach that uses a separate, asynchronous processes that sets fixed ACL's


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127794 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:11:08 +00:00
Alan Davis
b6688d5103 Merged 5.2.N (5.2.1) to HEAD (5.2)
125766 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125470 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         125051 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            124925 adragoi: Merged DEV to V4.2-BUG-FIX (4.2.7)
               124738 adragoi: MNT-14882 : NFS Client: Issuing 'list' command on a mounted directory with over 1000 entries does not return
                  - save resumeId state on ContentSearchContext


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127793 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:11:01 +00:00
Alan Davis
2e338eecf9 Merged 5.2.N (5.2.1) to HEAD (5.2)
125765 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125454 amorarasu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125307 gjames: ACE-5091: Changed the javadoc formatting for TransactionService


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127792 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:10:55 +00:00
Alan Davis
bad97eaba7 Merged 5.2.N (5.2.1) to HEAD (5.2)
125442 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125335 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125223 amukha: MNT-15743: documentlibrary generation anomaly in Share
            - Added a check to ensure that a proper doc lib container would be created.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127786 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:09:52 +00:00
Alan Davis
6ca0d7f54f Merged 5.2.N (5.2.1) to HEAD (5.2)
125440 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125333 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125215 bhorje: ACE-5308 set valid parent association qname 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127784 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:09:37 +00:00
Alan Davis
ee08a52aee Merged 5.2.N (5.2.1) to HEAD (5.2)
125437 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125304 mward: ACE-5052: close spring application context in EmailServer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:09:15 +00:00
Alan Davis
7fb3e192ac Merged 5.2.N (5.2.1) to HEAD (5.2)
125326 rneamtu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125250 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125148 bhorje: ACE-5307 the title property remains unset for smart virtual folders  


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127780 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:09:05 +00:00
Alan Davis
9a1647fb60 Merged 5.2.N (5.2.1) to HEAD (5.2)
125324 rneamtu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125247 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125138 bhorje: ACE-5306 added cm:titled aspect to virtual smart folder entries  


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127779 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:08:58 +00:00
Alan Davis
f83f196211 Merged 5.2.N (5.2.1) to HEAD (5.2)
125039 cturlica: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124939 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124889 jvonka: Merged 50N-NDB (5.0.4) to 5.0.N (5.0.4)
            124745: MNT-15211: Follow-on (note: only affects NDB) - tweaks for further repo test fixes, including:
            - FileFolderServiceImplTest.testMove


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127774 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:08:16 +00:00
Alan Davis
0cb9bc6dc9 Merged 5.2.N (5.2.1) to HEAD (5.2)
125038 cturlica: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124938 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124888 jvonka: Merged 50N-NDB (5.0.4) to 5.0.N (5.0.4)
            124735: MNT-15211: Follow-on (note: only affects NDB) - tweaks for further repo tests, including:
            - FileFolderServiceImplTest.testMoveCopyLotsOfFiles
            - DbNodeServiceImplTest.testDuplicateCatch


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127773 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:08:08 +00:00
Alan Davis
109204efbb Merged 5.2.N (5.2.1) to HEAD (5.2)
124856 cturlica: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124703 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124682 jvonka: Merged 50N-NDB (5.0.4) to 5.0.N (5.0.4)
            124674: MNT-15211: Follow-on (note: only affects NDB)
            - use string_value 400 to enable schema bootstrap (and be consistent with existing customer pilot DBs)
            - minor tweaks to unit test cases (note: only affects NDB)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127766 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:05:21 +00:00
Alan Davis
3e5a51b778 Merged 5.2.N (5.2.1) to HEAD (5.2)
124656 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124582 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124539 jvonka: Merged 50N-NDB (5.0.4) to 5.0.N (5.0.4)
            124514: MNT-15211: NDB-specific workaround fix for trashcan restore (since NDB does not support partial rollback on constraint violation)
            - this fix is dialect-specific (hence does not impact existing supported DB types)
            - note: MySQL Cluster NDB - experimental/unsupported


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127764 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:04:54 +00:00
Alan Davis
9abc53e701 Merged 5.2.N (5.2.1) to HEAD (5.2)
124519 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124491 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124465 aleahu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            124433 aleahu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
               124363 adragoi: MNT-15846 : The RenditionServiceIntegrationTest.testRenderPdfDocumentLongRunningCheckout fails on DB2
                  - wait thread to finish checkout 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127760 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:04:09 +00:00
Alan Davis
ba3c1bf61c Merged 5.2.N (5.2.1) to HEAD (5.2)
124480 aleahu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124472 dhulley: Formatting during investigations


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127756 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:03:47 +00:00
Alan Davis
c8aa156dda Merged 5.2.N (5.2.1) to HEAD (5.2)
124364 adragoi: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124313 adragoi: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124244 abalmus: MNT-15497 : Keyword tags generated from metadata extraction are formed into a single string rather than split on delimiter
            - Fixed tag separation on delimiter
            - Enhanced existing test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127752 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:03:24 +00:00
Alan Davis
bffa610ff9 Merged 5.2.N (5.2.1) to HEAD (5.2)
124310 adragoi: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124303 rneamtu: MNT-15881 : CLONE - Share rule constraints missing due to ActionExecuterAbstractBase's regression
         Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
            124129 rneamtu: Merged DEV to 5.0.N (5.0.4)
               124118 rneamtu: MNT-15802: Share rule constraints missing due to ActionExecuterAbstractBase's regression
                  - Set parameter constraint name for localized parameters
                  - Added unit test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127751 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:03:18 +00:00
Alan Davis
d6119f7d57 Merged 5.2.N (5.2.1) to HEAD (5.2)
124278 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124237 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124191 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            124133 arebegea: MNT-14671 : Site with document locked for Edit Offline cannot be deleted
               - disabled the ASPECT_LOCKABLE when deleting a site
               - added tests for delete and restore site


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127748 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:00:41 +00:00
Alan Davis
ccfb98ccbd Merged 5.2.N (5.2.1) to HEAD (5.2)
124277 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124236 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (PARTIAL MERGE)
         124190 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            124132 arebegea: MNT-15573 : Site finder slow for a user who's member of many sites
               - added a new method to InvitationService to make use of the limit in the searchInvitation
               - sent and used the 200 limit from the site-finder.get.js in the script/ScriptInvitationService.java and passed the new parameter
               - for searchModeratedInvitations and searchNominatedInvitations methods of InvitationServiceImpl.java I added the use of the limit parameter
               - added some comments on ActivitiWorkflowEngine.java and TaskComponent.java to inform developers about the performance issues and possible improvement
               - added junit tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127747 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:00:35 +00:00
Alan Davis
00776fedf8 Merged 5.2.N (5.2.1) to HEAD (5.2)
124228 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124145 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124106 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            124105 amorarasu: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
               123915 rmunteanu: Merged V4.1.7 (4.1.7.18) to V4.1-BUG-FIX (4.1.11)
                  MNT-15801 : onContentUpdate policies not working for updates via webdav
                     - Reverted changes made for MNT-11185 and MNT-10966 , reverts that will fix MNT-15746
                     - Changed fix for MNT-5882 by adding the ASPECT_NO_CONTENT after the content is updated, this way preventing MNT-10966 from reproducing


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127744 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:00:17 +00:00
Alan Davis
cd61c4f1e0 Merged 5.2.N (5.2.1) to HEAD (5.2)
124222 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124096 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         123996 sglover: MNT-15655 "Possible to violate child cm:name uniqueness constraint via NodeService.addAspect"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127740 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:55:11 +00:00
Jamal Kaabi-Mofrad
a57b8c5e34 Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
127462 jkaabimofrad: Merged 5.1.N (5.1.2) to API-STRIKES-BACK (5.2.0)
      127454 jkaabimofrad: MNT-16224, RA-1093: Fixed Quickshare issue where deleting a shared node didn't remove the 'shared' aspect. The fix also takes care of the shared nodes that have been deleted but not yet restored, as well as, shared nodes that have already been restored from the trashcan (allow the user to un-share).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127615 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-02 22:25:00 +00:00
Jamal Kaabi-Mofrad
ab6bdc81c6 Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
127443 jvonka: Fix trivial typo
   - RA-1092


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127610 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-02 22:23:38 +00:00
Jamal Kaabi-Mofrad
d6d8e75612 Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
127418 jvonka: FileFolderService / GetChildrenCannedQuery - optional support for filtering by assocType(s)
   - eg. as required by new V1 REST API
   - RA-1053, RA-1092


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127605 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-02 22:20:00 +00:00
Jamal Kaabi-Mofrad
451c692f09 Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
127283 jvonka: Permissions: tweak to add AssociationRef to ACLEntryAfterInvocationProvider
   - required for introduction of RA-1062


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127594 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-02 22:17:40 +00:00