Commit Graph

2894 Commits

Author SHA1 Message Date
Alan Davis
b9ab82bd33 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61357: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      61292: MNT-10608 : java.net.SocketException: Software caused connection abort: recv failed
      'IOException' exception is now handled in the same way as 'JSONException' exception. No more exceptions are thrown.
      Also license header has been added


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62413 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 15:12:46 +00:00
Alan Davis
34f6abe455 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61122: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60991: Merged DEV to V4.2-BUG-FIX
      60325 : MNT-10404 : Runas problem in workflow when package contains versioned content
       Added some unit tests. 
      60443 : MNT-10404 : Runas problem in workflow when package contains versioned content
       Added tests, debug log. Run work as system user in VersionableAspect. 
      60452 : MNT-10404 : Runas problem in workflow when package contains versioned content
       Wrap debug statements. 
      60492 : MNT-10404 : Runas problem in workflow when package contains versioned content
       Fix if statement indents. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62387 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:54:12 +00:00
Alan Davis
2c94cd7672 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61048: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60930: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         60804: MNT-9595: Merged DEV to V4.1-BUG-FIX (4.1.8)
            57553: MNT-9595: Tag manager cannot find tags past the value of solr.query.maximumResultsFromUnlimitedQuery
               - Tag queries are unlimited. Make paginator in ConsoleTagManagement to fetch data by portions for tags actually displayed.
            57586: MNT-9595: Tag manager cannot find tags past the value of solr.query.maximumResultsFromUnlimitedQuery
               -  Do filter by tag name on SOLR side.
            60643: MNT-9595: Tag manager cannot find tags past the value of solr.query.maximumResultsFromUnlimitedQuery
               -  Prepend wildcard to the filter to match the old contains behaviour. Add unit tests for the tag and category filtering.
            60765: MNT-9595: Tag manager cannot find tags past the value of solr.query.maximumResultsFromUnlimitedQuery
               -  Add test for wildcard matches support.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62380 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:48:36 +00:00
Alan Davis
765dbc4c41 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60936: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60809: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         60792: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2014_01_08 to BRANCHES/DEV/V4.1-BUG-FIX:
            60183: MNT-10373 : WebDAV - Repeat save of existing text documents into Alfresco on Mountain Lion loses version history
         Also, added test to RenameShuffleDetectionTest.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62371 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:43:06 +00:00
Alan Davis
dfa6af3f08 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60606: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60485: Increased ThumbnailServiceTest retry count during async. checking.  Fixed spelling and removed unused code.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62339 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:17:03 +00:00
Alan Davis
94d38928d4 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60596: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60363: Merged DEV to V4.2-BUG-FIX (4.2.2)
         58124: Added missing transaction(s) in SOLRTrackingComponentTest (MNT-9806)
         58128: Added missing transaction(s) in MultiTDemoTest (MNT-9806)
         58247: Added missing transaction(s) in TransferServiceToBeRefactoredTest.  Fixed dozens of warnings as well. (MNT-9806)
         58248: Added missing transaction(s) in WikiServiceImplTest.  Fixed code warnings. (MNT-9806)
         58249: Added missing transaction(s) in CalendarServiceImplTest. (MNT-9806)
         58251: Added missing transaction(s) in NodeServiceTest. (MNT-9806)
         58252: Added missing transaction(s) in LockDAOTest. (MNT-9806)
         58253: Added missing transaction(s) in NodeDAOTest. (MNT-9806)
         58257: Added missing transaction(s) in SOLRDAOTest. (MNT-9806)
         58259: Added missing transaction(s) in ReplicationRestApiTest (MNT-9806)
         58260: Added missing transaction(s) in RunningActionRestApiTest (MNT-9806)
         58304: Added missing transaction(s) in UnlockMethodTest (MNT-9806)
         58368: Added missing transaction(s) in UnlockMethodTest (MNT-9806)
         58892: Added missing transaction(s) in NodeServiceTest (MNT-9806)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62327 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:09:43 +00:00
Alan Davis
ac592962e7 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60578: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60246: Merged DEV to V4.2-BUG-FIX
      59624 : MNT-10176 : Cmisaction:setContent: No minor version created
       Create a new version when execute "Set content stream" or "update properties" actions in CMIS workbench. Add new unit test. 
      59749 : Merged DEV
       59276 : MNT-10175 : CMIS 1.1 API: Two versions are created after appending content stream with isLastChunk=true
         Create new version of document only on appending last chunk of content
       59656 : MNT-10175 : CMIS 1.1 API: Two versions are created after appending content stream with isLastChunk=true
         Test for versioning around content appending 
      60185 : MNT-10176 : Cmisaction:setContent: No minor version created
       Fix some unit test. 
      60218 : MNT-10176 : Cmisaction:setContent: No minor version created
      Corrected TestCMIS.testVersioning. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62312 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:01:07 +00:00
