You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/01/20 12:33:31 UTC

svn commit: r125757 - /maven/maven-1/plugins/trunk/site/plugin.jelly /maven/maven-1/plugins/trunk/site/project.xml /maven/maven-1/plugins/trunk/site/xdocs/changes.xml /maven/maven-1/plugins/trunk/site/xdocs/properties.xml

Author: brett
Date: Thu Jan 20 03:33:25 2005
New Revision: 125757

URL: http://svn.apache.org/viewcvs?view=rev&rev=125757
Log:
tweaks to rsync options and docs
Modified:
   maven/maven-1/plugins/trunk/site/plugin.jelly
   maven/maven-1/plugins/trunk/site/project.xml
   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/viewcvs/maven/maven-1/plugins/trunk/site/plugin.jelly?view=diff&rev=125757&p1=maven/maven-1/plugins/trunk/site/plugin.jelly&r1=125756&p2=maven/maven-1/plugins/trunk/site/plugin.jelly&r2=125757
==============================================================================
--- maven/maven-1/plugins/trunk/site/plugin.jelly	(original)
+++ maven/maven-1/plugins/trunk/site/plugin.jelly	Thu Jan 20 03:33:25 2005
@@ -284,7 +284,7 @@
           <j:set var="rsyncArgs" value="${rsyncArgs} --delete" />
         </j:if>
         <exec dir="." executable="${maven.ssh.executable}">
-          <arg line="${siteUsername}@${siteAddress} '${maven.rsync.executable} ${rsyncArgs} -avz ${siteDirectory}/* ${destSiteUsername}@${destSiteAddress}:${destSiteDirectory}'" />
+          <arg line="${siteUsername}@${siteAddress} '${maven.rsync.executable} ${rsyncArgs} -az ${siteDirectory}/* ${destSiteUsername}@${destSiteAddress}:${destSiteDirectory}'" />
         </exec>
       </j:otherwise>
     </j:choose> 
@@ -303,7 +303,7 @@
       <j:set var="rsyncArgs" value="${rsyncArgs} --delete" />
     </j:if>
     <exec dir="." executable="${maven.rsync.executable}">
-      <arg line="-avz ${rsyncArgs} ${relativeDocsDest}/* ${siteUsername}@${siteAddress}:${siteDirectory}" />
+      <arg line="-az ${rsyncArgs} ${relativeDocsDest}/* ${siteUsername}@${siteAddress}:${siteDirectory}" />
     </exec>
   </goal>
 </project>

Modified: maven/maven-1/plugins/trunk/site/project.xml
Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/site/project.xml?view=diff&rev=125757&p1=maven/maven-1/plugins/trunk/site/project.xml&r1=125756&p2=maven/maven-1/plugins/trunk/site/project.xml&r2=125757
==============================================================================
--- maven/maven-1/plugins/trunk/site/project.xml	(original)
+++ maven/maven-1/plugins/trunk/site/project.xml	Thu Jan 20 03:33:25 2005
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-site-plugin</id>
   <name>Maven Site Plugin</name>
-  <currentVersion>1.6</currentVersion>
+  <currentVersion>1.6.1-SNAPSHOT</currentVersion>
   <description>Generate web site.</description>
   <shortDescription>Generate web site</shortDescription>
   <url>http://maven.apache.org/reference/plugins/site/</url>

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?view=diff&rev=125757&p1=maven/maven-1/plugins/trunk/site/xdocs/changes.xml&r1=125756&p2=maven/maven-1/plugins/trunk/site/xdocs/changes.xml&r2=125757
==============================================================================
--- maven/maven-1/plugins/trunk/site/xdocs/changes.xml	(original)
+++ maven/maven-1/plugins/trunk/site/xdocs/changes.xml	Thu Jan 20 03:33:25 2005
@@ -24,6 +24,9 @@
     <author email="dion@multitask.com.au">dIon Gillard</author>
   </properties>
   <body>
+    <release version="1.6.1-SNAPSHOT" date="in SVN">
+      <action dev="brett" type="change">Remove -v option from rsync by default</action>
+    </release>
     <release version="1.6" date="2005-01-18">
       <action dev="brett" type="add">Add ability to clean the destination before deployment</action>
       <action dev="brett" type="add" issue="MPSITE-21">Add the rsync deployment method</action>

Modified: maven/maven-1/plugins/trunk/site/xdocs/properties.xml
Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/site/xdocs/properties.xml?view=diff&rev=125757&p1=maven/maven-1/plugins/trunk/site/xdocs/properties.xml&r1=125756&p2=maven/maven-1/plugins/trunk/site/xdocs/properties.xml&r2=125757
==============================================================================
--- maven/maven-1/plugins/trunk/site/xdocs/properties.xml	(original)
+++ maven/maven-1/plugins/trunk/site/xdocs/properties.xml	Thu Jan 20 03:33:25 2005
@@ -109,6 +109,13 @@
           </td>
         </tr>
         <tr>
+          <td>maven.rsync.args</td>
+          <td>Yes</td>
+          <td>
+            Specifies optional parameters that are passed to the rsync executable (in addition to -az).
+          </td>
+        </tr>
+        <tr>
           <td>maven.ssh.args</td>
           <td>Yes</td>
           <td>
@@ -159,10 +166,8 @@
     </section>
     <section name="Using Putty as ssh client">
       <p>Set the following porperties (preferably in your %HOME%/build.properties)</p>
-      <source>
-maven.scp.executable=pscp
-maven.ssh.executable=plink
-      </source>
+      <source>maven.scp.executable=pscp
+maven.ssh.executable=plink</source>
     </section>
   </body>
 </document>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org