Commit Graph

6235 Commits

Author SHA1 Message Date
Ancuta Morarasu
143b52b51c 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/BRANCHES/DEV/5.1.N/root@124145 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-16 14:26:29 +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
Matt Ward
8260fab95e MNT-15815: further test data fix
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@124125 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-16 11:33:11 +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
b4b3069bcf Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
123511 mward: MNT-15815: fix failing test due to prefix clash


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@124092 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 15:02:40 +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
917edf9a8d Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@124090 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 14:59:22 +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
03a2216ff7 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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123552 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 15:38:02 +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
ecb8d45ea9 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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123549 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 15:34:34 +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
Ancuta Morarasu
57562b2557 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
123356 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      123206 adavis: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
         123099 amorarasu: MNT-15798: CLONE - call to guessMimetype() on a node that has no content creates a content property
               Reverse merged V4.2.6 (4.2.6)
                  104274 mbobyleu: Merged DEV (4.2.5) to V4.2-BUG-FIX (4.2.5)
                     102794: MNT-8678 : call to guessMimetype() on a node that has no content creates a content property
                        - add check for empty content before saving a node


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123433 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-10 13:14:11 +00:00
Ancuta Morarasu
80aa1b0ba3 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
123349 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      123109 adragoi: Merged DEV to V4.2-BUG-FIX (4.2.7)
         123105 adragoi: MNT-15705 : CLONE - Receiving error when bulk deleting content in Share
            - created remove overloaded method in script node that uses a new transaction and used it for bulk delete


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123431 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-10 13:13:34 +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
Cristian Turlica
b2789f4f12 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
123182 gjames: MNT-15494: Added a blacklist of attributes (passwords) no longer shown via JMX


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123329 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-09 12:22:33 +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
5b53ff357c Merged 5.1.0 (5.1.0) to 5.1.N (5.1.1)
122920 jphuynh: Merged SAVA/BRANCHES/ACE-5162 (5.1.0) to 5.1.0 (5.1.0)
      122864 sdinuta: ACE-5162: added some logging and made a little change after Bogdan's review


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123119 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-04 15:01:54 +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
779c0fc241 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
122981 rmunteanu: MNT-15167 : PageLimit value no longer pick up in 5.x with or without Transformation Server installed
      - Preserved transformer properties order.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-03 12:00:54 +00:00
Mark Rogers
74686dc957 Merged WOLF-8 (5.1.0) to 5.1.N (5.1.1)
114287 mward: UTF-170: Move TrueZip unmount call to a final block.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122997 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-02 14:52:16 +00:00
Raluca Munteanu
7721384025 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
122911 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      122835 gjames: MNT-15114: Adding invokeBeforeDeleteChildAssociation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122984 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-02 13:04:35 +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
31afcc9f1b Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
122615 rneamtu: Merged DEV to 5.0.N (5.0.4)
      122454 rneamtu: MNT-14602: Add config to support Visio 2013 previews and thumbnails
         - Added support for vsdx mimetype


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122665 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-24 14:55:27 +00:00
Alexandra Leahu
87091fccaa Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
122623 aleahu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      122577 aleahu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
         122484 amukha:       Reverse merged V4.2.6 (4.2.6)
                  118603 amukha: Merged V4.2.3 (4.2.3.21) to V4.2-BUG-FIX (4.2.6)
                     117952 adragoi: MNT-15169 : Receiving error when bulk deleting content in Share
                        - moved deletion in a retrying context 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122653 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-24 14:41:02 +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
Ancuta Morarasu
0689f35f52 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
122474 rneamtu: Merged DEV to 5.0.N (5.0.4)
      122425 rneamtu: MNT-14687 : Creating a document as checkedout and then cancelling the checkout should delete the document
         - fixed cancel editing and delete failures


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122488 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-19 12:25:09 +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
c7c9bbf7f3 Increase the TTL for the property value cleaner to 1 hour (ACE-5153)
- Simplify the lock code because it's not iterative i.e. just lock and unlock


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122472 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-19 02:48:25 +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
Derek Hulley
d433d01b9f Request failure details from SQL execution in method 'PropertyValueDAOImpl.cleanupUnusedValues()' (ACE-5143)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122470 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-19 01:35:14 +00:00
Derek Hulley
509a828b43 Add option to propagate exceptions out during SQL execution, in order to detect failures (ACE-5143)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122469 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-19 01:33:19 +00:00
Derek Hulley
4b0293602c Add back missing code for MNT-12716 in order to address ACE-5143 correctly
- MNT-12716: 3.4 -> 4.2 Upgrade does not migrate locales of translated documents 
 - ACE-5143: CLONE - CleanAlfPropTables deleting more than it should
 - The move of the SQL execution framework to a ScriptExecutor seems to have dropped the feature allowing --ASSIGN to have a default value
 - Added back the feature
 - Added check of variable assignment with system message giving details e.g.
    Caused by: ... Variable assignment '--ASSIGN:PROP_DOUBLE_MAX_ID' produced no value. A default can be assigned e.g. '--ASSIGN:PROP_DOUBLE_MAX_ID!-1'. (line 80 of ...\CleanAlfPropTables.sql).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122467 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-19 01:24:25 +00:00
Ramona Neamtu
9d2679400f Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
122412 nsmintanca: MNT-15642 CLONE - Request to join a moderated site multiple times
      -added validation on backend to prevent multiple requests for joining a site
      -updated unit tests
      -added widget to display "Cancel request" button


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122427 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-18 12:51:10 +00:00