Alan Davis
5e40b14b72 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60367: BDE-195 Also run PutMethodTest in remote-api


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 13:59:35 +00:00
Alan Davis
88b52164fb Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60186: BDE-195 Gave up fixing Alfresco, and just run the same test suites as the Ant build in the Maven build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62299 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 12:51:44 +00:00
Alan Davis
6f87d32e0b Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60131: Merged V4.2-BIG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60130: Merged V4.2.1 (4.2.1) to V4.2-BIG-FIX (4.2.2)
         60129: BDE-239 (4.2) Identify tests starting the repository which are not in suites
            - Merged DEV to Merged DEV to V4.1.2 (4.2.1)
               59645,59650-59651,59653-59654,59663,59750-59751,59754-59755,59758,59762-59763,
         	  59768,59770,59834,59841,59946,60111,60115


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62270 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 10:27:41 +00:00
Alan Davis
fce91fea94 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60032: Merged BRANCHES/DEV/43UIDEV to HEAD-BUG-FIX:
      This branch contained the Aikau and Surf framework updates implemented during the development hiatus post-4.2 completion. This features the change of Surf from 1.2.0 to Surf 1.2.1 which is for v4.3 releases only.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62260 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 10:12:44 +00:00
Alan Davis
4b75744151 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60017: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59976: WebDAV: AccessDenied exceptions should not have stack traces logged.
      A general fix, but also relevant to MNT-10380 in particular.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62254 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:59:14 +00:00
Alan Davis
3fb2fdf48d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60016: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59975: MNT-10380: (WebDAV) access denied when attempting to rename file should result in error message.
      Previously fixed for same issue (was ALF-14398) but lost (most likely during a large merge).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62253 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:58:23 +00:00
Alan Davis
0bf76c704d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60009: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59939: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         59871: MNT-10037 : WebDAV PutMethod needs better test coverage
         Corrected the fix to correspond to WebDAV spec.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62246 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:53:19 +00:00
Alan Davis
3deba7f983 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60007: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59937: Revert the reverse
         59870: Reverse merged
            << Caused build error https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-129 >>
            59804: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
               59711: Merged DEV to V4.1-BUG-FIX (4.1.8)
                  58460: MNT-10037 : WebDAV PutMethod needs better test coverage
                  Implemented the tests for WebDAV PUT method.
                  58834: MNT-10037 : WebDAV PutMethod needs better test coverage
                  Added test files.
                  59499: MNT-10037 : WebDAV PutMethod needs better test coverage
                  Fixed the testPutNullContent test.
                  59501: MNT-10037 : WebDAV PutMethod needs better test coverage
                  Fixed formatting.
            59806: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
               59716: MNT-10037 : WebDAV PutMethod needs better test coverage
               Changed the fallout of the PutMethod.executeImpl() to run in the same transaction to prevent deadlock.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62244 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:51:38 +00:00
Alan Davis
9d073ea7ee Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59903: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59870: Reverse merged
         << Caused build error https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-129 >>
         59804: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
            59711: Merged DEV to V4.1-BUG-FIX (4.1.8)
               58460: MNT-10037 : WebDAV PutMethod needs better test coverage
               Implemented the tests for WebDAV PUT method.
               58834: MNT-10037 : WebDAV PutMethod needs better test coverage
               Added test files.
               59499: MNT-10037 : WebDAV PutMethod needs better test coverage
               Fixed the testPutNullContent test.
               59501: MNT-10037 : WebDAV PutMethod needs better test coverage
               Fixed formatting.
         59806: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
            59716: MNT-10037 : WebDAV PutMethod needs better test coverage
            Changed the fallout of the PutMethod.executeImpl() to run in the same transaction to prevent deadlock.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62223 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:34:26 +00:00
Alan Davis
3200944b6d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59902: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59806: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         59716: MNT-10037 : WebDAV PutMethod needs better test coverage
         Changed the fallout of the PutMethod.executeImpl() to run in the same transaction to prevent deadlock.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62222 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:33:33 +00:00
Alan Davis
f4fbca5c90 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59901: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59804: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         59711: Merged DEV to V4.1-BUG-FIX (4.1.8)
            58460: MNT-10037 : WebDAV PutMethod needs better test coverage
            Implemented the tests for WebDAV PUT method.
            58834: MNT-10037 : WebDAV PutMethod needs better test coverage
            Added test files.
            59499: MNT-10037 : WebDAV PutMethod needs better test coverage
            Fixed the testPutNullContent test.
            59501: MNT-10037 : WebDAV PutMethod needs better test coverage
            Fixed formatting.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62221 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:32:42 +00:00
