evenisse 2004/03/08 03:08:41
Modified: site plugin.jelly
site/xdocs changes.xml properties.xml
Log:
MPDEPLOY-5. Support for Putty in site:sshdeploy and add optional maven.ssh.args and
maven.scp.args.
Revision Changes Path
1.25 +3 -4 maven-plugins/site/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/site/plugin.jelly,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- plugin.jelly 4 Mar 2004 18:38:55 -0000 1.24
+++ plugin.jelly 8 Mar 2004 11:08:41 -0000 1.25
@@ -135,16 +135,15 @@
<!-- Make sure the destination directory exists before trying to copy -->
<exec dir="." executable="${maven.ssh.executable}">
- <arg line="${pom.siteAddress} -l ${maven.username} 'mkdir -p
${maven.homepage}'"/>
+ <arg line="${maven.ssh.args} -l ${maven.username} ${pom.siteAddress} 'mkdir
-p ${maven.homepage}'"/>
</exec>
<exec dir="${maven.build.dir}" executable="${maven.scp.executable}">
- <arg value="${maven.final.name}-site.tar.gz"/>
- <arg value="[EMAIL PROTECTED]:${maven.homepage}"/>
+ <arg line="${maven.scp.args} ${maven.final.name}-site.tar.gz [EMAIL
PROTECTED]:${maven.homepage}"/>
</exec>
<exec dir="." executable="${maven.ssh.executable}">
- <arg line="${pom.siteAddress} -l ${maven.username} 'cd
${maven.homepage};${maven.site.gunzip.executable}
${maven.final.name}-site.tar.gz;${maven.site.tar.executable} xUvf
${maven.final.name}-site.tar;chmod -R g+u * .;rm ${maven.final.name}-site.tar'"/>
+ <arg line="${maven.ssh.args} -l ${maven.username} ${pom.siteAddress} 'cd
${maven.homepage};${maven.site.gunzip.executable}
${maven.final.name}-site.tar.gz;${maven.site.tar.executable} xUvf
${maven.final.name}-site.tar;chmod -R g+u * .;rm ${maven.final.name}-site.tar'"/>
</exec>
<delete file="${maven.build.dir}/${maven.final.name}-site.tar.gz"/>
1.15 +3 -0 maven-plugins/site/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/site/xdocs/changes.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- changes.xml 4 Mar 2004 18:38:55 -0000 1.14
+++ changes.xml 8 Mar 2004 11:08:41 -0000 1.15
@@ -26,6 +26,9 @@
<body>
<release version="1.5" date="in CVS">
+ <action dev="evenisse" type="add" issue=""MPDEPLOY-5">
+ support for Putty in site:sshdeploy and add optional maven.ssh.args and
maven.scp.args.
+ </action>
<action dev="dion" type="fix">Remove telnet server for ftp deployment</action>
<action dev="dion" type="update">Remove unneeded ant dependency</action>
</release>
1.4 +14 -0 maven-plugins/site/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/site/xdocs/properties.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- properties.xml 4 Mar 2004 18:38:55 -0000 1.3
+++ properties.xml 8 Mar 2004 11:08:41 -0000 1.4
@@ -40,6 +40,13 @@
</td>
</tr>
<tr>
+ <td>maven.scp.args</td>
+ <td>Yes</td>
+ <td>
+ Specifies optional parameters that are passed to the scp executable.
+ </td>
+ </tr>
+ <tr>
<td>maven.ssh.executable</td>
<td>Yes</td>
<td>
@@ -47,6 +54,13 @@
shell executable to use (SSH). This is used by the "site:deploy" goal.
The default value is <code>ssh</code> (i.e. an executable
named <code>ssh</code> must be in your path).
+ </td>
+ </tr>
+ <tr>
+ <td>maven.ssh.args</td>
+ <td>Yes</td>
+ <td>
+ Specifies optional parameters that are passed to the ssh executable.
</td>
</tr>
<tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
