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

WCM: consolidate getWebProject & deleteSandbox (also precursor for SAIL-359)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19378 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2010-03-18 17:33:21 +00:00
parent b9ae66b146
commit 49856600ae
11 changed files with 459 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/java/org/alfresco/repo/avm/AVMLockingAwareService.java
View File

@@ -702,7 +702,7 @@ public class AVMLockingAwareService implements AVMService, ApplicationContextAwa
fService.removeNode(parent, name);
String[] storePath = AVMUtil.splitPath(parent);
fService.createSnapshot(storePath[0], null, "Removed "+path);
String webProject = getWebProject(storePath[0]);
String webProject = WCMUtil.getWebProject(fService, storePath[0]);
if (webProject != null)
{
fLockingService.removeLocksInDirectory(webProject, storePath[0], AVMUtil.extendAVMPath(storePath[1], name));
@@ -718,7 +718,7 @@ public class AVMLockingAwareService implements AVMService, ApplicationContextAwa
fService.removeNode(path);
String[] storePath = AVMUtil.splitPath(path);
fService.createSnapshot(storePath[0], null, "Removed "+path);
String webProject = getWebProject(storePath[0]);
String webProject = WCMUtil.getWebProject(fService, storePath[0]);
if (webProject != null)
{
fLockingService.removeLocksInDirectory(webProject, storePath[0], storePath[1]);
@@ -749,8 +749,8 @@ public class AVMLockingAwareService implements AVMService, ApplicationContextAwa
String[] srcStorePath = AVMUtil.splitPath(srcPath);
String[] dstStorePath = AVMUtil.splitPath(dstPath);
String srcWebProject = getWebProject(srcStorePath[0]);
String dstWebProject = getWebProject(dstStorePath[0]);
String srcWebProject = WCMUtil.getWebProject(fService, srcStorePath[0]);
String dstWebProject = WCMUtil.getWebProject(fService, dstStorePath[0]);
if ((dstWebProject != null) && (dstWebProject.equals(srcWebProject)))
{
@@ -889,16 +889,6 @@ public class AVMLockingAwareService implements AVMService, ApplicationContextAwa
fService.uncover(dirPath, name);
}
private String getWebProject(String name)
{
String wpStoreId = WCMUtil.getWebProjectStoreId(name);
if (WCMUtil.getWebProjectNodeFromWebProjectStore(fService, wpStoreId) != null)
{
return wpStoreId;
}
return null;
}
private void grabLock(String path)
{
AVMNodeDescriptor desc = fService.lookup(-1, path, false);
@@ -907,7 +897,7 @@ public class AVMLockingAwareService implements AVMService, ApplicationContextAwa
return;
}
String[] storePath = AVMUtil.splitPath(path);
String webProject = getWebProject(storePath[0]);
String webProject = WCMUtil.getWebProject(fService, storePath[0]);
if (webProject != null && webProject.equals(storePath[0]))
{
// Don't do locking in staging.