Commit Graph

108 Commits

Author SHA1 Message Date
Will Abson
caf168e07e Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
71592: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70331: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         70280: MNT-10122 : Related to MNT-2234 - Incorrect workflow history when using jBPM
           - Fixed tests failure.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74690 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:10:16 +00:00
Samuel Langlois
9571a2899d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
73022: Merge V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3.0)
      72991: Merged DEV to V4.2-BUG-FIX (4.2.3)
         72988 : MNT-11584 : Failing test InviteServiceTest.testGetInvitationStatus()
               - Restore runAsUser after InviteByTicket webscript


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@73197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-05 16:15:24 +00:00
Alan Davis
962295dc5a Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69695: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68570: Merged DEV to V4.2-BUG-FIX (4.2.3)
         68084 : MNT-11237 : CMIS uploading file larger the 4mb fails
            - Ensure that temp directory exists before buffering request input stream.
            - Test webscript was added (simply buffers request input stream)
            - TempFileProvider now has method to get or create temp folder inside system temp directory
            - Unit test was added


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70435 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 17:35:21 +00:00
Alan Davis
ffd09244c9 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68528: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68303: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         68256: MNT-11342: Merged V4.1.7 (4.1.7.7) to V4.1-BUG-FIX (4.1.9)
            65718: MNT-10966: 4.1.7 breaks onContentUpdate policies when using webdav
               Call onContentUpdate policies on ASPECT_NO_CONTENT removal as it means that new content was uploaded.
               For WebDAV ASPECT_NO_CONTENT is removed on UNLOCK of the new node.
            65741: MNT-10966: 4.1.7 breaks onContentUpdate policies when using webdav
               Add unit test for case
            - Test resources alraedy existed on V4.1-BUG-FIX


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70410 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 16:30:37 +00:00
Mark Rogers
a4891cca64 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68134: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67568: MNT-9905 : Pending Invites created by one site manager aren't visible to other site managers
       Build failed, unit test was fixed.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68418 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:13:11 +00:00
Mark Rogers
1a3013e3f3 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68126: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67461: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         66886: Merged DEV to V4.1-BUG-FIX
          66841 : MNT-9905 : Pending Invites created by one site manager aren't visible to other site managers
           Execute some operation: "Invite/Search", "Pending Invites/Search" and "Pending Invites/Search/Cancel" using 'system' user. Corrected code. Added test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68411 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:10:58 +00:00
Mark Rogers
b331e89f27 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68118: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67153: Merged DEV to V4.2-BUG-FIX (4.2.3)
         67111 : MNT-10873 : Renaming folders while editing documents using webdav and Windows 7 can lead to 0k (empty) documents created in the trash can.
            - Empty documents are not archived eny more if were created in response to LOCK webdav method.
            - Unit test was implemented.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68405 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:09:00 +00:00
Mark Rogers
0b6c361dae Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
67754: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      66874: Merged DEV to V4.2-BUG-FIX (4.2.3)
         66788 : MNT-10411 : Wrong status returned when  calling webscript api/invite/{inviteId}/{InviteTicket}?inviteeUserName={invitee uid}
            - Return propper invitation status. Fix related test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68389 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:03:47 +00:00
Mark Rogers
6c92799b91 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
67736: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      65943: MNT-10807 : Auditing does not take into account audit.filter.alfresco-access.transaction.user
      Fixed some unit tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68375 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 15:59:12 +00:00
Mark Rogers
25adfb7df4 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
67466: BDE-266 Move JettyComponent util classes to test source, so that we can get rid of Jetty in the war


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68341 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 15:48:14 +00:00
Alan Davis
bdd65c3d9f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
65934: MNT-11059: ActivitiWorkflowRestApiTest and JBPMWorkflowRestApiTest failing since we switched to British Summer Time
      - Changed the dateformatter imports to compare equal dates correctly.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66284 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 22:30:51 +00:00
Alan Davis
afcd38825f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
65603: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      65504: Merged DEV to V4.2-BUG-FIX (4.2.2)
         64017 : MNT-10908 : WebDAV lock refresh calls are not processed
            - LOCK method was modified to update lock expiry date correctly.
            - PROPFIND method should not generated lock discovery response for expired locks
         64152 : MNT-10908 : WebDAV lock refresh calls are not processed
            - Unit tests to prove the fix. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 21:59:20 +00:00
Alan Davis
85a044dab3 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64840: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      64783: MNT-10059: Resurrect PublishingRestApiTest and PublishWebContentJbpmTest.
      Re-enable PublishingRestApiTest test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66201 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 20:07:52 +00:00