Alan Davis
0bc41d66ce Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59898: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59792: Merged V4.2.1 (4.2.1) to V4.2-BUG-FIX (4.2.2)
         59780: Merged DEV to PATCHES/V4.2.1 (4.2.1)
            58668 : MNT-10074 : Impossible to use CMIS AtomPub binding when Kerberos is enable
               - Kerberos filter should correctly restart authentication using Negotiate method if Basic was recieved.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62217 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:30:12 +00:00
Alan Davis
9fb192e164 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59890: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59681: Merged DEV to BRANCHES/DEV/V4.2-BUG-FIX
         59679: Fix to issue where search page thumbnail generation had not been updated to take advantage of the lastThumbnailModification changes from 4.2 - and was missing out on images thumbnails for many documents.
                Fix to font size issue identified by JN.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62209 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:23:22 +00:00
Alan Davis
00ea545219 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59730: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59498: Merged DEV to V4.2-BUG-FIX (4.2.1)
         59316: MNT-10300 : recover site name with existing sitename
            - Throw WebScriptException and set status to 409 on duplicate child node name


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62173 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 02:12:10 +00:00
Alan Davis
205f1f0ffc Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59553: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59432: Change Norwegian locale from nb_NO to just nb for MNT-9954. Also adds Norwegian to web-client-config.xml (it should have been there but was missing for some reason)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62164 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 02:03:43 +00:00
Alan Davis
95231af7af Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59526: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59400: Merged DEV to V4.2-BUG-FIX (4.2.1)
         59385 : MNT-10277 : REST API: When updating blog post via WebScript 200 response is returned but blog post is not updated in fact
            - BlogPut webscript should returne 400 Bad request when blog post is updated. This web script was desinged for updating external blog configuration


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62143 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:38:38 +00:00
Alan Davis
2af8cbd705 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59474: BDE-195: bring back BulkImportTest into its own JVM + filter out CommentsApiTest, not run in Ant (for now?)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62139 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:35:27 +00:00
Alan Davis
1c85126896 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59381: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59356: Merged DEV to V4.2-BUG-FIX (4.2.1)
         59354 : MNT-10271 : Alfresco Webscript - copy-to return wrong name 
            - Return Id of copied node on copy-to-webscript success


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62134 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:31:17 +00:00
Alan Davis
c21e64b37a Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59349: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59348: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         59346: MNT-9771: Merged V4.1.7 (4.1.7.1) to V4.1-BUG-FIX (4.1.8)
            59313: MNT-10231 : CLONE: Version History shows incorrect creator for previous versions
               -  Java-backed webscript CommentsPost added. Also auditable behavior is disabled around creating comment-node
            59326: MNT-10231 : CLONE: Version History shows incorrect creator for previous versions
               -  Posting activity item added to CommentsPost web-script. Also copyright message and comments added, @since changed to 4.1.7.1
            59334: MNT-10231: Merged DEV to V4.1.7 (4.1.7.1)
               56938: MNT-9771 : Version History shows incorrect creator for previous versions
                  - Added a test to reproduce this issue


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62132 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:29:42 +00:00
Alan Davis
be6f4be740 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
44130c06af 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
fd8771e7aa 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
07eb61ba0f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59255: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59234: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         59230: MNT-10236: Merged V4.1.3 (4.1.3.19) to V4.1-BUG-FIX (4.1.8)
            58548: MNT-10066: BFSIT - Auto-complete target field causes Solr to become unresponsive
            The auto-complete feature of target field has been removed from BFSIT


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62119 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:18:59 +00:00
Alan Davis
6745a4ac5f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59253: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59199: Reverse Merged as it caused regression MNT-10075
         55285: Merged BRANCHES/DEV/BELARUS/HEAD-2013_08_27 to BRANCHES/V4.2:
             55068: ALF-19915 : MT and WebDAV: Content is lost when uploading non-empty document


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62117 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:17:23 +00:00
Alan Davis
361b3abd03 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59168: BDE-195 ALF-20697 Change order of execution of tests to prevent 25 failures


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62107 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:09:25 +00:00
Alan Davis
1da4e0056a Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59121: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59106: Merged DEV to V4.2-BUG-FIX (4.2.1)
         57540: MNT-9883: Consumer can add document comments via API, bypasses UI security checks
          - Only users with 'AddChildren' permission can start discussions. 
         58305: MNT-9883: Consumer can add document comments via API, bypasses UI security checks
          - Add unit test 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62101 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:04:42 +00:00
