inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.2 to HEAD

Browse Source 
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
This commit is contained in:
Gavin Cornwell
2008-02-21 15:24:41 +00:00
parent c6559f0dbc
commit 30b8c64faa
5 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/action-services-context.xml
View File

@@ -496,7 +496,7 @@
</property> </property>
</bean> </bean>
<bean id="avm-deploy-snapshot" class="org.alfresco.repo.avm.actions.AVMDeploySnapshotAction" parent="action-executer"> <bean id="avm-deploy-website" class="org.alfresco.repo.avm.actions.AVMDeployWebsiteAction" parent="action-executer">
<property name="deploymentService"> <property name="deploymentService">
<ref bean="DeploymentService"/> <ref bean="DeploymentService"/>
</property> </property>

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

@@ -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.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-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-website.title=Deploy a website to a remote server.
avm-deploy-snapshot.description=This deploys a website snapshot to a remote server. avm-deploy-website.description=This deploys a website to a remote server.
avm-deploy-snapshot.website.display-label=NodeRef of the website the deploy is occurring from. avm-deploy-website.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-website.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-website.attempt.display-label=NodeRef of the deploymentattempt this deployment is part of.
avm-deploy-snapshot.callback.display-label=The DeploymentCallback listener object. avm-deploy-website.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.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.title=Start a WCM Workflow
start-avm-workflow.description=Starts a workflow expecting an AVM workflow package start-avm-workflow.description=Starts a workflow expecting an AVM workflow package

1
config/alfresco/messages/avm-messages.properties
View File

@@ -2,3 +2,4 @@
expiredcontent.workflow.title=Expired Content In ''{0}'' 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. 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.

5
config/alfresco/model/wcmAppModel.xml
View File

@@ -325,6 +325,11 @@
<property name="wca:deployserverallocatedto"> <property name="wca:deployserverallocatedto">
<title>Allocated To</title> <title>Allocated To</title>
<type>d:text</type> <type>d:text</type>
<index enabled="true">
<atomic>true</atomic>
<stored>false</stored>
<tokenised>false</tokenised>
</index>
</property> </property>
<property name="wca:deployonapproval"> <property name="wca:deployonapproval">
<title>Deploy On Approval</title> <title>Deploy On Approval</title>

8
source/java/org/alfresco/repo/avm/actions/AVMDeploySnapshotAction.java → source/java/org/alfresco/repo/avm/actions/AVMDeployWebsiteAction.java
View File

@@ -58,13 +58,13 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
/** /**
* Deploys a website snapshot to a remote server. * Deploys a website to a remote server.
* *
* @author gavinc * @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 FILE_SERVER_PREFIX = "\\\\";
public static final String PARAM_WEBSITE = "website"; public static final String PARAM_WEBSITE = "website";
@@ -82,7 +82,7 @@ public class AVMDeploySnapshotAction extends ActionExecuterAbstractBase
private ContentService contentService; private ContentService contentService;
private NodeService nodeService; 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"); private static Log delayDeploymentLogger = LogFactory.getLog("alfresco.deployment.delay");
/** /**