Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix MPSITE-28 : Deploying the site documentation through SSH always results in 'Build Successful'.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@202438 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
aheritier 2005-06-29 21:44:40 +00:00
parent 58192d6768
commit f67fab61d6
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
site/plugin.jelly
View File

@ -169,21 +169,21 @@
<j:if test="${siteClean}"> <j:if test="${siteClean}">
<echo>Cleaning destination first</echo> <echo>Cleaning destination first</echo>
<exec dir="." executable="${maven.ssh.executable}"> <exec dir="." executable="${maven.ssh.executable}" failonerror="true">
<arg line="${siteUsername}@${siteAddress} 'rm -r ${siteDirectory}'" /> <arg line="${siteUsername}@${siteAddress} 'rm -r ${siteDirectory}'" />
</exec> </exec>
</j:if> </j:if>
<!-- Make sure the destination directory exists before trying to copy --> <!-- 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}'"/> <arg line="${maven.ssh.args} -l ${siteUsername} ${siteAddress} 'mkdir -p ${maven.homepage}'"/>
</exec> </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 ${siteUsername}@${siteAddress}:${maven.homepage}"/> <arg line="${maven.scp.args} ${maven.final.name}-site.tar.gz ${siteUsername}@${siteAddress}:${maven.homepage}"/>
</exec> </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} &amp;&amp; ${maven.site.gunzip.executable} ${maven.final.name}-site.tar.gz &amp;&amp; ${maven.site.tar.executable} ${maven.site.tar.options} ${maven.final.name}-site.tar &amp;&amp; chmod -Rf g+u * . &amp;&amp; rm ${maven.final.name}-site.tar'"/> <arg line="${maven.ssh.args} -l ${siteUsername} ${siteAddress} 'cd ${maven.homepage} &amp;&amp; ${maven.site.gunzip.executable} ${maven.final.name}-site.tar.gz &amp;&amp; ${maven.site.tar.executable} ${maven.site.tar.options} ${maven.final.name}-site.tar &amp;&amp; chmod -Rf g+u * . &amp;&amp; rm ${maven.final.name}-site.tar'"/>
</exec> </exec>
@ -312,7 +312,7 @@
description="Deploy the generated site using rsync" description="Deploy the generated site using rsync"
prereqs="site:init,site:remote-deploy-init"> prereqs="site:init,site:remote-deploy-init">
<echo>rsyncing...</echo> <echo>rsyncing...</echo>
<exec dir="." executable="${maven.ssh.executable}"> <exec dir="." executable="${maven.ssh.executable}" failonerror="true">
<arg line="${siteUsername}@${siteAddress} 'mkdir -p ${siteDirectory}'" /> <arg line="${siteUsername}@${siteAddress} 'mkdir -p ${siteDirectory}'" />
</exec> </exec>
@ -322,7 +322,7 @@
<j:set var="rsyncArgs" value="${rsyncArgs} --delete" /> <j:set var="rsyncArgs" value="${rsyncArgs} --delete" />
</j:if> </j:if>
<!-- Note: trailing slash is important! --> <!-- Note: trailing slash is important! -->
<exec dir="." executable="${maven.rsync.executable}"> <exec dir="." executable="${maven.rsync.executable}" failonerror="true">
<arg line="-az ${rsyncArgs} ${relativeDocsDest}/ ${siteUsername}@${siteAddress}:${siteDirectory}" /> <arg line="-az ${rsyncArgs} ${relativeDocsDest}/ ${siteUsername}@${siteAddress}:${siteDirectory}" />
</exec> </exec>
</goal> </goal>

1
site/xdocs/changes.xml
View File

@ -23,6 +23,7 @@
</properties> </properties>
<body> <body>
<release version="1.6.2-SNAPSHOT" date="In SVN"> <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> <action dev="aheritier" type="fix" issue="MPSITE-27">FTP deployment doesn't create the remote directory root.</action>
</release> </release>
<release version="1.6.1" date="2005-06-05"> <release version="1.6.1" date="2005-06-05">