Commit Graph

777 Commits

Author SHA1 Message Date
Andrei Rebegea
e303d5348c 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/BRANCHES/DEV/5.1.N/root@124938 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-06 14:50:52 +00:00
Andrei Rebegea
5dbcd554d2 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/BRANCHES/DEV/5.1.N/root@124936 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-06 14:50:26 +00:00
Andrei Rebegea
7dd9c0636b 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/BRANCHES/DEV/5.1.N/root@124935 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-06 14:49:49 +00:00
Raluca Munteanu
33cc415ab0 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/BRANCHES/DEV/5.1.N/root@124703 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-01 08:27:45 +00:00
Raluca Munteanu
c9f13752c3 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/BRANCHES/DEV/5.1.N/root@124582 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-30 08:01:49 +00:00
Alexandra Leahu
363efe70ae 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/BRANCHES/DEV/5.1.N/root@124492 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-25 13:14:00 +00:00
Alexandra Leahu
25d3a86f0b 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/BRANCHES/DEV/5.1.N/root@124491 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-25 13:13:42 +00:00
Andreea Dragoi
6d9504bb1c 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/BRANCHES/DEV/5.1.N/root@124374 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-22 14:39:32 +00:00
Andreea Dragoi
77cbbce481 MNT-15909: 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/BRANCHES/DEV/5.1.N/root@124313 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-21 15:24:58 +00:00
Ramona Neamtu
88c3c0e730 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/BRANCHES/DEV/5.1.N/root@124303 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-21 13:05:37 +00:00
Ancuta Morarasu
0e2d8b083a 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/BRANCHES/DEV/5.1.N/root@124237 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 13:00:05 +00:00
Ancuta Morarasu
45c9d15805 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/BRANCHES/DEV/5.1.N/root@124236 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 12:57:18 +00:00
Ramona Neamtu
4842e4c4df Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
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/BRANCHES/DEV/5.1.N/root@124143 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-16 14:23:30 +00:00
Ramona Neamtu
44b9155c7a Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
124119 gjames: MNT-15830: Moved DynamicallySizedThreadPoolExecutorTest to alfresco-core


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@124142 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-16 14:23:17 +00:00
Ancuta Morarasu
0bedf1813d 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/BRANCHES/DEV/5.1.N/root@124096 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 15:06:16 +00:00
Ancuta Morarasu
5ad98616ca Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
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/BRANCHES/DEV/5.1.N/root@124094 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 15:04:08 +00:00
Ancuta Morarasu
4d73aa02c2 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/BRANCHES/DEV/5.1.N/root@124091 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 14:59:50 +00:00
Ancuta Morarasu
df3a28d0cc 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/BRANCHES/DEV/5.1.N/root@124089 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 14:59:04 +00:00
Ancuta Morarasu
fd2ea599b0 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/BRANCHES/DEV/5.1.N/root@124088 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 14:58:44 +00:00
Ancuta Morarasu
94cdf0dc06 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/BRANCHES/DEV/5.1.N/root@124087 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 14:58:21 +00:00
Ancuta Morarasu
f74239ffff 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/BRANCHES/DEV/5.1.N/root@124085 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 14:57:39 +00:00
Alan Davis
ac86882aee Reverse merged 5.1.N (5.1.1) to get a green build
123552: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123511 mward: MNT-15815: fix failing test due to prefix clash,
         123550: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123490 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               123221 mward: ACE-5120: further fixes (ADMLuceneTest),
         123549: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123489 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               123148 mward: ACE-5120: change NS prefix in test to avoid clash,
         123548: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123488 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               123145 mward: ACE-5120: fix ADMLuceneCategoryTest,
         123547: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123487 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               123142 mward: ACE-5120: further test fixes,
         123546: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123486 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               123028 mward: ACE-5120: test fixes,
         123545: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123483 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               123000 mward: ACE-5120: Dictionary should not allow duplication of namespace prefixes,
         123543: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            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/BRANCHES/DEV/5.1.N/root@123739 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 10:16:48 +00:00
