Merged V2.1 to HEAD

6500: Office 2003 Add-ins: Fix for AWC-1505
   6501: Fix for AWC-1361
   6502: Fixes for locking issues regrading expired content
   6503: Fix for AR-1615
   6504: WCM-444, WCM-288, WCM-735, WCM-480
   6505: WCM-498 wasn't fully fixed
   6506: Fix for AWC-1462
   6507: Fix for WCM-741 (link validation report for staging sandbox can get stuck)
   6508: AR-1650: WS Unit tests fail
   6509: Fix for WCM-751 which also solves WCM-570 - also fixed issue to allow deletion of any "broken" webprojects created due to either of those bugs.
   6510: Fix for WCM-546 (workflow history panel should be expanded by default)
   6511: Fix AWC-1128
   6512: Fixes to several to a couple of bugs found under concurrent load.
   6513: Build fix for test using an invalid noderef (now stripped out as it does not exist)
   6514: Add support for the QueryFile transact request to the IPC$ named pipe handler. Fix for AR-1687.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6740 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-10 23:30:53 +00:00
parent cc218b118e
commit 6e5ac9d831
15 changed files with 170 additions and 83 deletions

View File

@@ -72,49 +72,51 @@ public class DeleteWebsiteDialog extends DeleteSpaceDialog
{
// delete all attached website sandboxes in reverse order to the layering
String storeRoot = (String)websiteNode.getProperties().get(WCMAppModel.PROP_AVMSTORE);
// Notifiy virtualization server about removing this website
//
// Implementation note:
//
// Because the removal of virtual webapps in the virtualization
// server is recursive, it only needs to be given the name of
// the main staging store.
//
// This notification must occur *prior* to purging content
// within the AVM because the virtualization server must list
// the avm_webapps dir in each store to discover which
// virtual webapps must be unloaded. The virtualization
// server traverses the sandbox's stores in most-to-least
// dependent order, so clients don't have to worry about
// accessing a preview layer whose main layer has been torn
// out from under it.
//
// It does not matter what webapp name we give here, so "/ROOT"
// is as sensible as anything else. It's all going away.
String sandbox = AVMUtil.buildStagingStoreName(storeRoot);
String path = AVMUtil.buildStoreWebappPath(sandbox, "/ROOT");
AVMUtil.removeVServerWebapp(path, true);
// get the list of users who have a sandbox in the website
List<ChildAssociationRef> userInfoRefs = nodeService.getChildAssocs(
websiteNode.getNodeRef(), WCMAppModel.ASSOC_WEBUSER, RegexQNamePattern.MATCH_ALL);
for (ChildAssociationRef ref : userInfoRefs)
if (storeRoot != null)
{
String username = (String)nodeService.getProperty(ref.getChildRef(), WCMAppModel.PROP_WEBUSERNAME);
// Notifiy virtualization server about removing this website
//
// Implementation note:
//
// Because the removal of virtual webapps in the virtualization
// server is recursive, it only needs to be given the name of
// the main staging store.
//
// This notification must occur *prior* to purging content
// within the AVM because the virtualization server must list
// the avm_webapps dir in each store to discover which
// virtual webapps must be unloaded. The virtualization
// server traverses the sandbox's stores in most-to-least
// dependent order, so clients don't have to worry about
// accessing a preview layer whose main layer has been torn
// out from under it.
//
// It does not matter what webapp name we give here, so "/ROOT"
// is as sensible as anything else. It's all going away.
// delete the preview store for this user
deleteStore(AVMUtil.buildUserPreviewStoreName(storeRoot, username));
String sandbox = AVMUtil.buildStagingStoreName(storeRoot);
String path = AVMUtil.buildStoreWebappPath(sandbox, "/ROOT");
AVMUtil.removeVServerWebapp(path, true);
// delete the main store for this user
deleteStore(AVMUtil.buildUserMainStoreName(storeRoot, username));
// get the list of users who have a sandbox in the website
List<ChildAssociationRef> userInfoRefs = nodeService.getChildAssocs(
websiteNode.getNodeRef(), WCMAppModel.ASSOC_WEBUSER, RegexQNamePattern.MATCH_ALL);
for (ChildAssociationRef ref : userInfoRefs)
{
String username = (String)nodeService.getProperty(ref.getChildRef(), WCMAppModel.PROP_WEBUSERNAME);
// delete the preview store for this user
deleteStore(AVMUtil.buildUserPreviewStoreName(storeRoot, username));
// delete the main store for this user
deleteStore(AVMUtil.buildUserMainStoreName(storeRoot, username));
}
// remove the main staging and preview stores
deleteStore(AVMUtil.buildStagingPreviewStoreName(storeRoot));
deleteStore(AVMUtil.buildStagingStoreName(storeRoot));
}
// remove the main staging and preview stores
deleteStore(AVMUtil.buildStagingPreviewStoreName(storeRoot));
deleteStore(AVMUtil.buildStagingStoreName(storeRoot));
}
// use the super implementation to delete the node itself