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 
7386: JSF component to view, add, edit and remove deployment server configuration
            Added new step to create/edit website wizard to collect and edit deployment server configuration 
            Enabled the copying of deployment server config when creating one web project from another
            Added new icons to tell apart Alfresco Server vs. File System deployments
            Updated UI to use 'friendly' server name when possible

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8351 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell 2008-02-21 14:35:30 +00:00
parent dc9ccc985e
commit c6559f0dbc
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -297,7 +297,6 @@
<property name="wca:deployserverport"> <property name="wca:deployserverport">
<title>Port</title> <title>Port</title>
<type>d:int</type> <type>d:int</type>
<mandatory enforced="true">true</mandatory>
</property> </property>
<property name="wca:deployservername"> <property name="wca:deployservername">
<title>Display Name</title> <title>Display Name</title>
@ -330,7 +329,6 @@
<property name="wca:deployonapproval"> <property name="wca:deployonapproval">
<title>Deploy On Approval</title> <title>Deploy On Approval</title>
<type>d:boolean</type> <type>d:boolean</type>
<default>false</default>
</property> </property>
</properties> </properties>
</type> </type>

4
source/java/org/alfresco/repo/avm/actions/AVMDeploySnapshotAction.java
View File

@ -65,6 +65,7 @@ import org.apache.commons.logging.LogFactory;
public class AVMDeploySnapshotAction extends ActionExecuterAbstractBase public class AVMDeploySnapshotAction extends ActionExecuterAbstractBase
{ {
public static final String NAME = "avm-deploy-snapshot"; public static final String NAME = "avm-deploy-snapshot";
public static final String FILE_SERVER_PREFIX = "\\\\";
public static final String PARAM_WEBSITE = "website"; public static final String PARAM_WEBSITE = "website";
public static final String PARAM_SERVER = "server"; public static final String PARAM_SERVER = "server";
@ -83,7 +84,6 @@ public class AVMDeploySnapshotAction extends ActionExecuterAbstractBase
private static Log logger = LogFactory.getLog(AVMDeploySnapshotAction.class); private static Log logger = LogFactory.getLog(AVMDeploySnapshotAction.class);
private static Log delayDeploymentLogger = LogFactory.getLog("alfresco.deployment.delay"); private static Log delayDeploymentLogger = LogFactory.getLog("alfresco.deployment.delay");
private static final String FILE_SERVER_PREFIX = "\\\\";
/** /**
* Calculate the URI representation of a server from the given set of properties * Calculate the URI representation of a server from the given set of properties
@ -439,7 +439,7 @@ public class AVMDeploySnapshotAction extends ActionExecuterAbstractBase
reportProps.put(WCMAppModel.PROP_DEPLOYFAILEDREASON, error.getMessage()); reportProps.put(WCMAppModel.PROP_DEPLOYFAILEDREASON, error.getMessage());
} }
reportRef = this.nodeService.createNode(attempt, reportRef = this.nodeService.createNode(attempt,
WCMAppModel.ASSOC_DEPLOYMENTREPORTS, WCMAppModel.ASSOC_DEPLOYMENTREPORT, WCMAppModel.ASSOC_DEPLOYMENTREPORTS, WCMAppModel.ASSOC_DEPLOYMENTREPORTS,
WCMAppModel.TYPE_DEPLOYMENTREPORT, reportProps).getChildRef(); WCMAppModel.TYPE_DEPLOYMENTREPORT, reportProps).getChildRef();
ContentWriter writer = contentService.getWriter(reportRef, ContentModel.PROP_CONTENT, true); ContentWriter writer = contentService.getWriter(reportRef, ContentModel.PROP_CONTENT, true);
writer.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN); writer.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);