9 Commits

Author SHA1 Message Date
Alan Davis
b5298918ba Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61361: BDE-180 Refactored the system tests to use the maven tomcat plugin, self-contained alf_data/database and tests running in parallel.
   Removed duplicate freemarker jar.  Now uses the one defined in the repo project
   add JCL for Slf4j
   Fixed failing JmxScriptTest by ensuring that "quick" files are loaded from the classpath
   Changed the unpacking of upstream resources to the "prepare-package" phase
   BDE-249 Separate unit tests in a test suite on their own
      Moved the thor unit tests into their own suite
      Moved the enterprise remote-api unit tests into their own suite
      Moved the enterprise repository unit tests into their own suite
      Moved the webclient unit tests into their own suite
      Moved the wdr unit tests into their own suite
      Moved the repository unit tests into their own suite
      Moved the remote-api unit tests into their own suite
   Change null to "" for freemarker template
   Moved META-INF/services so they get added to the jar
   Speeding up the wcmquickstart client tests, reducing the thread.sleeps().
   Fixed failing date/time tests, remove a redundant test and corrected an import
   Added a h2 profile for running against a h2 database


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62415 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 15:23:04 +00:00
Alan Davis
0144810a6d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59269: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59268: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         59264: MNT-10237: Merged V4.1.6 (4.1.6.4) to V4.1-BUG-FIX (4.1.8) AGAIN!
            58707: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
               58676: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Delete associated groups on callback when archived site is purged. Add unit test for case.
            58895: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
               58855: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix unit tests failure by purging archived sites. Forbid new site creation if site group already exists.
               58871: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Return beforePurgeNode callback binding to Site class.
            58947: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
               58946: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix test failures by purging deleted sites from trashcan so that sitename can be reused. Change SiteServiceImplTest to avoid database deadlock.
            58949: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
               58948: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix test failures by purging deleted sites from trashcan so that sitename can be reused.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62125 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:24:08 +00:00
Alan Davis
dd04a7ebfa Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59267: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (4.3/Cloud)
      59266: Reverse Merge attempt at merging from V4.1-BUG-FIX (will do it again)
         AND record only merge the original commits 59231,59239 and reverse merge 59262 that took place on V4.1-BUG-FIX   
         59237: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
            59231: MNT-10237: Merged V4.1.6 (4.1.6.4) to V4.1-BUG-FIX (4.1.8)
               58895: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
                  58855: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                     - Fix unit tests failure by purging archived sites. Forbid new site creation if site group already exists.
                  58871: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                     - Return beforePurgeNode callback binding to Site class.
               58947: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
                  58946: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                     - Fix test failures by purging deleted sites from trashcan so that sitename can be reused. Change SiteServiceImplTest to avoid database deadlock.
               58949: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
                  58948: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                     - Fix test failures by purging deleted sites from trashcan so that sitename can be reused.
         59240: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
            59239: MNT-10237: Permissions are not restored when a deleted site is recovered from the trashcan
               - The merge of the HF commit on 4.1.6 removed a variable that was not being used, but
                 was being used in later versions.
         59241: MNT-10237: Permissions are not restored when a deleted site is recovered from the trashcan
            - Correct error in merge from V4.1-BUG-FIX to V4.2-BUG-FIX


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62124 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:23:12 +00:00
Alan Davis
8d76c8edf7 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59256: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59237: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         59231: MNT-10237: Merged V4.1.6 (4.1.6.4) to V4.1-BUG-FIX (4.1.8)
            58895: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
               58855: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix unit tests failure by purging archived sites. Forbid new site creation if site group already exists.
               58871: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Return beforePurgeNode callback binding to Site class.
            58947: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
               58946: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix test failures by purging deleted sites from trashcan so that sitename can be reused. Change SiteServiceImplTest to avoid database deadlock.
            58949: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
               58948: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix test failures by purging deleted sites from trashcan so that sitename can be reused.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62120 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:19:54 +00:00
Alan Davis
4d3653f388 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58915: Recategorised some tests which we know aren’t very nice to the Spring context, moved FTPServerTest back in from the cold.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62056 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:29:09 +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
5e2c285efd Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57055: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56523: Merged HEAD-BUG-FIX to V4.2-BUG-FIX (4.2.1)
         56443: (MNT-9756) ALF-19225: Made post feeds cleanup to be executed in the unit test tear down method, to clean Pending, Error and etc. feeds.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61689 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 19:03:22 +00:00
Neil McErlean
6bc9570f65 Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD:
54639: As part of work on ALF-19783, I have added support for versioned nodes to the TemporaryNodes JUnit rule.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54641 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-29 12:51:34 +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