From 3ec1beb9e2e57d4821dbc80029802de61f871211 Mon Sep 17 00:00:00 2001
From: evenisse <evenisse@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 8 Mar 2004 11:08:41 +0000
Subject: [PATCH] MPDEPLOY-5. Support for Putty in site:sshdeploy and add
 optional maven.ssh.args and maven.scp.args.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114840 13f79535-47bb-0310-9956-ffa450edef68
---
 site/plugin.jelly         |  7 +++----
 site/xdocs/changes.xml    |  3 +++
 site/xdocs/properties.xml | 14 ++++++++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/site/plugin.jelly b/site/plugin.jelly
index 84873eae..24d3eab7 100644
--- a/site/plugin.jelly
+++ b/site/plugin.jelly
@@ -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="${maven.username}@${pom.siteAddress}:${maven.homepage}"/>
+      <arg line="${maven.scp.args} ${maven.final.name}-site.tar.gz ${maven.username}@${pom.siteAddress}:${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"/>
diff --git a/site/xdocs/changes.xml b/site/xdocs/changes.xml
index b4c14795..aa2a3d36 100644
--- a/site/xdocs/changes.xml
+++ b/site/xdocs/changes.xml
@@ -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>
diff --git a/site/xdocs/properties.xml b/site/xdocs/properties.xml
index d7c817b7..e9e68460 100644
--- a/site/xdocs/properties.xml
+++ b/site/xdocs/properties.xml
@@ -39,6 +39,13 @@
             named <code>scp</code> must be in your path).
           </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>
@@ -49,6 +56,13 @@
             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>
           <td>maven.site.deploy.method</td>
           <td>Yes</td>