Alan Davis
666a4bd587 Tidy up after merge from 5.1.N to HEAD
- This batch are to do with Mark's commits and reverts
     The 5.1.N 119393 record only merge should have had some changes from HEAD 118791

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123732 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 00:05:06 +00:00
Andrei Rebegea
6ca2b29df0 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
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/BRANCHES/DEV/5.1.N/root@123550 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 15:35:49 +00:00
Andrei Rebegea
9688b1ffd6 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
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/BRANCHES/DEV/5.1.N/root@123548 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 15:33:29 +00:00
Andrei Rebegea
5cc6af9956 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
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/BRANCHES/DEV/5.1.N/root@123547 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 15:33:09 +00:00
Andrei Rebegea
f3accd27c6 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
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/BRANCHES/DEV/5.1.N/root@123546 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 15:32:53 +00:00
Andrei Rebegea
7214438240 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
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/BRANCHES/DEV/5.1.N/root@123543 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 15:31:55 +00:00
Alan Davis
da58d9fe29 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/BRANCHES/DEV/5.1.N/root@123502 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-10 20:33:58 +00:00
Alan Davis
c6919d115a Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
123406 adavis: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      123405 adavis:       Reverse merged V4.2-BUG-FIX (4.2.7)
               123400 adavis: Merged 5.0.N (5.0.4) to V4.2-BUG-FIX (4.2.7)
                  123386 adavis: MNT-14295 TransformerConfigLimits Behavior Differs on Java 7 vs 8
                     - Fix TransformerConfigLimits.setTransformationLimitsFromProperties(...)
                       so that it does not clear the limit (e.g. readLimitTimeMs) when setting
                       the max value (e.g. timeoutMs) or the other way around. It is normal to
                       have both values defined for the default.transformer. 
                     - 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 not impacted by MapEntry order.
                     - Enhanced the debug and toString methods in order to trace the problem.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123407 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-09 23:29:42 +00:00
Alan Davis
76dc3c06f5 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
123386 adavis: MNT-14295 TransformerConfigLimits Behavior Differs on Java 7 vs 8
      - Fix TransformerConfigLimits.setTransformationLimitsFromProperties(...)
        so that it does not clear the limit (e.g. readLimitTimeMs) when setting
        the max value (e.g. timeoutMs) or the other way around. It is normal to
        have both values defined for the default.transformer. 
      - 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 not impacted by MapEntry order.
      - Enhanced the debug and toString methods in order to trace the problem.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123402 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-09 19:31:53 +00:00
Ancuta Morarasu
12f7eeba90 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/BRANCHES/DEV/5.1.N/root@123152 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-07 11:14:26 +00:00
Alan Davis
927878fba2 Merged 5.1.0 (5.1.0) to 5.1.N (5.1.1)
122919 jphuynh: Merged SAVA/BRANCHES/ACE-5162 (5.1.0) to 5.1.0 (5.1.0)
      122838 sdinuta: ACE-5162: commited the changes for the solution before internal review


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123118 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-04 15:01:45 +00:00
Raluca Munteanu
06dc388d3d 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/BRANCHES/DEV/5.1.N/root@122983 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-02 13:04:05 +00:00
Andreea Dragoi
6a3df9f323 Merged HEAD (5.1) to 5.1.N (5.1.1)
122918 adragoi:       Reverse merged HEAD (5.1)
            122540 adragoi: Merged DEV to HEAD (5.1)
               122252 ACE-5093 : Allow file content URLs to be generated by a provider
                  - implemented TimeBasedFileContentUrlProvider,VolumeAwareFileContentUrlProvider  and test classes
               121979 ACE-5093 : Allow file content URLs to be generated by a provider
                  - added deprecated annotation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122921 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-01 10:49:17 +00:00
Andreea Dragoi
1e7347116d 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/BRANCHES/DEV/5.1.N/root@122735 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-26 07:46:12 +00:00
Alexandra Leahu
f8473165df Merged HEAD (5.1) to 5.1.N (5.1.1)
122540 adragoi: Merged DEV to HEAD (5.1)
      122252 ACE-5093 : Allow file content URLs to be generated by a provider
         - implemented TimeBasedFileContentUrlProvider,VolumeAwareFileContentUrlProvider  and test classes
      121979 ACE-5093 : Allow file content URLs to be generated by a provider
         - added deprecated annotation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122579 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-22 15:12:43 +00:00
