Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

83946: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      82505: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         82276: Merged DEV to V4.1-BUG-FIX (4.1.10)
            80919: MNT-8614 : Working Copy can be open by another user locking the file
            Implemented a test to simulate the issue.
      82506: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         82300: MNT-8614 : Working Copy can be open by another user locking the file
         Fixed WebDAVonContentUpdateTest, which referenced an old davLockInfo.xml.
      83433: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         83432: MNT-8614 : Working Copy can be open by another user locking the file
         Removed unnecessary locking in the test, which causes fail on V4.2-BUG-FIX.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84602 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-09-18 17:17:50 +00:00
parent 7fe1374edb
commit 3483a48613
4 changed files with 267 additions and 39 deletions

View File

@@ -68,7 +68,7 @@ public class WebDAVonContentUpdateTest
private static ApplicationContext ctx;
private static final String TEST_DATA_FILE_NAME = "filewithdata.txt";
private static final String DAV_LOCK_INFO_XML = "davLockInfo.xml";
private static final String DAV_LOCK_INFO_XML = "davLockInfoAdmin.xml";
private byte[] testDataFile;
private byte[] davLockInfoFile;