Merge WCM-SERVICES to HEAD

Changes 11272-11536

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11562 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2008-10-27 17:02:00 +00:00
parent e56a24a351
commit 7b47b75eb1
23 changed files with 484 additions and 2222 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
* Copyright (C) 2005-2008 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -26,15 +26,9 @@ package org.alfresco.web.bean.wcm;
import javax.faces.context.FacesContext;
import org.alfresco.model.ApplicationModel;
import org.alfresco.model.ContentModel;
import org.alfresco.model.WCMAppModel;
import org.alfresco.repo.avm.AVMNodeConverter;
import org.alfresco.repo.domain.PropertyValue;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.repo.security.permissions.AccessDeniedException;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.wcm.webproject.WebProjectService;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.repository.Repository;
/**
* Bean implementation for the AVM "Create Webapp Folder" dialog.
@@ -48,7 +42,24 @@ public class CreateWebappDialog extends CreateFolderDialog
private static final long serialVersionUID = -3883601909422422829L;
protected String path;
transient private WebProjectService wpService;
// ------------------------------------------------------------------------------
// Bean property getters and setters
public void setWebProjectService(WebProjectService wpService)
{
this.wpService = wpService;
}
protected WebProjectService getWebProjectService()
{
if (wpService == null)
{
wpService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getWebProjectService();
}
return wpService;
}
/**
* @see org.alfresco.web.bean.dialog.BaseDialogBean#finishImpl(javax.faces.context.FacesContext, java.lang.String)
@@ -56,49 +67,13 @@ public class CreateWebappDialog extends CreateFolderDialog
@Override
protected String finishImpl(FacesContext context, String outcome) throws Exception
{
final String stagingStore = this.avmBrowseBean.getStagingStore();
if (SandboxFactory.isContentManager(stagingStore))
Node websiteNode = this.avmBrowseBean.getWebsite();
if (websiteNode != null)
{
AuthenticationUtil.runAs(new RunAsWork<Object>(){
public Object doWork() throws Exception
{
final String parent = AVMUtil.buildSandboxRootPath( stagingStore );
CreateWebappDialog.this.getAvmService().createDirectory(parent, CreateWebappDialog.this.name);
CreateWebappDialog.this.path = AVMNodeConverter.ExtendAVMPath(parent, CreateWebappDialog.this.name);
CreateWebappDialog.this.getAvmService().addAspect(CreateWebappDialog.this.path, ApplicationModel.ASPECT_UIFACETS);
CreateWebappDialog.this.getAvmService().addAspect(CreateWebappDialog.this.path, WCMAppModel.ASPECT_WEBAPP);
if (CreateWebappDialog.this.description != null && CreateWebappDialog.this.description.length() != 0)
{
CreateWebappDialog.this.getAvmService().setNodeProperty(path,
ContentModel.PROP_DESCRIPTION,
new PropertyValue(DataTypeDefinition.TEXT,
CreateWebappDialog.this.description));
}
// Snapshot the store with the empty webapp
CreateWebappDialog.this.getAvmService().createSnapshot(stagingStore, null, null);
return null;
}}, AuthenticationUtil.getSystemUserName());
getWebProjectService().createWebApp(websiteNode.getNodeRef(), this.name, this.description);
}
else
{
throw new AccessDeniedException("Only content managers may create new webapp folders");
}
return outcome;
}
@Override
protected String doPostCommitProcessing(FacesContext context, String outcome)
{
// Tell the virtualization server about the new webapp.
// e.g.: this.path = "mysite:/www/avm_webapps/mywebapp"
AVMUtil.updateVServerWebapp(this.path, true);
return outcome;
}
}