From 30b8c64faab01605a8d4486651b196683783d2b0 Mon Sep 17 00:00:00 2001 From: Gavin Cornwell Date: Thu, 21 Feb 2008 15:24:41 +0000 Subject: [PATCH] Merged V2.2 to HEAD 7389: Added Deploy action to user sandboxes Renamed DeploySnapshotDialog to DeployWebsiteDialog and AVMDeploySnapshotAction to AVMDeployWebsiteAction Updated UIDeployWebsite component to list unallocated test or live servers Updated DeployWebsiteDialog to update allocatedto property on server config when necessary 7392: Incorporated panel graphics from Linton for deploy server configuration Applied feedback from Linton on add, edit, remove deploy server config 7412: Added ability to re-deploy to test servers Added ability to view deployment reports for test servers Added ability to preview test servers git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8353 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/action-services-context.xml | 2 +- config/alfresco/messages/action-config.properties | 14 +++++++------- config/alfresco/messages/avm-messages.properties | 3 ++- config/alfresco/model/wcmAppModel.xml | 5 +++++ ...shotAction.java => AVMDeployWebsiteAction.java} | 8 ++++---- 5 files changed, 19 insertions(+), 13 deletions(-) rename source/java/org/alfresco/repo/avm/actions/{AVMDeploySnapshotAction.java => AVMDeployWebsiteAction.java} (98%) diff --git a/config/alfresco/action-services-context.xml b/config/alfresco/action-services-context.xml index d49fdaf2cd..13b66c0759 100644 --- a/config/alfresco/action-services-context.xml +++ b/config/alfresco/action-services-context.xml @@ -496,7 +496,7 @@ - + diff --git a/config/alfresco/messages/action-config.properties b/config/alfresco/messages/action-config.properties index f0afab89ef..b4c59af1f8 100644 --- a/config/alfresco/messages/action-config.properties +++ b/config/alfresco/messages/action-config.properties @@ -115,13 +115,13 @@ avm-undo-list.title=Make a list of Nodes in a store transparent to staging. avm-undo-list.description=This acts as a mistake eraser for a user's sandbox. avm-undo-list.node-list.display-label=The string encoded list of nodes to revert. -avm-deploy-snapshot.title=Deploy a snapshot to a remote server. -avm-deploy-snapshot.description=This deploys a website snapshot to a remote server. -avm-deploy-snapshot.website.display-label=NodeRef of the website the deploy is occurring from. -avm-deploy-snapshot.server.display-label=NodeRef of the deploymentserver to deploy to. -avm-deploy-snapshot.attempt.display-label=NodeRef of the deploymentattempt this deployment is part of. -avm-deploy-snapshot.callback.display-label=The DeploymentCallback listener object. -avm-deploy-snapshot.delay.display-label=An optional delay to apply to the start of a deployment. +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.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. +avm-deploy-website.delay.display-label=An optional delay to apply to the start of a deployment. start-avm-workflow.title=Start a WCM Workflow start-avm-workflow.description=Starts a workflow expecting an AVM workflow package diff --git a/config/alfresco/messages/avm-messages.properties b/config/alfresco/messages/avm-messages.properties index 9ba915b862..7f8bd74ae6 100644 --- a/config/alfresco/messages/avm-messages.properties +++ b/config/alfresco/messages/avm-messages.properties @@ -1,4 +1,5 @@ # AVM related messages expiredcontent.workflow.title=Expired Content In ''{0}'' -avmlockservice.locked=You do not have access to the item at path {0} it is currently locked by another user. \ No newline at end of file +avmlockservice.locked=You do not have access to the item at path {0} it is currently locked by another user. +testserver.taken=The test server ''{0}'' you selected has been allocated to another user, if possible, select a different server and try again. \ No newline at end of file diff --git a/config/alfresco/model/wcmAppModel.xml b/config/alfresco/model/wcmAppModel.xml index 43ee4f91aa..574c74ce47 100644 --- a/config/alfresco/model/wcmAppModel.xml +++ b/config/alfresco/model/wcmAppModel.xml @@ -325,6 +325,11 @@ Allocated To d:text + + true + false + false + Deploy On Approval diff --git a/source/java/org/alfresco/repo/avm/actions/AVMDeploySnapshotAction.java b/source/java/org/alfresco/repo/avm/actions/AVMDeployWebsiteAction.java similarity index 98% rename from source/java/org/alfresco/repo/avm/actions/AVMDeploySnapshotAction.java rename to source/java/org/alfresco/repo/avm/actions/AVMDeployWebsiteAction.java index 50e428458b..6ec74b64d9 100644 --- a/source/java/org/alfresco/repo/avm/actions/AVMDeploySnapshotAction.java +++ b/source/java/org/alfresco/repo/avm/actions/AVMDeployWebsiteAction.java @@ -58,13 +58,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; /** - * Deploys a website snapshot to a remote server. + * Deploys a website to a remote server. * * @author gavinc */ -public class AVMDeploySnapshotAction extends ActionExecuterAbstractBase +public class AVMDeployWebsiteAction extends ActionExecuterAbstractBase { - public static final String NAME = "avm-deploy-snapshot"; + public static final String NAME = "avm-deploy-website"; public static final String FILE_SERVER_PREFIX = "\\\\"; public static final String PARAM_WEBSITE = "website"; @@ -82,7 +82,7 @@ public class AVMDeploySnapshotAction extends ActionExecuterAbstractBase private ContentService contentService; private NodeService nodeService; - private static Log logger = LogFactory.getLog(AVMDeploySnapshotAction.class); + private static Log logger = LogFactory.getLog(AVMDeployWebsiteAction.class); private static Log delayDeploymentLogger = LogFactory.getLog("alfresco.deployment.delay"); /**