inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
101748: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      101637: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         101337: Merged DEV to V4.2-BUG-FIX
         100314 : MNT-13144 : WebDav does not correctly version CAD drawings correctly when saved using Windows mapped drive
          Corrected shuffle pattern and some code for dwg files. 
         101140 : MNT-13144 : WebDav does not correctly version CAD drawings correctly when saved using Windows mapped drive
          Was corrected some code for move webdav method. Added new junit test. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101850 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-04-14 16:12:25 +00:00
parent 320f105c02
commit 83649658c3
3 changed files with 135 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/repo/webdav/MoveMethod.java
View File

@@ -259,7 +259,14 @@ public class MoveMethod extends HierarchicalMethod
fileFolderService.delete(destFileInfo.getNodeRef());
}
fileFolderService.rename(sourceNodeRef, name);
fileFolderService.rename(sourceNodeRef, name);
// MNT-13144 WebDav does not correctly version CAD drawings correctly when saved using Windows mapped drive
if (!sourceFileInfo.isFolder() && getDAVHelper().isRenameShuffle(name))
{
fileFolderService.setHidden(sourceFileInfo.getNodeRef(), true);
}
// As per the WebDAV spec, we make sure the node is unlocked once moved
getDAVHelper().getLockService().unlock(sourceNodeRef);
}

2
source/java/org/alfresco/repo/webdav/WebDAVHelper.java
View File

@@ -115,7 +115,7 @@ public class WebDAVHelper
private ActivityPoster poster;
// pattern is tested against full path after it has been lower cased.
private Pattern m_renameShufflePattern = Pattern.compile("(.*/\\..*)|(.*[a-f0-9]{8}+$)|(.*\\.tmp$)|(.*\\.wbk$)|(.*\\.bak$)|(.*\\~$)|(.*backup.*\\.do[ct]{1}[x]?[m]?$)|(.*\\.sb\\-\\w{8}\\-\\w{6}$)");
private Pattern m_renameShufflePattern = Pattern.compile("(.*/\\..*)|(.*[a-f0-9]{8}+$)|(.*\\.tmp$)|(.*atmp[0-9]+$)|(.*\\.wbk$)|(.*\\.bak$)|(.*\\~$)|(.*backup.*\\.do[ct]{1}[x]?[m]?$)|(.*\\.sb\\-\\w{8}\\-\\w{6}$)");
// Empty XML attribute list