Alan Davis
663a50d6f9 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64839: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      64771: MNT-10059: Resurrect PublishingRestApiTest and PublishWebContentJbpmTest.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66200 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 20:06:48 +00:00
Alan Davis
a67180f8a0 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64816: ACE-1101 Remove AVM tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66195 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 20:01:29 +00:00
Alan Davis
c0b2d8eddd Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64446: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      63151: Reverted most of the ACE-493 implementation, committed in r62555, as a new Get sites webscript for the site admins, implemented in r63040. Also, modified the existing tests for the Get sites webscript.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64592 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-15 07:09:44 +00:00
Alan Davis
cf882a2480 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64429: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      62555: ACE-493, ACE-503 and ACE-511: Modified sites service APIs to support Manage Sites feature.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64575 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-15 01:43:38 +00:00
Alan Davis
3ac5243c9d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63057: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62544:  Merged DEV to V4.2-BUG-FIX (4.2.2)
         61469: MNT-10555: Sometimes, documents are locked by Office but not locked by Alfresco
           - expiryLockTest test was added that check if we can LOCK document against an expired lock.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64244 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:24:22 +00:00
Alan Davis
4acb9f0ec7 Merged HEAD-BUG-FIX (Cloud/4.3) to HEAD (Cloud/4.3)
62594: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62570: MNT-10059 Remove PublishingRestApiTest  - it is still failing


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62798 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-19 12:09:21 +00:00
Alan Davis
18461c6af6 Merged HEAD-BUG-FIX (Cloud/4.3) to HEAD (Cloud/4.3)
62592: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62550: MNT-10059 Re-enable PublishWebContentJbpmTest and PublishingRestApiTest tests, which had been lost


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-19 12:07:27 +00:00
Alan Davis
cd7b6d00e6 Merged HEAD-BUG-FIX (Cloud/4.3) to HEAD (Cloud/4.3)
62533: MNT-10030: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX
     61363: MNT-10030 Links on Share Repository search page show incorrect link name; do not work when root-node is defined
       - New fix for MNT-9056.
     62392: MNT-10030 Links on Share Repository search page show incorrect link name; do not work when root-node is defined
       - In AdvancedSearchTest was added testSearchInSites test.
       - In search.lib.js in splitQNamePath() was added check: (rootNodeQNamePath != null && path.indexOf(rootNodeQNamePath) === 0).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62792 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-19 12:02:53 +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
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
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
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
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
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
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
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
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
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
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
Alan Davis
ff2080895e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57866: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57858: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57816: Merged DEV to V4.1-BUG-FIX (4.1.8)
            57643: MNT-8989: MP4 and mov accessed over WebDav on safari or Chrome cause exceptions in log
               Added ClientAbortException check.
               Added unit tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61899 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:21:05 +00:00
Alan Davis
e2b3f25e25 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57852: BDE-195 Try to fix remote-api tests in Maven build: do not run rest API twice, and use JUnit category to run some tests in their own JVM


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61897 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:19:28 +00:00
Alan Davis
42c7df23b3 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57576: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57564: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57560: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8)
            57546: Merged DEV to V4.1.7 (4.1.7)
               57541:  MNT-9618: Consecutive white spaces in cm:name are not return by the CMIS AtomPub binding
                  - compress directive was removed from children.get.atomfeed.ftl and item.get.atomentry.ftl templates. Also,appropriate unit tests were added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61852 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 21:11:29 +00:00
Alan Davis
a5295c4fe7 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57488: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57318: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.0)
         56965 : Merged DEV to V4.1-BUG-FIX (4.1.7)
            55964 : MNT-9662 : HTTP error 500 when renaming a space with a numerical name via WebDAV
                - Prevent folders to take part in any kind of shuffle operation.
            56308 : MNT-9662 : HTTP error 500 when renaming a space with a numerical name via WebDAV
               - Unit test that demonstrate issue.
            - Fixed unit test failure that causes prevous merge (r57176) to be reverted.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61830 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:53:09 +00:00
Alan Davis
ee1383c3cb Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57476: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57286: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         57220: MNT-9350: Registered Mimetypes WebScript doesn't know about the Alfresco Transformation Server
            - Added the notion of known workers and label message map
            - Added ability to override the label message map for custom implementations
            - Separated building of labels for complex and proxy transformers into their own methods
            - Added message formatting for bean names


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61818 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:43:29 +00:00
Alan Davis
25ae654abe Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57386: Following changes for MNT-9759, I think this test should now use _ in the page name.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61813 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:39:28 +00:00
Alan Davis
72c9c7e361 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57245: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57225: Reverse Merged as it caused the MoveMethodTest build error in https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-25 
         57176: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.0)
            56965 : Merged DEV to V4.1-BUG-FIX (4.1.7)
               55964 : MNT-9662 : HTTP error 500 when renaming a space with a numerical name via WebDAV
                  - Prevent folders to take part in any kind of shuffle operation.
               56308 : MNT-9662 : HTTP error 500 when renaming a space with a numerical name via WebDAV
                  - Unit test that demonstrate issue.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61800 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:30:41 +00:00
Alan Davis
9fa8b8ac87 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57237: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57176: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.0)
         56965 : Merged DEV to V4.1-BUG-FIX (4.1.7)
            55964 : MNT-9662 : HTTP error 500 when renaming a space with a numerical name via WebDAV
               - Prevent folders to take part in any kind of shuffle operation.
            56308 : MNT-9662 : HTTP error 500 when renaming a space with a numerical name via WebDAV
               - Unit test that demonstrate issue.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61792 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:24:15 +00:00