You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by lt...@apache.org on 2005/09/22 17:28:12 UTC
svn commit: r290961 - in /maven/maven-1/plugins/trunk/site: plugin.jelly
xdocs/changes.xml
Author: ltheussl
Date: Thu Sep 22 08:28:10 2005
New Revision: 290961
URL: http://svn.apache.org/viewcvs?rev=290961&view=rev
Log:
MPSITE-40: Missing maven.ssh.args in site:publish
Modified:
maven/maven-1/plugins/trunk/site/plugin.jelly
maven/maven-1/plugins/trunk/site/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/site/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/site/plugin.jelly?rev=290961&r1=290960&r2=290961&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/site/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/site/plugin.jelly Thu Sep 22 08:28:10 2005
@@ -287,11 +287,11 @@
<j:if test="${publishClean}">
<echo>Cleaning destination first</echo>
<exec dir="." executable="${maven.ssh.executable}">
- <arg line="${siteUsername}@${siteAddress} 'rm -r ${destSiteDirectory}'" />
+ <arg line="${maven.ssh.args} -l ${siteUsername} ${siteAddress} 'rm -r ${destSiteDirectory}'" />
</exec>
</j:if>
<exec dir="." executable="${maven.ssh.executable}">
- <arg line="${siteUsername}@${siteAddress} 'mkdir -p ${destSiteDirectory}; cp -r ${siteDirectory}/* ${destSiteDirectory}'" />
+ <arg line="${maven.ssh.args} -l ${siteUsername} ${siteAddress} 'mkdir -p ${destSiteDirectory} && cp -r ${siteDirectory}/* ${destSiteDirectory}'" />
</exec>
</j:when>
<j:otherwise>
@@ -302,7 +302,7 @@
<j:set var="rsyncArgs" value="${rsyncArgs} --delete" />
</j:if>
<exec dir="." executable="${maven.ssh.executable}">
- <arg line="${siteUsername}@${siteAddress} '${maven.rsync.executable} ${rsyncArgs} -az ${siteDirectory}/* ${destSiteUsername}@${destSiteAddress}:${destSiteDirectory}'" />
+ <arg line="${maven.ssh.args} -l ${siteUsername} ${siteAddress} '${maven.rsync.executable} ${rsyncArgs} -az ${siteDirectory}/* ${destSiteUsername}@${destSiteAddress}:${destSiteDirectory}'" />
</exec>
</j:otherwise>
</j:choose>
Modified: maven/maven-1/plugins/trunk/site/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/site/xdocs/changes.xml?rev=290961&r1=290960&r2=290961&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/site/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/site/xdocs/changes.xml Thu Sep 22 08:28:10 2005
@@ -23,6 +23,7 @@
</properties>
<body>
<release version="1.6.2-SNAPSHOT" date="In SVN">
+ <action dev="ltheussl" type="fix" issue="MPSITE-40">Missing <code>maven.ssh.args</code> in <code>site:publish</code>.</action>
<action dev="ltheussl" type="add" issue="MPSITE-31">Make <code>chmod</code> options in <code>site:sshdeploy</code> configurable.</action>
<action dev="ltheussl" type="fix" issue="MPSITE-24" due-to="Julian Dunn">SSH arguments not used in <code>sshdeploy</code> with 'clean'.</action>
<action dev="aheritier" type="fix" issue="MPSITE-28" due-to="Davy Toch">Deploying the site documentation through SSH always results in 'Build Successful'.</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org