Commit Graph

13 Commits

Author SHA1 Message Date
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
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
0357d35817 Merged 5.1.N (5.1.1) to HEAD (5.1)
121494 rneamtu: 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/HEAD/root@123643 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:41:53 +00:00
Alan Davis
9f4fdeb0e4 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115457 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      113252 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         113201 vshikunets: MNT-11220: Access Denied thrown if model is missing
            - Fixed build failure. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115667 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:10:02 +00:00
Alan Davis
3114f75a0d Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115456 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      113249 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         113035 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            112991 pyurkevich: MNT-11220 : Access Denied thrown if model is missing
               - Fixed build failure.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115666 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:09:55 +00:00
Alan Davis
4948a79966 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115455 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      113248 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         113032 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            112701 vshikunets: Merged DEV to V4.2-BUG-FIX (4.2.6).
               112128: MNT-11220: Access Denied thrown if model is missing. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115665 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:09:47 +00:00
Alan Davis
62d972f622 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108044: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      107731: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
         107679: MNT-13820 "Model can be deactivated with a node referencing the model is in trashcan"
         Use the database to check if model is in use, rather than Search
         Fix up existing tests in light of these changes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108075 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-09 22:12:29 +00:00
Alan Davis
3929596255 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94232: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94116: MNT-13089 Reinstate the tests that had been disabled on SQLServer, before we understood the problem was with transaction isolation
      Reverted following commits:
         93292: Disabled org.alfresco.repo.admin.RepoAdminServiceImplTest#testConcurrentDynamicModelCreate in case of SQL Server
         93342: Disabled org.alfresco.repo.admin.RepoAdminServiceImplTest#testConcurrentDynamicModelDelete in case of MS SQl Server.
         93522: Disabled org.alfresco.repo.node.archive.ArchiveAndRestoreTest#testInTransactionRestore and org.alfresco.repo.node.archive.ArchiveAndRestoreTest#testInTransactionPurge in case of MS SQL Server.
         93680: Disabled org.alfresco.repo.rendition.RenditionServiceIntegrationTest.testCompositeReformatAndResizeRendition in case of SQL Server
         93772: Disabled for MS SQL Server AuthenticationTest.testLoginNotExistingTenant, RenditionServiceIntegrationTest.testALF3733, RenditionServiceIntegrationTest.testJavascriptAPI.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95059 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:35:56 +00:00
Alan Davis
d40f2568b0 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93378: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93342: MNT-13089: RepoAdminServiceImplTest hangs on SQL Server
      Disabled org.alfresco.repo.admin.RepoAdminServiceImplTest#testConcurrentDynamicModelDelete in case of MS SQl Server.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94958 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:22:10 +00:00
Alan Davis
c3d26637a4 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93367: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93292: Merged DEV (5.0.1) to 5.0.N (5.0.1)
         93020: MNT-13089: RepoAdminServiceImplTest hangs on SQL Server
         Disabled org.alfresco.repo.admin.RepoAdminServiceImplTest#testConcurrentDynamicModelCreate in case of SQL Server.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94953 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:21:08 +00:00
Alan Davis
893c902a2d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58390: Added more tests to ownJVMCategory


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61973 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:22:57 +00:00
Mark Rogers
c3ea90dbc5 add comment to unit test so we can see which assert is failing.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56428 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-09 14:14:16 +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