Commit Graph

1220 Commits

Author SHA1 Message Date
Alan Davis
8e7f620ac1 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63065: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62754: MNT-9587: Workflows task properties values are not compliant with data-dictionary-property-definitions.
      Correct count of task properties which increased after fix that returns default value for properties with no value.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64253 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:32:01 +00:00
Alan Davis
2bbf9c822e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63064: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62673: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         62610: MNT-9587: Workflows task properties values are not compliant with data-dictionary-property-definitions.
         Add default name as "Task" for bpm:workflowTasks and fix WorkflowModelBuilder to return default property values if no were set


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64252 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:31:03 +00:00
Alan Davis
957c03475d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63061: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62574: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         62526:  Merged DEV to V4.1-BUG-FIX (4.1.8)
            59843: MNT-2258: IE's File Download box does not show a filename correctly when that have non-ASCII characters in the filename
              - Use legacy filename token with encoded value in "Content-Disposition" header on file download operation for IE7 too.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64249 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:28:09 +00:00
Alan Davis
c5ebe07269 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63058: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62625:  Merged DEV to V4.2-BUG-FIX (4.2.2)
         61010: MNT-10555: Sometimes, documents are locked by Office but not locked by Alfresco
           - Give access to WebDAV operation, when a lock has expired.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64245 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:25:18 +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
b12e82ed59 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60524: MNT-10491: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60523: MNT-10490: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         60522: MNT-10489: Merged V3.4-BUG-FIX (3.4.14) to V4.1-BUG-FIX (4.1.8)
            60521: MNT-10488: Merged CLOUD-R31 to V3.4-BUG-FIX (3.4.14)
               60520: HOTFIX MNT-10484 [Security] Any OS file can be retrieved via WebDAV
                  - Change suggested by Viachaslau Tikhanovich at 24-Jan-14 05:14 PM GMT


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64241 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:21:33 +00:00
Alan Davis
7f60987afa Reverse merged HEAD (4.3.0)
<< factory.setFeature calls in original commit caused a problem when we
      reverted 60910 on HEAD-BUG-FIX in 62782. 60910 included code to
      remove the factory.setFeature calls so we don't see the problem on
      earlier branches which still has this commit. Removing the original
      commit also removes them and should fix the problem. >>
   60525: MNT-10492: Merged HEAD-BUG-FIX (Cloud 33/4.3) to HEAD (Cloud 32)
      60524: MNT-10491: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
         60523: MNT-10490: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
            60522: MNT-10489: Merged V3.4-BUG-FIX (3.4.14) to V4.1-BUG-FIX (4.1.8)
               60521: MNT-10488: Merged CLOUD-R31 to V3.4-BUG-FIX (3.4.14)
                  60520: HOTFIX MNT-10484
                     - Change suggested by Viachaslau Tikhanovich at 24-Jan-14 05:14 PM GMT


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@63587 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-04 13:36:34 +00:00
Alan Davis
54b3ff43ab Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62931: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62696: ACE-480  Split Data-Model into Lucene Independent and Legacy Lucene Project


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62986 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:59:18 +00:00
Alan Davis
710b5d2c65 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62917: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62451: ACE-33 - CMIS item support.   CRUD of cmis items, cmis item shown as children of folders.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62971 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:35:00 +00:00
Alan Davis
2f7f6b85c2 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62905: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      61335: ACE-33 implementation of cmis:items
          add permissions
          create and delete of cmis:items 
          some unit test fixes
          new unit test for items


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62958 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:23:58 +00:00
Alan Davis
1608cbbd4b Merged HEAD-BUG-FIX (Cloud/4.3) to HEAD (Cloud/4.3)
62731: Use RetryingTransactionHelper during authentication as an attempt to fix Oracle build failures during WebService test initialization


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62820 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-19 13:18:04 +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
3bd8f068c0 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61361: BDE-180 Refactored the system tests to use the maven tomcat plugin, self-contained alf_data/database and tests running in parallel.
   Removed duplicate freemarker jar.  Now uses the one defined in the repo project
   add JCL for Slf4j
   Fixed failing JmxScriptTest by ensuring that "quick" files are loaded from the classpath
   Changed the unpacking of upstream resources to the "prepare-package" phase
   BDE-249 Separate unit tests in a test suite on their own
      Moved the thor unit tests into their own suite
      Moved the enterprise remote-api unit tests into their own suite
      Moved the enterprise repository unit tests into their own suite
      Moved the webclient unit tests into their own suite
      Moved the wdr unit tests into their own suite
      Moved the repository unit tests into their own suite
      Moved the remote-api unit tests into their own suite
   Change null to "" for freemarker template
   Moved META-INF/services so they get added to the jar
   Speeding up the wcmquickstart client tests, reducing the thread.sleeps().
   Fixed failing date/time tests, remove a redundant test and corrected an import
   Added a h2 profile for running against a h2 database


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62415 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 15:23:04 +00:00
Alan Davis
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
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
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
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
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
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
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
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
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
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
Alan Davis
31506b14d3 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57915: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57908: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57900: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8)
            57890: Merged DEV to V4.1.7 (4.1.7)
               57718:  MNT-9500: After editing one occurrence of recurrent event the recurrence disappears
                  - Implemented the functionality that allow updating series in outlook calendar.
               57846: MNT-9500: After editing one occurrence of recurrent event the recurrence disappears
                 - Unit tests and unforeseen behaviour (deletion of updated occurrence; update of recurrence, when occurrence was deleted) were implemented. Also, mini calendar dashlet was updated.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61908 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:28:24 +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