Commit Graph

11 Commits

Author SHA1 Message Date
Alan Davis
3e1e1edbaa 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
19fcf2c411 Merged 5.2.N (5.2.1) to HEAD (5.2)
125783 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:45:04 +00:00
Alan Davis
da8101a5ba 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
4b2179865b Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115549 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      112033: Merged 5.0.N (5.0.3) to 5.1.N (5.1.0)
         111936: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            111829: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               111784: Merged DEV to V4.2.5 (4.2.5)
                  111783: MNT-14432 : DB TestPublicAp*TCK failures on DB2, MariaDB, Oracle & SQL Server
                     - Extended QueryLikeTest in order to create test data folder with temporary aspect.,
      112919: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         112547 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            112542: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               111974: Merged DEV to V4.2.5 (4.2.5)
                  111967: MNT-14432 : DB TestPublicAp*TCK failures on DB2, MariaDB, Oracle & SQL Server
                     - skipped deletion of test data,
      114016: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         113902 amorarasu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113818 abozianu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113605 adragoi: Merged DEV to V4.2.5 (4.2.5)
                  113579: MNT-14432 : DB TestPublicAp*TCK failures on DB2, MariaDB, Oracle & SQL Server
                     - skip deletion for test data for QueryForObject and QueryInFolderTest 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115686 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:16:17 +00:00
Alan Davis
b1577072fc Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115466 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      114587 amorarasu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114483 amorarasu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114306 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114282 adragoi: Merged DEV to V4.2.5 (4.2.5)
                  114252: MNT-14432 : DB TestPublicAp*TCK failures on DB2, MariaDB, Oracle & SQL Server
                     - configured cmis tck timeout in tests property file


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115675 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:11:44 +00:00
Alan Davis
b98c2dc6b0 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
105374: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      105132: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         104888: Merged DEV to V4.2-BUG-FIX (4.2.5)
            104492: MNT-10962: Versioning for cmis:document not working initially
               - Use default values in the content model for autoVersion.
               - Test to ensure that version properties for node created via CMIS are set wrt contentModel.
               - TCK is now run with autoVersion=false.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105408 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-06-03 09:00:06 +00:00
Alan Davis
b6c5846e81 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83801: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      83800: MNT-11123: Test failure in TestEnterpriseAtomPubTCK
         - Comment out test as Steven Glover does not have time to look at it.
           JIRA has been open for 1 year. Issue is still assigned to him to fix.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84579 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:14:16 +00:00
Alan Davis
01aba183d1 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83757: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      << Bringing back the commit just reverted. Needed to revert another commit
         80358 which changed pom.xml files to include the correct versions of
   	  external libs including open cmiss 0.11 >>
      80966: Revere merged HEAD-BUG-FIX (5.0/Cloud)
         << Take out all OpenCMIS changes merged to HEAD-BUG-FIX that have come from V4.2-BUG-FIX >>
         80355: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
            << And added alfresco-opencmis-extension 1.0 >>
            79170: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
               << Commit is actually a reverse merge of the original merges from V4.2-BUG-FIX 79113,79128
                  rather than the changes from V4.2-BUG-FIX >>
               79166: Reverse merged V4.2-BUG-FIX (4.2.4)
                  << Need a new version of alfresco-opencmis-extension as 0.9 is incompatible with OpenCMIS 0.11.0
                     and Steve is on holiday for a week. >>
                  << The original commits are already merged to HBF for ACE-484 so will revert them too. >>
                  79070: Merged DEV to V4.2-BUG-FIX (4.2.4)
                     67851: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
                        Updated OpenCMIS to 0.11 version.
                  79120: MNT-11223: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 
                     79117: MNT-11596 Fix dependencies declared in pom files after upgrade of OpenCMIS to 0.11.0, and all related upgrades
         80358: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            79166: Reverse merged V4.2-BUG-FIX (4.2.4)
               << Need a new version of alfresco-opencmis-extension as 0.9 is incompatible with OpenCMIS 0.11.0
                  and Steve is on holiday for a week. >>
               << The original commits are already merged to HBF for ACE-484 so will revert them too. >>
               79070: Merged DEV to V4.2-BUG-FIX (4.2.4)
                  67851: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
                  Updated OpenCMIS to 0.11 version.
               79120: MNT-11223: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 
                  79117: MNT-11596 Fix dependencies declared in pom files after upgrade of OpenCMIS to 0.11.0, and all related upgrades
         80365: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80356: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
               - Commit missed delete of old alfresco-opencmis-extension-0.9 sources/javadoc
         80366: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80337: MNT-11223 follow-up: bring back test dependencies in web-framework-commons pom, to make the Maven build pass again
         80814: MNT-11223: Fix build (pt1)
            - 80366: pom.xml contained a reference to an external surf which is now back in house.
         80858: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80373: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
               - Found another reference to version 0.9 rather than 1.0 of alfresco-opencmis-extensions
         80861: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80397: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            Fixed TestCMIS.testMNT10430. Excluded sys:localized aspect from returned set in CMIS.
         80865: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80840: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            Fix for CMISTCKCRUD test. Added special handling of content stream file name property via accessor.
         80866: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80841: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            Changed Solr to Lucene for tests.
      83745: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
         83699: ACE-484: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) VIA EOL
            81016: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            Fixed TestCMIS to check for secondary types list to be null.
            81017: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            Disabled assert for tests run by maven.
            82255: Merged V4.2-BUG-FIX (4.2.4) to EOL (5.0/Cloud)
               82252: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
               Disabled QueryRootFolderTest.
            - RECORD ONLY merge from V4.2-BUG-FIX extra commits not required on HEAD-BUG-FIX: 80373,80397,80840-80841,81707,81741,82245


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84575 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:13:46 +00:00
Andrew Hind
6db448ebb9 Fix for ALF-19690 CMIS TCK Test Failures
- queries for checked out docs go to the DB

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55865 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-23 19:04:40 +00:00
Steven Glover
bdb6746670 ALF-19690 "CMIS TCK Test Failures": fixed up failing TCK tests for 1.0 and 1.1 endpoints, refactoring of tests to aid in this aim, other fixes for things I found whilst testing, hopefully have addressed CLOUD-2051 too, upgrade alfresco-opencmis-extension (with updated chemistry dependency) to fix transitive dependency issue in maven
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55695 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-19 16:35:41 +00:00
Samuel Langlois
788d3c9c89 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