Alan Davis
6abd0b0857 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59075: BDE-195: Exclude NodeLocatorWebScriptTest from Maven build: it fails and does not run in Ant


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62091 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:56:53 +00:00
Alan Davis
8fc625e2de Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59073: BDE-195 Exclude prefixed.DictionaryRestApiTest from Maven build: it fails and does not run in Ant


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62090 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:56:07 +00:00
Alan Davis
c26d709423 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59064: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59042: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         58919 : MNT-9205 : Search by IM property with spaces doesn't work
            - Using correct regexp to split search term. Added a test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62089 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:55:21 +00:00
Alan Davis
8f5df07015 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59048: ALF-13291 - Transfer target is still displayed in replication job despite of target was deleted
      build fix.   fix incomplete.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62081 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:48:56 +00:00
Alan Davis
c86c75e8ce Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59032: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58997: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         58896: Merged DEV to V4.1-BUG-FIX (4.1.8)
            58426 : MNT-10035 : DELETE thumbnails webscript returns 500 Error: "Cannot locate template processor for template org/alfresco/repository/thumbnail/thumbnail.delete.json"
                - Files to delete thumbnail was added


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62076 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:45:04 +00:00
Alan Davis
4e4dfbd429 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58797: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (4.3)
      58795: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1) for ALF-19407
         58793: MNT-10136 Fix Maven poms: bring back chemistry-tck-atompub and junit as compilation dependencies, since CMISTestRunnerWebScript depends on them and is not a test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62036 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:13:09 +00:00
Alan Davis
43ca0651e9 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58765: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58763: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         58759: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8)
            58711: MNT-10136 CLONE - CMIS TCK Test failed
               - Restored POST: http://servername:8080/alfresco/service/cmis/test was lost when test were moved to test-java


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62032 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:10:00 +00:00
Alan Davis
8270475ea1 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58662: BDE-195 Fix tests in Maven build
     FTPServerTest: change ftp.port to run unprivileged
     ContentUtilsTest: put resources in the right place
     remote-api: filter out org.alfresco.repo.cmis.ws.test, never run


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62013 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:55:03 +00:00
Alan Davis
391a5e38c7 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58410: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58348: ALF-18620: WebDAV: Changing case of folder leads to error


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61982 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:30:02 +00:00
Alan Davis
e3fc5681c1 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58408: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58267: MNT-7514 : Merged DEV to V4.2-BUG-FIX
       58142 : MNT-7514 : Uninformational error message on move when file name conflicts
        Added new failure message if file exists. 
       58263 : MNT-7514 : Uninformational error message on move when file name conflicts
        Was corrected showing failure message for copy/move a file or folder. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61981 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:29:14 +00:00
Alan Davis
1c16fb1c65 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
Alan Davis
13589c4481 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58364: BDE-195 Exclude tests in Maven build which are not executed in Ant


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61968 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:18:53 +00:00
Alan Davis
53366c7e59 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58327: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58317: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         58291: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8)
            58227: 58123: MNT-9992 : Using CMIS authentication using "ROLE_TICKET" or user "null" of "" does not work any more.
               - Removed check to see if already authenticated - Andy suggested


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61964 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:15:46 +00:00
Alan Davis
a9b65c3715 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58325: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58315: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         58290: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8)
            58183: Merged DEV to V4.1.7 (4.1.7)
               58123: MNT-9992 : Using CMIS authentication using "ROLE_TICKET" or user "null" of "" does not work any more.
                Added authentication using ticket in AuthenticationFilter.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61962 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:14:14 +00:00
Alan Davis
349356d20c Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58201: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58101: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
          58100: Build/test fixes after R 58059 revised fix for MNT-9794   Authorities with duplicate names can be easilly created using « AuthorityService »


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61940 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:54:36 +00:00
Alan Davis
c73ea33431 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58166: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58051: Merged DEV to V4.2-BUG-FIX (4.2.1)
         57691: MNT-9915: (CLONE) Working copies are open in read-only mode when using Webdav online edit
            Added unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61931 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:47:07 +00:00
Alan Davis
7067a8e2e8 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58157: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57990: Merged DEV to V4.2-BUG-FIX (4.2.1)
         57207 : MNT-9777 : MS Office Documents Edited and attempted to save with MS Office 2011 for Mac apps over WebDAV causes Word to Crash
            - Changing check `is sourceParentNodeRef not equals to destParentNodeRef` to` is sourceFileInfo not euqals to destFileInfo`
         57592 : MNT-9777 : MS Office Documents Edited and attempted to save with MS Office 2011 for Mac apps over WebDAV causes Word to Crash
            - Added test for Shuffle WebDAV move within the same folder . Also added test for MNT-6480 fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61922 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:39:45 +00:00