Commit Graph

157 Commits

Author SHA1 Message Date
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
Alan Davis
3ec6b5b747 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83663: ALF-21093 Remove dependency to Apache Axis - it was only used for a util class


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84571 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:12:10 +00:00
Alan Davis
caf361cd61 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83541: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      82261: Merged DEV to V4.2-BUG-FIX (4.2.4)
         80345 : MNT-11990 : vti sharepoint server does not respect If: HTTP headers as defined in rfc2518
            - LockMethod was corrected to prevent lock refresh for non-locked files.
            - Unit test added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84561 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:08:49 +00:00
Erik Winlof
0e73462102 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82414: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80283: ACE-2276 - More clock fixing,


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83251 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 07:04:06 +00:00
Erik Winlof
6bd37d727a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82409: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80276: experiment.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83246 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 07:02:19 +00:00
Erik Winlof
9f7a5d3bfe Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82400: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80250: ACE-2276	 - Update Activiti to 5.16.1


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83240 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 07:00:28 +00:00
Erik Winlof
7954be61aa Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82375: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76480: Re-worked download activity posting following Kev's changes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83218 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:50:52 +00:00
Erik Winlof
3071b55a6a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82371: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76477: Removed the Raise Browser Event logic on webpreview. No longer required.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83215 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:49:39 +00:00
Erik Winlof
1b36f7b4e0 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82288: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      80935: Merged DEV to V4.2-BUG-FIX (4.2.4)
         80901 : MNT-12221 : Due date is not displayed for Pooled Review and Approve task
            - task-delegate duedate property should be used for pooled review and approve workflow.
            - completing fix for ALF-8617 made in revision 28032
      81519: MNT-12221 : Due date is not displayed for Pooled Review and Approve task
         - Fixed build failure.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83201 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:29:55 +00:00
Erik Winlof
22be126dec Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
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.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83142 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:01:21 +00:00
Will Abson
cf79281a30 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
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.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83122 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 18:06:52 +00:00
Will Abson
72f0e836a4 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80736: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78923: ACE-2370: Changed facet config web-scripts URL from /api/solr/facet-config TO /api/facet/facet-config to fix the facets retrieval when Solr SSL is enabled.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83034 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:46:01 +00:00
Will Abson
5bb3de7195 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80729: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78874: Added tests for facet config rest api (Cloud). Part of ACE-1582


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83027 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:44:52 +00:00
Will Abson
ffb416a5f8 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80709: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78667: ACE-1582: Made the facet config service and the relevant web scripts to accept single/multiple value(s) update (to support inline edits).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83007 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:41:45 +00:00
Will Abson
cde57422fc Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80701: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78593: First attempt at fixing FacetRestApiTest to run in bamboo.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82999 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:31:22 +00:00
Will Abson
dcb3bc2934 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80698: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78457: ACE-1582: - Fixed facet's custom properties.
                - Made the GET facets web-script to be accessed by all authenticated users rather than just the Search-Admin/Network-Admin users. 
                - Fixed FacetRestApiTests and added more tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82996 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:30:54 +00:00
Will Abson
14f95a1a31 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80656: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      77535: Adding first JUnit test of facet config rest api. Part of ACE-1582.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82950 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:16:41 +00:00
Will Abson
a4b129feab Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80106: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      79276: Merged DEV to V4.2-BUG-FIX (4.2.4)
         77363: MNT-11964 : Users other than admin are unable to start discussion/link/blog.
         Added additional permission check for site container, required in case if there are no items created yet.
         79160: MNT-11964 : Users other than admin are unable to start discussion/link/blog.
         Added tests to simulate the issue.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82709 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:22:04 +00:00
Will Abson
666bbfba02 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
79277: Merged DEV to HEAD-BUG-FIX
      79272 : MNT-11511 : All tags are not displayed in repository when the number of nodes taggable is over 1000
         - Fixed failures on V5.0


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82696 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:19:55 +00:00
Erik Winlof
fb3b0543ae Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78782: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      78471: Merged dev. V4.2-BUG-FIX-2014_06_06 to V4.2-BUG-FIX (4.2.4)
         73309: MNT-11631: CMIS property isPrivateWorkingCopy not set for the checked out object
           - Property value accessor for 'cmis:isPrivateWorkingCopy' has been implemented. This property is introduced in CMIS 1.1
      78473: MNT-11631: CMIS property isPrivateWorkingCopy not set for the checked out object
         Test for 'cmis:isPrivateWorkingCopy' has been added into 'org.alfresco.rest.api.tests.TestCMIS'. Also this test class has been a bit refactored


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82639 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:55:12 +00:00
Erik Winlof
296077ace3 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78608: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      78477: Merged DEV to V4.2-BUG-FIX (4.2.4)
         76926 : MNT-11931 : Exception when opening Document Details with QuickShare disabled
            - Test that quick share webscripts returns 403 if quick share is disabled 
         76939 : MNT-11931 : Exception when opening Document Details with QuickShare disabled
            - Implement quick share enabled web script. Don't display quick share link if quick share is turned off 
         78462 : MNT-11931 : Exception when opening Document Details with QuickShare disabled
             - Use SingletonValueProcessorExtension to check if quick share is enabled 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82619 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:44:38 +00:00
