inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-06-16 17:55:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.2 to HEAD

Browse Source 
7422: Deployment UI changes
   7424: Deployment UI changes
   7426: Created 'More Actions' menu for user sandboxes and moved various actions into it
   7428: Server config UI
   7433: Added ability to deploy a workflow sandbox to a test server
   7434: Fixed confusing comment
   7442: Enabled users with contributor and reviewer roles to reserve a test server and deploy to it
   7443: Preparation for auto deployment


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley 2008-02-22 14:50:39 +00:00
parent 30b8c64faa
commit d175db706e
4 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/messages/action-config.properties
View File

@ -117,7 +117,7 @@ avm-undo-list.node-list.display-label=The string encoded list of nodes to revert
avm-deploy-website.title=Deploy a website to a remote server.
avm-deploy-website.description=This deploys a website to a remote server.
avm-deploy-website.website.display-label=NodeRef of the website the deploy is occurring from.
avm-deploy-website.webproject.display-label=NodeRef of the web project the deploy is occurring from.
avm-deploy-website.server.display-label=NodeRef of the deploymentserver to deploy to.
avm-deploy-website.attempt.display-label=NodeRef of the deploymentattempt this deployment is part of.
avm-deploy-website.callback.display-label=The DeploymentCallback listener object.

5
config/alfresco/workflow/wcmWorkflowModel.xml
View File

@ -248,6 +248,11 @@
<title>Webapp</title>
<description>The webapp within the workflow store to check links for</description>
<type>d:text</type>
</property>
<property name="wcmwf:autoDeploy">
<title>Auto Deploy</title>
<description>Determines whether the changes should be deployed upon submission</description>
<type>d:boolean</type>
</property>
</properties>
</aspect>

1
source/java/org/alfresco/model/WCMWorkflowModel.java
View File

@ -37,6 +37,7 @@ public interface WCMWorkflowModel
static final QName PROP_LABEL = QName.createQName(NamespaceService.WCMWF_MODEL_1_0_URI, "label");
static final QName PROP_LAUNCH_DATE = QName.createQName(NamespaceService.WCMWF_MODEL_1_0_URI, "launchDate");
static final QName PROP_VALIDATE_LINKS = QName.createQName(NamespaceService.WCMWF_MODEL_1_0_URI, "validateLinks");
static final QName PROP_AUTO_DEPLOY = QName.createQName(NamespaceService.WCMWF_MODEL_1_0_URI, "autoDeploy");
static final QName PROP_WEBAPP = QName.createQName(NamespaceService.WCMWF_MODEL_1_0_URI, "webapp");
static final QName ASSOC_WEBPROJECT = QName.createQName(NamespaceService.WCMWF_MODEL_1_0_URI, "webproject");
}

29
source/java/org/alfresco/repo/avm/actions/AVMDeployWebsiteAction.java
View File

@ -67,7 +67,7 @@ public class AVMDeployWebsiteAction extends ActionExecuterAbstractBase
public static final String NAME = "avm-deploy-website";
public static final String FILE_SERVER_PREFIX = "\\\\";
public static final String PARAM_WEBSITE = "website";
public static final String PARAM_WEBPROJECT = "webproject";
public static final String PARAM_SERVER = "server";
public static final String PARAM_ATTEMPT = "attempt";
public static final String PARAM_CALLBACK = "callback";
@ -202,8 +202,8 @@ public class AVMDeployWebsiteAction extends ActionExecuterAbstractBase
@Override
protected void addParameterDefinitions(List<ParameterDefinition> paramList)
{
paramList.add(new ParameterDefinitionImpl(PARAM_WEBSITE, DataTypeDefinition.NODE_REF, true,
getParamDisplayLabel(PARAM_WEBSITE)));
paramList.add(new ParameterDefinitionImpl(PARAM_WEBPROJECT, DataTypeDefinition.NODE_REF, true,
getParamDisplayLabel(PARAM_WEBPROJECT)));
paramList.add(new ParameterDefinitionImpl(PARAM_SERVER, DataTypeDefinition.NODE_REF, true,
getParamDisplayLabel(PARAM_SERVER)));
paramList.add(new ParameterDefinitionImpl(PARAM_ATTEMPT, DataTypeDefinition.NODE_REF, false,
@ -228,7 +228,7 @@ public class AVMDeployWebsiteAction extends ActionExecuterAbstractBase
}
// get the NodeRef representing the website being deployed
NodeRef websiteRef = (NodeRef)action.getParameterValue(PARAM_WEBSITE);
NodeRef websiteRef = (NodeRef)action.getParameterValue(PARAM_WEBPROJECT);
if (this.nodeService.exists(websiteRef) == false)
{
throw new IllegalStateException("The website NodeRef (" + websiteRef +
@ -269,8 +269,6 @@ public class AVMDeployWebsiteAction extends ActionExecuterAbstractBase
String targetName = (String)serverProps.get(WCMAppModel.PROP_DEPLOYSERVERTARGET);
String targetPath = path;
// TODO: determine if we need to deploy a subfolder of the website
if (fileServerDeployment == false)
{
// if "localhost" is passed as the target server add "live" to the end of the
@ -312,6 +310,19 @@ public class AVMDeployWebsiteAction extends ActionExecuterAbstractBase
targetName = this.defaultTargetName;
}
// determine the actual source path
if (sourcePath != null && sourcePath.length() > 0)
{
// make sure the path starts with /
if (sourcePath.startsWith("/") == false)
{
sourcePath = "/" + sourcePath;
}
// append to the root path
path = path + sourcePath;
}
// take a note of the current date/time
Date startDate = new Date();
@ -336,7 +347,8 @@ public class AVMDeployWebsiteAction extends ActionExecuterAbstractBase
if (fileServerDeployment)
{
if (logger.isDebugEnabled())
logger.debug("Performing file server deployment to " + host + ":" + port);
logger.debug("Performing file server deployment to " + host + ":" + port +
" using deploymentserver: " + serverProps);
// TODO: Added new NameMatcher parameter to deploy methods. It acts as a filter.
// Any matching path names are ignored for deployment purposes.
@ -346,7 +358,8 @@ public class AVMDeployWebsiteAction extends ActionExecuterAbstractBase
else
{
if (logger.isDebugEnabled())
logger.debug("Performing Alfresco deployment to " + host + ":" + port);
logger.debug("Performing Alfresco deployment to " + host + ":" + port +
" using deploymentserver: " + serverProps);
// TODO: Added new NameMatcher parameter to deploy methods. It acts as a filter.
// Any matching path names are ignored for deployment purposes.