mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merge of all UI clustering changes originally applied to 2.2
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8292 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -33,6 +33,7 @@ import org.alfresco.service.cmr.avm.AVMService;
|
||||
import org.alfresco.service.cmr.repository.ChildAssociationRef;
|
||||
import org.alfresco.service.namespace.RegexQNamePattern;
|
||||
import org.alfresco.web.bean.repository.Node;
|
||||
import org.alfresco.web.bean.repository.Repository;
|
||||
import org.alfresco.web.bean.spaces.DeleteSpaceDialog;
|
||||
|
||||
/**
|
||||
@@ -43,7 +44,9 @@ import org.alfresco.web.bean.spaces.DeleteSpaceDialog;
|
||||
*/
|
||||
public class DeleteWebsiteDialog extends DeleteSpaceDialog
|
||||
{
|
||||
protected AVMService avmService;
|
||||
private static final long serialVersionUID = -3598950865168230942L;
|
||||
|
||||
transient private AVMService avmService;
|
||||
|
||||
// ------------------------------------------------------------------------------
|
||||
// Bean property getters and setters
|
||||
@@ -56,6 +59,15 @@ public class DeleteWebsiteDialog extends DeleteSpaceDialog
|
||||
this.avmService = avmService;
|
||||
}
|
||||
|
||||
protected AVMService getAvmService()
|
||||
{
|
||||
if (avmService == null)
|
||||
{
|
||||
avmService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getAVMService();
|
||||
}
|
||||
return avmService;
|
||||
}
|
||||
|
||||
|
||||
// ------------------------------------------------------------------------------
|
||||
// Dialog implementation
|
||||
@@ -100,11 +112,11 @@ public class DeleteWebsiteDialog extends DeleteSpaceDialog
|
||||
AVMUtil.removeAllVServerWebapps(path, true);
|
||||
|
||||
// get the list of users who have a sandbox in the website
|
||||
List<ChildAssociationRef> userInfoRefs = nodeService.getChildAssocs(
|
||||
List<ChildAssociationRef> userInfoRefs = getNodeService().getChildAssocs(
|
||||
websiteNode.getNodeRef(), WCMAppModel.ASSOC_WEBUSER, RegexQNamePattern.MATCH_ALL);
|
||||
for (ChildAssociationRef ref : userInfoRefs)
|
||||
{
|
||||
String username = (String)nodeService.getProperty(ref.getChildRef(), WCMAppModel.PROP_WEBUSERNAME);
|
||||
String username = (String)getNodeService().getProperty(ref.getChildRef(), WCMAppModel.PROP_WEBUSERNAME);
|
||||
|
||||
// delete the preview store for this user
|
||||
deleteStore(AVMUtil.buildUserPreviewStoreName(storeRoot, username));
|
||||
@@ -131,9 +143,9 @@ public class DeleteWebsiteDialog extends DeleteSpaceDialog
|
||||
private void deleteStore(String store)
|
||||
{
|
||||
// check it exists before we try to remove it
|
||||
if (this.avmService.getStore(store) != null)
|
||||
if (this.getAvmService().getStore(store) != null)
|
||||
{
|
||||
this.avmService.purgeStore(store);
|
||||
this.getAvmService().purgeStore(store);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user