mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
The highlights of this checkin are: o No need to manually remove virt server work dir anymore o Now contents of work dir are virtualized in addition to the jars in memory. Starts / reloads faster, plus a lot more scalable. o You can create users & invite them to web project, delete their sandboxe, etc. Works. o Virt server picks up new web projects properly even when these projects were created after the virt server was started. Not done: o Need to play the same game with classes dirs that I'm doing with lib dirs. Should be easy now. o Some cleanup is needed in the way that sandboxes are destroyed. Works, but on the brittle side. Not urgent. o Because of problems with RMI auth, you still need to startup the alfreco webapp before the virt server, and if one poops out, the auth code does not recover that well yet. Britt & I will have to deal with this over the next few days. Gory details: root/projects/catalina-virtual/config/server.xml Turned off autoDeploy entirely. Now all reloading is explicit via JMX Put the request dumper valve into a comment. It's for debugging purposes only (and slows stuff down). root/projects/catalina-virtual/source/java/org/alfresco/catalina/host/AVMHost.java Cleaned up api a bit. root/projects/catalina-virtual/source/java/org/alfresco/catalina/host/AVMHostConfig.java Recursive reload of webapps. root/projects/catalina-virtual/source/java/org/alfresco/catalina/loader/AVMWebappLoader.java Recursive reload of webapps. root/projects/catalina-virtual/source/java/org/alfresco/catalina/valve/AVMUrlValve.java Cleaned up & refactoring root/projects/catalina-virtual/source/java/org/alfresco/mbeans/VirtServerRegistrationThread.java Using new api from AVMFileDirContext root/projects/jndi-client/source/java/org/alfresco/jndi/AVMFileDirContext.java Cleaned up api, made non-fatal log messages 'debug' rather than 'info'. root/projects/web-client/source/java/org/alfresco/web/bean/wcm/AVMConstants.java Added new constant. This file needs to be refactored soon. root/projects/web-client/source/java/org/alfresco/web/bean/wcm/AddAvmContentDialog.java Moved virt server notification to doPostCommitProcessing root/projects/web-client/source/java/org/alfresco/web/bean/wcm/DeleteSandboxDialog.java Fixed notification of virt server. root/projects/web-client/source/java/org/alfresco/web/bean/wcm/ImportWebsiteDialog.java Moved virt server notification to doPostCommitProcessing root/projects/web-client/source/java/org/alfresco/web/bean/wcm/InviteWebsiteUsersWizard.java Moved virt server notification to doPostCommitProcessing root/projects/web-client/source/java/org/alfresco/web/bean/wcm/SandboxFactory.java Added new property to sandboxes to make recursive reload efficient. root/projects/web-client/source/java/org/alfresco/web/forms/ServletContextFormDataFunctionsAdapter.java Now uses new AVMFileDirContext api. Removed System.err.prinln() statements. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4839 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
160 lines
5.5 KiB
Java
160 lines
5.5 KiB
Java
package org.alfresco.web.bean.wcm;
|
|
|
|
import java.text.MessageFormat;
|
|
import java.util.List;
|
|
|
|
import javax.faces.context.FacesContext;
|
|
|
|
import org.alfresco.model.WCMAppModel;
|
|
import org.alfresco.service.cmr.avm.AVMService;
|
|
import org.alfresco.service.cmr.repository.ChildAssociationRef;
|
|
import org.alfresco.service.cmr.repository.NodeRef;
|
|
import org.alfresco.service.namespace.RegexQNamePattern;
|
|
import org.alfresco.web.app.AlfrescoNavigationHandler;
|
|
import org.alfresco.web.app.Application;
|
|
import org.alfresco.web.bean.dialog.BaseDialogBean;
|
|
import org.alfresco.web.bean.repository.Node;
|
|
import org.apache.commons.logging.Log;
|
|
import org.apache.commons.logging.LogFactory;
|
|
|
|
/**
|
|
* Bean implementation for the AVM "Delete Sandbox" dialog
|
|
*
|
|
* @author kevinr
|
|
*/
|
|
public class DeleteSandboxDialog extends BaseDialogBean
|
|
{
|
|
private static final Log logger = LogFactory.getLog(DeleteSandboxDialog.class);
|
|
|
|
protected AVMService avmService;
|
|
protected AVMBrowseBean avmBrowseBean;
|
|
|
|
|
|
/**
|
|
* @param avmBrowseBean The avmBrowseBean to set.
|
|
*/
|
|
public void setAvmBrowseBean(AVMBrowseBean avmBrowseBean)
|
|
{
|
|
this.avmBrowseBean = avmBrowseBean;
|
|
}
|
|
|
|
/**
|
|
* @param avmService The avmService to set.
|
|
*/
|
|
public void setAvmService(AVMService avmService)
|
|
{
|
|
this.avmService = avmService;
|
|
}
|
|
|
|
|
|
// ------------------------------------------------------------------------------
|
|
// Dialog implementation
|
|
|
|
@Override
|
|
protected String finishImpl(FacesContext context, String outcome)
|
|
throws Exception
|
|
{
|
|
// the username for the sandbox to delete
|
|
String username = this.avmBrowseBean.getUsername();
|
|
if (username != null)
|
|
{
|
|
Node website = this.avmBrowseBean.getWebsite();
|
|
|
|
// remove the store reference from the website folder meta-data
|
|
List<ChildAssociationRef> userInfoRefs = this.nodeService.getChildAssocs(
|
|
website.getNodeRef(),
|
|
WCMAppModel.ASSOC_WEBUSER, RegexQNamePattern.MATCH_ALL);
|
|
for (ChildAssociationRef ref : userInfoRefs)
|
|
{
|
|
NodeRef userInfoRef = ref.getChildRef();
|
|
String user = (String)nodeService.getProperty(userInfoRef, WCMAppModel.PROP_WEBUSERNAME);
|
|
String role = (String)nodeService.getProperty(userInfoRef, WCMAppModel.PROP_WEBUSERROLE);
|
|
|
|
if (username.equals(user))
|
|
{
|
|
// found the sandbox to remove
|
|
String storeRoot = (String)website.getProperties().get(WCMAppModel.PROP_AVMSTORE);
|
|
String sandbox = AVMConstants.buildUserMainStoreName(storeRoot, username);
|
|
String path = AVMConstants.buildStoreWebappPath(sandbox, this.avmBrowseBean.getWebapp());
|
|
|
|
// Notifiy virtualisation server about removing this sandbox.
|
|
//
|
|
// 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 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.
|
|
|
|
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.
|
|
|
|
// 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);
|
|
|
|
// remove the association to this web project user meta-data
|
|
this.nodeService.removeChild(website.getNodeRef(), ref.getChildRef());
|
|
|
|
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
return outcome;
|
|
}
|
|
|
|
@Override
|
|
protected String doPostCommitProcessing(FacesContext context, String outcome)
|
|
{
|
|
return AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME;
|
|
}
|
|
|
|
@Override
|
|
protected String getErrorMessageId()
|
|
{
|
|
return "error_delete_sandbox";
|
|
}
|
|
|
|
@Override
|
|
public boolean getFinishButtonDisabled()
|
|
{
|
|
return false;
|
|
}
|
|
|
|
|
|
// ------------------------------------------------------------------------------
|
|
// Bean Getters and Setters
|
|
|
|
/**
|
|
* Returns the confirmation to display to the user before deleting the user sandbox.
|
|
*
|
|
* @return The formatted message to display
|
|
*/
|
|
public String getConfirmMessage()
|
|
{
|
|
String fileConfirmMsg = Application.getMessage(FacesContext.getCurrentInstance(),
|
|
"delete_sandbox_confirm");
|
|
|
|
return MessageFormat.format(fileConfirmMsg,
|
|
new Object[] {this.avmBrowseBean.getUsername()});
|
|
}
|
|
}
|