Derek Hulley
7f49e20a93 Speculative check for null to address failing build (ACE-5143)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122538 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-22 10:56:48 +00:00
Derek Hulley
bc78b5113a 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/BRANCHES/DEV/5.1.N/root@122526 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-19 17:47:18 +00:00
Derek Hulley
1f1678cc47 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/BRANCHES/DEV/5.1.N/root@122482 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-19 11:11:17 +00:00
Derek Hulley
db7a5ec02a 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/BRANCHES/DEV/5.1.N/root@122471 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-19 02:01:13 +00:00
Ramona Neamtu
d7dd06fac3 Merged HEAD (5.1) to 5.1.N (5.1.1)
122265 slanglois: Merged 5.1.0 (5.1.0) to HEAD (5.1)
      122178 slanglois: Merged DEV/ACE-5111 to 5.1.0
         122171: ACE-5111 CMIS dictionary loading fails to resolve prefix for Smart Folders 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122361 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-17 12:01:10 +00:00
Ramona Neamtu
eb7bc51e00 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/BRANCHES/DEV/5.1.N/root@122216 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-15 14:00:52 +00:00
Ramona Neamtu
6200e0675e Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
121772 amorarasu: Merged DEV to 5.0.N (5.0.4)
      120891 121263 amorarasu: MNT-14951: Using CMIS it is not possible to retrieve the secondary or the list of the parents of a folder
         - Changed getObjectParents() to return all the parents, not just the first one.
         - Added junit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121800 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-03 09:37:29 +00:00
Ramona Neamtu
704e64cfc0 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
121764 nsmintanca: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      121709 rneamtu: Merged DEV to V4.2-BUG-FIX (4.2.7)
         121670 rneamtu: MNT-13814 : Using MS word Save As pdf does not work correctly.
            - Added new mimetype "application/applefile" and set it for files that starts with "._"
            - Added new test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-03 09:36:42 +00:00
Raluca Munteanu
9f2d3441df Merged HEAD (5.1) to 5.1.N (5.1.1)
121650 sdinuta: CM-710: Merged from alfresco/BRANCHES/DEV/VF_REP_INT_51/root into/alfresco/HEAD/root


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-29 14:49:19 +00:00
Raluca Munteanu
81128204c6 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
121496 arebegea: MNT-14409 : Unable to configure search filter for TAG/SITE via extension
      - Modified the SolrFacetConfig QName resolver to use the FacetQNameUtils that was also used when added a filter from Share
      - Had to move the FacetQNameUtils and the test class FacetQNameUtilsTest to repository project
      - Added the FacetQNameUtilsTest test to the AllUnitTestsSuite


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-28 13:11:37 +00:00
Ramona Neamtu
8d05a12205 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120555: Merged DEV to 5.0.N (5.0.4)
      120544 rneamtu: MNT-13723 : Error message not clear, when de-activating a model dynamically deployed and content still exists.
         - Added externalized error message, generic for both delete and deactivate
         - Do not merge this forward, it will be merged manually
   120572: MNT-13723 : Error message not clear, when de-activating a model dynamically deployed and content still exists.
      - Fixed failing tests
      - Do not merge this forward, it will be merged manually

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121494 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-27 09:58:37 +00:00
Ancuta Morarasu
6471ae8b38 Merged HEAD (5.1) to 5.1.N (5.1.1)
120966 jkaabimofrad: ACE-4994: Removed the local cache to avoid issues when updating the custom model in a clustered env.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120982 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-18 09:37:15 +00:00
Ancuta Morarasu
2dd522eb64 Merged HEAD (5.1) to 5.1.N (5.1.1)
120953 jkaabimofrad: An attempt to fix build failure in Bamboo which appeared by r120912.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120981 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-18 09:36:54 +00:00