Commit Graph

9 Commits

Author SHA1 Message Date
Cristian Turlica
fa37265633 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/BRANCHES/DEV/5.2.N/root@125036 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-08 14:39:34 +00:00
Tatyana Valkevych
7dd2291753 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      107413: Merged DEV to 5.0.N (5.0.3)
         106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Cleaning of Javadoc,
   107565: MNT-13545 Fix compilation after merge of Javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-02 16:13:03 +00:00
Alan Davis
72662536a7 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60595: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60362: Merged DEV to V4.2-BUG-FIX (4.2.2)
         58112: Added missing transaction(s) in CheckOutCheckInServiceImplTest (MNT-9806)
         58113: Added missing transaction(s) in LockableAspectInterceptorTest (MNT-9806)
         58114: Added missing transaction(s) in LockableAspectInterceptorTest (MNT-9806)
         58115: Added missing transaction(s) in TransactionCleanupTest (MNT-9806)
         58116: Added missing transaction(s) in GetChildrenCannedQueryTest (MNT-9806)
         58118: Added missing transaction(s) in RatingServiceIntegrationTest (MNT-9806)
         58119: Added missing transaction(s) in ReplicationServiceIntegrationTest (MNT-9806)
         58121: Added missing transaction(s) in PersonTest (MNT-9806)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62326 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:08:49 +00:00
Alan Davis
03b22967cc Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58467: Categorized some spring tests so they run in the same vm successfully


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61988 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:35:21 +00:00
Alan Davis
068939e250 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58376: Added additional tests to ownJVMCategory


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61971 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:20:56 +00:00
Alan Davis
69811b41dc Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57086: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56571: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         56392: Merged DEV to V4.1-BUG-FIX (4.1.7)
            56379 : MNT-9502 : Unlocking working copy leaves node in an unacessible and undefined state 
               - Using aspect workingcopy for "Cancel checkout" and "Checkin" actions
               - Unit test to demonstrate fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61715 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 19:23:41 +00:00
Derek Hulley
8fa8216fef Merged DEV to HEAD:
54373: MNT-2641 : User can delete or move a working copy
   54469: Compilation fix for MNT-2641 test
   54470: Removed thousands of tabs
   54523: Fixed ALF-19843: Integrity checking does not enforce mandatory aspects on aspects
   54525: Pull IntegrityChecker properties into property file (ALF-19843)
   54527: Fixed Eclipse warning about potentially unclosed file
   54528: Prevent cm:workingcopy aspect from being removed directly (MNT-2641)
   54529: Nail down behaviour around cm:workingcopy


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54798 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-02 17:45:26 +00:00
Derek Hulley
0d781560bf Fix ALF-19749: NodeService/CopyService interface changes breaks backwards compatibility with add-ons
- This maintains binary compatibility with extensions build before 4.2
 - e.g.  GOOGLEDOCS-235 Unable to deploy latest Google Docs Enterprise AMPs onto 4.2 (HEAD-QA) 
 - Reversed ALF-19217: NodeService and CopyService APIs return modified flags
   We are back to creating redundant versions when duplicate changes are made to data


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54488 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-27 11:12:54 +00:00
Samuel Langlois
ab4ca7177f Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-20 17:17:31 +00:00