Author: aheritier
Date: Wed Jun 29 14:44:40 2005
New Revision: 202438
URL: http://svn.apache.org/viewcvs?rev=202438&view=rev
Log:
Fix MPSITE-28 : Deploying the site documentation through SSH always results in
'Build Successful'.
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=202438&r1=202437&r2=202438&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/site/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/site/plugin.jelly Wed Jun 29 14:44:40 2005
@@ -169,21 +169,21 @@
<j:if test="${siteClean}">
<echo>Cleaning destination first</echo>
- <exec dir="." executable="${maven.ssh.executable}">
+ <exec dir="." executable="${maven.ssh.executable}" failonerror="true">
<arg line="[EMAIL PROTECTED] 'rm -r ${siteDirectory}'" />
</exec>
</j:if>
<!-- Make sure the destination directory exists before trying to copy -->
- <exec dir="." executable="${maven.ssh.executable}">
+ <exec dir="." executable="${maven.ssh.executable}" failonerror="true">
<arg line="${maven.ssh.args} -l ${siteUsername} ${siteAddress} 'mkdir -p
${maven.homepage}'"/>
</exec>
- <exec dir="${maven.build.dir}" executable="${maven.scp.executable}">
+ <exec dir="${maven.build.dir}" executable="${maven.scp.executable}"
failonerror="true">
<arg line="${maven.scp.args} ${maven.final.name}-site.tar.gz [EMAIL
PROTECTED]:${maven.homepage}"/>
</exec>
- <exec dir="." executable="${maven.ssh.executable}">
+ <exec dir="." executable="${maven.ssh.executable}" failonerror="true">
<arg line="${maven.ssh.args} -l ${siteUsername} ${siteAddress} 'cd
${maven.homepage} && ${maven.site.gunzip.executable}
${maven.final.name}-site.tar.gz && ${maven.site.tar.executable}
${maven.site.tar.options} ${maven.final.name}-site.tar && chmod -Rf g+u
* . && rm ${maven.final.name}-site.tar'"/>
</exec>
@@ -312,7 +312,7 @@
description="Deploy the generated site using rsync"
prereqs="site:init,site:remote-deploy-init">
<echo>rsyncing...</echo>
- <exec dir="." executable="${maven.ssh.executable}">
+ <exec dir="." executable="${maven.ssh.executable}" failonerror="true">
<arg line="[EMAIL PROTECTED] 'mkdir -p ${siteDirectory}'" />
</exec>
@@ -322,7 +322,7 @@
<j:set var="rsyncArgs" value="${rsyncArgs} --delete" />
</j:if>
<!-- Note: trailing slash is important! -->
- <exec dir="." executable="${maven.rsync.executable}">
+ <exec dir="." executable="${maven.rsync.executable}" failonerror="true">
<arg line="-az ${rsyncArgs} ${relativeDocsDest}/ [EMAIL
PROTECTED]:${siteDirectory}" />
</exec>
</goal>
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=202438&r1=202437&r2=202438&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/site/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/site/xdocs/changes.xml Wed Jun 29 14:44:40 2005
@@ -23,6 +23,7 @@
</properties>
<body>
<release version="1.6.2-SNAPSHOT" date="In SVN">
+ <action dev="aheritier" type="fix" issue="MPSITE-28" due-to="Davy
Toch">Deploying the site documentation through SSH always results in 'Build
Successful'.</action>
<action dev="aheritier" type="fix" issue="MPSITE-27">FTP deployment
doesn't create the remote directory root.</action>
</release>
<release version="1.6.1" date="2005-06-05">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
