Commit Graph

786 Commits

Author SHA1 Message Date
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
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
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
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
110e506417 Merged 5.2.N (5.2.1) to HEAD (5.2)
125448 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125339 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125269 amukha: MNT-15976: A few Oracle tests sometimes take hours to complete
            - disabled long running tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127790 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:10:38 +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
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
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
702e72d6a0 Merged 5.2.N (5.2.1) to HEAD (5.2)
125037 cturlica: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124936 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124872 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            124789 adavis: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
               124719 rmunteanu: Merged DEV to V4.2.6 (4.2.6)
                  124647: MNT-15847 : The RepoTransferReceiverImplTest.testNodeDeleteAndRestore fails intermittently on SQL Server and DB2
                     - reset mockedPolicyHandler before doCommitCB to ensure that only onEndInboundTransfer calls from doCommitCB are counted


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127772 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:08:01 +00:00
Alan Davis
2ae9cf58e2 Merged 5.2.N (5.2.1) to HEAD (5.2)
125036 cturlica: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124935 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124871 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            124788 adavis: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
               124676 arebegea: MNT-15844 : CheckOutCheckInServiceImplTest.testCheckOutPermissions_ALF7680_ALF535 fails on SQL Server
                  - fix the tests by doing the initialization of the test data in a new retrying transaction


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127771 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:07:54 +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
0c7488b7e7 Merged 5.2.N (5.2.1) to HEAD (5.2)
124520 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124492 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124466 aleahu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            124434 aleahu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
               124387 amorarasu: MNT-15888: The ImapServiceImplTest fails intermittently on MySQL and MariaDB
                  - The re-authentication is done in a retrying transaction. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127761 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:04:15 +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
28fcd6efb9 Merged 5.2.N (5.2.1) to HEAD (5.2)
124414 aleahu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124374 adragoi: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124321 adragoi: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            124240 amorarasu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
               124201 amorarasu: MNT-15419: Failing test TaggingServiceImplTest.testALF_17260() on various databases
                  - increased the waiting time


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127754 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:03:35 +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
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
Alan Davis
53439f9771 Merged 5.2.N (5.2.1) to HEAD (5.2)
124217 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124091 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         123490 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            123221 mward: ACE-5120: further fixes (ADMLuceneTest)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127737 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:54:52 +00:00
Alan Davis
638de653ab Merged 5.2.N (5.2.1) to HEAD (5.2)
124215 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124089 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         123488 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            123145 mward: ACE-5120: fix ADMLuceneCategoryTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127735 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:54:40 +00:00
Alan Davis
5cd5cf6dc0 Merged 5.2.N (5.2.1) to HEAD (5.2)
124214 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124088 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         123487 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            123142 mward: ACE-5120: further test fixes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127734 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:54:34 +00:00
Alan Davis
b7978ab162 Merged 5.2.N (5.2.1) to HEAD (5.2)
124213 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124087 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         123486 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            123028 mward: ACE-5120: test fixes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127733 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:54:28 +00:00
Alan Davis
56e3fec00c Merged 5.2.N (5.2.1) to HEAD (5.2)
124211 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124085 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         123477 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            123368 gjames: MNT-15114: Test to ensure the policy fires


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127731 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:54:16 +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
998388eb2d Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
127088 jvonka: FileFolderService / GetChildrenCannedQuery - optional support for filtering by isPrimary child assoc (true/false) 
   - eg. as required by new V1 REST API
   - RA-1053


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127588 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-02 22:08:08 +00:00
Jamal Kaabi-Mofrad
2cc922696b Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
125360 gjames: Merged 5.0.N (5.0.4) to FILE-FOLDER-API (5.2.0)
      124120 gjames: MNT-15830: Moved DynamicallySizedThreadPoolExecutorTest to alfresco-core, and removed from unit tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126621 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:53:12 +00:00
Jamal Kaabi-Mofrad
9a8b3972b9 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
125359 gjames: Merged 5.0.N (5.0.4) to FILE-FOLDER-API (5.2.0)
      124119 gjames: MNT-15830: Moved DynamicallySizedThreadPoolExecutorTest to alfresco-core


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126620 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:53:04 +00:00
Jamal Kaabi-Mofrad
ce22405fd1 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124739 gjames: ACE-5295: listArchivedNodes now works for non-admin users


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126580 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:38:09 +00:00
Jamal Kaabi-Mofrad
57310498c9 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124623 jkaabimofrad: SFS-405, RA-778: Added tests and as the result did some minor modifications. Also, removed the ability to set or remove a client via JMX (Read only).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126573 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:35:15 +00:00
Jamal Kaabi-Mofrad
e0cff00b63 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
123185 jvonka: RA-706, ACE-5113: Revese merge 123162 & 123163 (needs more thought, re: impact on existing tests etc)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126535 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:23:09 +00:00
Jamal Kaabi-Mofrad
56fdd2741a Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
123162 jvonka: ACE-5113: Platform - OwnableService - when setting owner check that username currently exists (at time of property update)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126530 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:21:36 +00:00
Jamal Kaabi-Mofrad
2341e9f573 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122183 jvonka: FileFolderService / GetChildrenCQ - list children may ignore specific node type filter (and return all rather than none)
   - initially fixed on BRANCHES/DEV/FILE-FOLDER-API (see also RA-811)
   - will eventually be merged to HEAD for 5.N (although this specific commit could be cherry-picked sooner, if needed)
   ACE-5114, RA-811


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126459 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:03:22 +00:00
Alan Davis
5ba4f0b372 Merged 5.2.N (5.2.1) to HEAD (5.2)
123892 adavis: Merged 5.0.N (5.0.4) to 5.2.N (5.2.1)
      123880 rneamtu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123574 amorarasu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            123414 123524 amorarasu: MNT-15798: CLONE - call to guessMimetype() on a node that has no content creates a content property
               - Content Data should be created only when it has a binary, not as a side effect of getters on ScriptNode.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123893 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-14 16:34:28 +00:00