Erik Winlof
ece89ceea0 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78551: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      77501: Merged DEV to V4.2-BUG-FIX (4.2.4)
         76291 : MNT-11511 : All tags are not displayed in repository when the number of nodes taggable is over 1000
            - Using tagscope api at search for tags quantity in repository


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82595 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:32:55 +00:00
Erik Winlof
eb6e5e1ff0 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78437: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76188: ACE-2149: EOL AVM / WCM
       - Force a type exclusion (act:actionbase) in order to test CMIS type exclusions
       - Originally, all wcm prefixes were ignored and that had been used by the CMIS exclusion test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82563 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:15:25 +00:00
Erik Winlof
eaa84fe057 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78436: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76187: ACE-2149: EOL AVM / WCM
       - Fix DictionaryRestApiTest to use 'cm:' model during testing


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82562 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:15:05 +00:00
Erik Winlof
7599a9b24d Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78432: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76036: Fixed PutMethodTest: Just throw unexpected exceptions in the test so that they are fully reported


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82559 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:14:09 +00:00
Erik Winlof
4e8556fc9b Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78421: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75797: ACE-2149: EOL AVM / WCM
       - Removal from 'remote-api' project


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82553 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:11:32 +00:00
Erik Winlof
0546224e23 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78403: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75700: ACE-2149: EOL AVM / WCM
       - Remove most of the AVM and WCM beans, scripts, classes, patches, etc
       - The Explorer client is very broken for compilation
         - TODO: Remove all WCM-related functionality, which I thought would be best left to a UI dev
                 I've murdered many of the classes and beans but there's more to do
       - The repository compiles
         TODO: Get it running again
       - TODO: Check if we can wipe the 'deployment' project as well


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:01:49 +00:00
Mark Rogers
fb70692bac Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77129: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73474: ACE-1685: aclsReaders.post WebScript now includes denied authorities in results


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77983 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 15:41:36 +00:00
Mark Rogers
53eb8be74a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77127: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73448: Added SubscriptionServiceRestApiTest (not in any suites) to WebScriptTestSuite


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77981 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 15:40:11 +00:00
Mark Rogers
8fbde8d254 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77125: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73446: ACE-1685: added transaction usage to failing test (SOLRWebScriptTest.testAclReadersGet()) and added to TestSuite (test wasn't being run in CI)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77978 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 15:36:03 +00:00
Mark Rogers
874f632d1b Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76575: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76363: MNT-10977: Workflow process retrieval returns incorrect hasMoreItems value
      Additional fix for build failure: https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-452


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77642 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:40:31 +00:00
Mark Rogers
079b879c67 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76573: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76287: MNT-11511 : All tags are not displayed in repository when the number of nodes taggable is over 1000
         - Merge to incorrect branch was removed


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77640 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:39:29 +00:00
Mark Rogers
ffbd5d1143 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76572: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76284: MNT-11511 : All tags are not displayed in repository when the number of nodes taggable is over 1000
         - Added a test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77639 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:38:10 +00:00
Mark Rogers
cd7943b92a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76566: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76181: MNT-10977: Workflow process retrieval returns incorrect hasMoreItems value
      Additional fix for build failure: https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-447


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77632 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:31:56 +00:00
Mark Rogers
615d5bf409 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76562: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76043: MNT-10977: Workflow process retrieval returns incorrect hasMoreItems value
      The fix for build failure: https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-JOB1-446/log


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77629 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:30:17 +00:00
Mark Rogers
fe8594a249 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76558: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      75813: Merged DEV V4.2-BUG-FIX to V4.2-BUG-FIX (4.2.3)
         65552: MNT-10977: Workflow process retrieval returns incorrect hasMoreItems value
           - 'hasMoreItems' value calculation has been modified to take into account skipped elements
         67687: MNT-10977: Workflow process retrieval returns incorrect hasMoreItems value
           - 'org.alfresco.rest.workflow.api.impl.ProcessesImplTest' has been implemented to cover both test cases of the issue


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77625 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:26:48 +00:00
Mark Rogers
b0a30c2155 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76305: Merged EOL2 (5.0.0.EOL2) to HEAD-BUG-FIX (5.0/Cloud)
      76026: ACE-2012 EOL Original SOAP API (CML) - removed. Based on BRANCHES/DEV/EOL:r73833,73932 and CMIS EOL removal merge.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77579 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 14:13:46 +00:00
Mark Rogers
75b6831d2a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75551: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
      74584: Reverse merged HEAD-BUG-FIX (5.0/Cloud)
         << Requires more work on the EOL branch >>
         74416: Merged EOL to HEAD-BUG-FIX (5.0/Cloud)
            74309: ACE-2010 EOL Legacy CMIS Inputs (2) in 5.0
               - Start replacing references to the original CMIS code with Alfresco and chemistry Open CMIS classes 
            74342: ACE-2010 EOL Legacy CMIS Inputs (2) in 5.0
               - Switch ServiceRegistry over to using Open CMIS classes 
            74406: ACE-2010 EOL Legacy CMIS Inputs (2) in 5.0
               << Compiles and starts Share without error >>
               - Removed Original CMIS classes from the repository, remote-api and thor
               - Moved the CMIS.DictionaryBootstrap bean into opencmis-context.xml before removing cmis-api-context.xml
               - Some code was left under:
                   root\projects\remote-api\source\java\org\alfresco\repo\cmis
                   ...........................................................\client
                   ...........................................................\ws
                   ...........................................................\rest
                   ................................test-java\org\alfresco\repo\cmis
                   ................................................................\ws
                   ................................................................\rest
                 Will have to see if it should be be removed too, or if it is common with OpenCMIS
            74407: ACE-2010 EOL Legally CMIS Inputs (2) in 5.0
               - Removed left over code under:
                   root\projects\remote-api\source\java\org\alfresco\repo\cmis
                   ................................test-java\org\alfresco\repo\cmis
               - Removed an authentication URL test in QuickShareRestApiTest which was failing in
                 the same way as the tests above.
               - Removed CXFAuthenticationSystemTest which appears to be using the original CMIS
         74465: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
            74464: ACE-2010 EOL Legacey CMIS Inputs (2) in 5.0
               - New failure in QuickShareRestApiTest
               - CXFAuthenticationSystemTest (deleted) was still referenced in MiscSystemTestSuite


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77489 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 12:58:48 +00:00
Mark Rogers
94597c622a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75514: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      75123: Merged DEV to V4.2-BUG-FIX (4.2.3)
         74367: MNT-11725 : Unable to manage permissions when granted coordinator role.
         Changed the order of adding and deleting a permission for the downgrading of permissions use case.
         75098: MNT-11725 : Unable to manage permissions when granted coordinator role.
         Added a test to simulate the issue.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77476 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 12:47:56 +00:00
Will Abson
ed740060a4 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75057: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      72389: Disabled the testPublishEvent test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75384 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:13:32 +00:00
Will Abson
5ceca11a7b Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75050: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      72319: Various hacks to get around issues with the ant system-build-test classpath


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75378 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:12:42 +00:00
Will Abson
91ca9dbe23 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75035: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      71719: Changed the Raise event test to a POST from a GET


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75363 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:10:45 +00:00
Will Abson
b35bec9108 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75032: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      71716: Added a webscript to raise browser events ACE-1709


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75360 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:10:20 +00:00
Will Abson
0e56806c87 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75030: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      71714: Added a event publishing test to WebDAVHelper


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75358 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:10:04 +00:00
Will Abson
4dff764c22 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75011: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      70370: Cleaned up the solr stats code, added security check and tenants


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75339 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:00:02 +00:00
Will Abson
89c79796cb Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
74317: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      74274: Merged DEV to V4.2-BUG-FIX (4.2.3)
         73971 : MNT-11227 : getObjectResponse does not provide a valid xml response against Alfresco-Core.xsd
             - Changing order of elements in xml response for getObject method


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74897 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 16:34:55 +00:00
Will Abson
db9e0932fa Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
74316: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      74270: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.3)
         73963: Merged DEV to V4.1-BUG-FIX (4.1.10)
            71918: MNT-10156: In Share show appropriate HTTP status codes (such as 403) rather than the default 500
               - Throw WebScriptException with 403 status code on ContentGet layer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74896 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 16:34:46 +00:00
Will Abson
59a74742cc Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
74247: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      73960: Merged DEV to V4.2-BUG-FIX (4.2.3)
         73719: MNT-11586 : bpm:outcome property is not set when completing a task via the workflow public API
         Added "bpm_outcome" variable to completed and resolved tasks.
         Added checks to tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74881 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 16:32:28 +00:00
Will Abson
dab0607e38 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
74034: Merged EOL to HEAD-BUG-FIX (5.0/Cloud)
      73956: ACE-2013 EOL JCR, JCR-RMI, etc in 5.0
         - There are still quite a few JCR references, but some of these are for open CMIS
           and 2 jcrmodel xml files
      74023: ACE-2013 EOL JCR, JCR-RMI, etc in 5.0
         - Repo did not start


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74869 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 16:29:42 +00:00
Will Abson
c84f6847dd Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
73882: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      73714: Merged DEV to V4.2-BUG-FIX (4.2.3)
         73713 : MNT-11688 : Class cast exception when parsing preferences in Test Code.
            - Use Object.toString() for value to prevent Class cast exception


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74828 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 16:11:18 +00:00