mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V2.0 to HEAD
5136: AR-918 5137, 5138: AWC-1083 5139: WCM-309, WCM-311 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5325 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -101,7 +101,7 @@ public class DeleteSandboxDialog extends BaseDialogBean
|
||||
String sandbox = AVMConstants.buildUserMainStoreName(storeRoot, username);
|
||||
String path = AVMConstants.buildStoreWebappPath(sandbox, this.avmBrowseBean.getWebapp());
|
||||
|
||||
// Notifiy virtualisation server about removing this sandbox.
|
||||
// Notify virtualisation server about removing this sandbox.
|
||||
//
|
||||
// Implementation note:
|
||||
//
|
||||
@@ -117,10 +117,8 @@ public class DeleteSandboxDialog extends BaseDialogBean
|
||||
// dependent order, so clients don't have to worry about
|
||||
// accessing a preview layer whose main layer has been torn
|
||||
// out from under it.
|
||||
|
||||
AVMConstants.removeVServerWebapp(path, true);
|
||||
|
||||
|
||||
// TODO: Use the .sandbox-id. property to delete all sandboxes,
|
||||
// rather than assume a sandbox always had a single preview
|
||||
// layer attached.
|
||||
@@ -128,7 +126,6 @@ public class DeleteSandboxDialog extends BaseDialogBean
|
||||
// purge the user main sandbox store from the system
|
||||
this.avmService.purgeStore(sandbox);
|
||||
|
||||
|
||||
// purge the user preview sandbox store from the system
|
||||
sandbox = AVMConstants.buildUserPreviewStoreName(storeRoot, username);
|
||||
this.avmService.purgeStore(sandbox);
|
||||
@@ -136,7 +133,6 @@ public class DeleteSandboxDialog extends BaseDialogBean
|
||||
// remove the association to this web project user meta-data
|
||||
this.nodeService.removeChild(website.getNodeRef(), ref.getChildRef());
|
||||
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user