Alan Davis
d945d8d955 Merged 5.1.N (5.1.1) to HEAD (5.2)
123502 adavis: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      123484 adavis: MNT-14295 TransformerConfigLimits Behavior Differs on Java 7 vs 8
         - Fixed TransformerPropertyNameExtractor so that it discarded limit or
           max properties if its sibling max or limit value is supplied and has
           a lower value (i.e. it should be used).
         - Cleaned up TransformerConfigLimits.setTransformationLimitsFromProperties
         - This has been a problem since 4.2.
         - The problem only came to light with the switch to Java 8, as the order in which
           transformer properties are loaded changed. They were being loaded in MapEntry order.
           The problem did not show up in the unit tests, because they too were impacted by
           the MapEntry order and ironically loaded the properties in the same order.
         - Added unit tests that are supply both max an limit values.
         - Enhanced the debug and toString methods in order to trace the problem.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123711 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:35:33 +00:00
Alan Davis
38f73d02ae Merged 5.1.N (5.1.1) to HEAD (5.2)
123152 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      123098 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         122976 tvalkevych: MNT-15783: Merged V4.2.4 (4.2.4.20) to V4.2-BUG-FIX (4.2.7)
            113807 adragoi: Merged DEV to V4.2.4 (4.2.4.16)
               113780: MNT-12240 : Loading of available Tags is slow at 'Edit Properties' -> 'Select Tags' dialog.
                  - limited query results sin webscript


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123694 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:33:33 +00:00
Alan Davis
9aea46c7ae Merged 5.1.N (5.1.1) to HEAD (5.2)
122983 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      122910 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         122808 adavis: MNT-15738 Property to disable transformers by use (e.g. doclib thumbnail generation) in 4.2 is not working
            - Allow 'use' style properties to be set
            - Combine 'use' properties more flexibly with the default ones.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123686 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:32:22 +00:00
Alan Davis
c6eef005f3 Merged 5.1.N (5.1.1) to HEAD (5.2)
122735 adragoi: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      122668 aleahu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         122625 aleahu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            122548 rmunteanu: Merged DEV to V4.2.6 (4.2.6)
               122546: MNT-14204: Enterprise bulkimport tool is not versioning for inplace import from two different batches
                  - If only version files are imported, version history is no longer removed and the version number is incremented
                  - Added new in-place import test and updated one streaming import test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123684 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:32:08 +00:00
Alan Davis
bbc9a4ac8b Merged 5.1.N (5.1.1) to HEAD (5.2)
122538 dhulley: Speculative check for null to address failing build (ACE-5143)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123674 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:27:36 +00:00
Alan Davis
d3cc1d0761 Merged 5.1.N (5.1.1) to HEAD (5.2)
122526 dhulley: More explicit recording of attribute keys for multi-threaded test of property value cleaner (ACE-5153)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123673 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:27:29 +00:00
Alan Davis
63501315b7 Merged 5.1.N (5.1.1) to HEAD (5.2)
122482 dhulley: Relax the checking of the last attribute to go in on the thread (ACE-5143)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123668 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:26:54 +00:00
Alan Davis
1f3c23e969 Merged 5.1.N (5.1.1) to HEAD (5.2)
122471 dhulley: PostgreSQL and MySQL fixes for ACE-5143: CLONE - CleanAlfPropTables deleting more than it should
    - New test PropertyValueCleanupTest
    - Generates some data for the script to clean up
    - Concurrently generates attribute values while cleanup script is running
    - Checks that the script cleaned up the orphaned data
    - Checks all newly-generated attributes to ensure that they survived the script in tact
    - The second SQL statement modification can be reverted to produce the failure mode observed in ACE-5143


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123665 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:26:32 +00:00
Alan Davis
06cc11ae36 Merged 5.1.N (5.1.1) to HEAD (5.2)
122216 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      122101 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         122078 amukha: MNT-15654: Un-sharing updates the modified properties of a file
            - Disabled audit during unshare.
            - Added JUnit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123657 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:25:32 +00:00