Author: aheritier
Date: Sun Apr 15 16:17:26 2007
New Revision: 529091
URL: http://svn.apache.org/viewvc?view=rev&rev=529091
Log:
Do not force -az options for rsync. maven.rsync.args=-az by default but can be
overriden.
Modified:
maven/maven-1/plugins/trunk/site/plugin.jelly
maven/maven-1/plugins/trunk/site/plugin.properties
maven/maven-1/plugins/trunk/site/xdocs/changes.xml
maven/maven-1/plugins/trunk/site/xdocs/properties.xml
Modified: maven/maven-1/plugins/trunk/site/plugin.jelly
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/site/plugin.jelly?view=diff&rev=529091&r1=529090&r2=529091
==============================================================================
--- maven/maven-1/plugins/trunk/site/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/site/plugin.jelly Sun Apr 15 16:17:26 2007
@@ -262,7 +262,7 @@
</j:if>
<!-- Note: trailing slash is important! -->
<exec dir="." executable="${maven.rsync.executable}"
failonerror="${maven.site.failonerror}">
- <arg line="-az ${rsyncArgs} ${relativeDocsDest}/ [EMAIL
PROTECTED]:${siteDirectory}" />
+ <arg line="${rsyncArgs} ${relativeDocsDest}/ [EMAIL
PROTECTED]:${siteDirectory}" />
</exec>
<echo>Updating files modes on the remote host</echo>
@@ -332,7 +332,7 @@
<j:set var="rsyncArgs" value="${rsyncArgs} --delete" />
</j:if>
<exec dir="." executable="${maven.ssh.executable}"
failonerror="${maven.site.failonerror}">
- <arg line="${maven.ssh.args} -l ${siteUsername} ${siteAddress}
'${maven.rsync.executable} ${rsyncArgs} -az ${siteDirectory}/* [EMAIL
PROTECTED]:${destSiteDirectory}'" />
+ <arg line="${maven.ssh.args} -l ${siteUsername} ${siteAddress}
'${maven.rsync.executable} ${rsyncArgs} ${siteDirectory}/* [EMAIL
PROTECTED]:${destSiteDirectory}'" />
</exec>
</j:otherwise>
</j:choose>
Modified: maven/maven-1/plugins/trunk/site/plugin.properties
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/site/plugin.properties?view=diff&rev=529091&r1=529090&r2=529091
==============================================================================
--- maven/maven-1/plugins/trunk/site/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/site/plugin.properties Sun Apr 15 16:17:26 2007
@@ -37,6 +37,7 @@
maven.site.reports.ignoreErrors=false
maven.rsync.executable=rsync
+maven.rsync.args=-az
maven.username=USERNAME_NOT_SET
Modified: maven/maven-1/plugins/trunk/site/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/site/xdocs/changes.xml?view=diff&rev=529091&r1=529090&r2=529091
==============================================================================
--- maven/maven-1/plugins/trunk/site/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/site/xdocs/changes.xml Sun Apr 15 16:17:26 2007
@@ -24,7 +24,8 @@
<author email="[EMAIL PROTECTED]">dIon Gillard</author>
</properties>
<body>
- <release version="1.7.2-SNAPSHOT" date="In SVN">
+ <release version="1.7.2-SNAPSHOT" date="In SVN">
+ <action dev="aheritier" type="update">Do not force -az options for
rsync. maven.rsync.args=-az by default but can be overriden.</action>
<action dev="aheritier" type="fix">maven.rsync.args isn't used by
site:rsyncdeploy.</action>
</release>
<release version="1.7.1" date="2007-03-28">
Modified: maven/maven-1/plugins/trunk/site/xdocs/properties.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/site/xdocs/properties.xml?view=diff&rev=529091&r1=529090&r2=529091
==============================================================================
--- maven/maven-1/plugins/trunk/site/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/site/xdocs/properties.xml Sun Apr 15 16:17:26
2007
@@ -113,7 +113,7 @@
<td>maven.rsync.args</td>
<td>Yes</td>
<td>
- Specifies optional parameters that are passed to the rsync
executable (in addition to -az).
+ Specifies parameters that are passed to the rsync executable.
Default : -az.
</td>
</tr>
<tr>
