From 2071a686b28114de55d23d92263ce1d658a64267 Mon Sep 17 00:00:00 2001
From: aheritier <aheritier@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 16 Jul 2006 21:00:47 +0000
Subject: [PATCH] Update files modes on the remote host after deployment with
 rsync (you don't have to use the same rights in your local directory). Update
 root directory mode on the remote host (rsync and ssh).

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@422534 13f79535-47bb-0310-9956-ffa450edef68
---
 site/plugin.jelly      | 128 +++++++++++++++++++++++++----------------
 site/project.xml       |   2 +-
 site/xdocs/changes.xml |   4 ++
 3 files changed, 83 insertions(+), 51 deletions(-)

diff --git a/site/plugin.jelly b/site/plugin.jelly
index 1353774c..afea25f6 100644
--- a/site/plugin.jelly
+++ b/site/plugin.jelly
@@ -207,7 +207,7 @@
     </exec>
     <echo>Updating files modes on the remote host</echo>
     <exec dir="." executable="${maven.ssh.executable}" failonerror="${maven.site.failonerror}">
-      <arg line="${maven.ssh.args} -l ${siteUsername} ${siteAddress} 'cd ${maven.homepage} &amp;&amp; chmod ${maven.site.chmod.options} ${maven.site.chmod.mode} * ./*'"/>
+      <arg line="${maven.ssh.args} -l ${siteUsername} ${siteAddress} 'cd ${maven.homepage} &amp;&amp; chmod ${maven.site.chmod.options} ${maven.site.chmod.mode} ${maven.homepage} * ./*'"/>
     </exec>
     <echo>Deleting remote archive</echo>
     <exec dir="." executable="${maven.ssh.executable}" failonerror="${maven.site.failonerror}">
@@ -239,40 +239,41 @@
 
   </goal>
 
-  <goal name="site:war" description="Create a WAR File from the generated site"
-    prereqs="site:init, site">
-    <mkdir dir="${docsDest}/WEB-INF" />
-    <war destfile="${maven.build.dir}/${maven.final.name}-site.war"
-      webxml="${plugin.resources}/web.xml">
-      <fileset dir="${docsDest}" />
-    </war>
+  <!-- ================================================================== -->
+  <!-- S I T E  R S Y N C D E P L O Y                                     -->
+  <!-- Deploys the site using rsync                                       -->
+  <!-- ================================================================== -->
+
+  <goal name="site:rsyncdeploy" 
+    description="Deploy the generated site using rsync"
+    prereqs="site:init,site:remote-deploy-init">
+    
+    <echo>rsyncing...</echo>
+    <exec dir="." executable="${maven.ssh.executable}" failonerror="${maven.site.failonerror}">
+      <arg line="${siteUsername}@${siteAddress} 'mkdir -p ${siteDirectory}'" />
+    </exec>
+    
+    <maven:makeRelativePath var="relativeDocsDest" path="${docsDest}" separator="/" basedir="${basedir}" />
+    <j:if test="${siteClean}">
+      <echo>Cleaning destination</echo>
+      <j:set var="rsyncArgs" value="${rsyncArgs} --delete" />
+    </j:if>
+    <!-- Note: trailing slash is important! -->
+    <exec dir="." executable="${maven.rsync.executable}" failonerror="${maven.site.failonerror}">
+      <arg line="-az ${rsyncArgs} ${relativeDocsDest}/ ${siteUsername}@${siteAddress}:${siteDirectory}" />
+    </exec>
+    
+    <echo>Updating files modes on the remote host</echo>
+    <exec dir="." executable="${maven.ssh.executable}" failonerror="${maven.site.failonerror}">
+      <arg line="${maven.ssh.args} -l ${siteUsername} ${siteAddress} 'cd ${siteDirectory} &amp;&amp; chmod ${maven.site.chmod.options} ${maven.site.chmod.mode} ${siteDirectory} * ./*'"/>
+    </exec>
+
   </goal>
 
-  <goal name="site:ear" prereqs="site:war"
-    description="Create an EAR File from the generated site">
-
-    <j:set var="docType1" value="&lt;" />
-    <j:set var="docType2">!DOCTYPE application PUBLIC '-//Sun Microsystems, Inc.//DTD J2EE Application 1.2//EN' 'http://java.sun.com/j2ee/dtds/application_1_2.dtd'</j:set>
-    <j:set var="docType3" value="&gt;" />
-    <mkdir dir="${maven.build.dir}/${plugin.artifactId}" />
-    <j:set var="warName" value="${maven.final.name}-site.war" />
-    
-    <copy file="${plugin.resources}/application.xml"
-      tofile="${maven.build.dir}/${plugin.artifactId}/application.xml"/>
-      
-    <replace file="${maven.build.dir}/${plugin.artifactId}/application.xml">
-      <replacefilter token="@name@" value="${pom.artifactId}"/>
-      <replacefilter token="@shortDescription@"
-        value="${pom.shortDescription}"/>
-      <replacefilter token="@warName@" value="${warName}" />
-      <replacefilter token="@contextRoot@" value="${maven.final.name}" />
-    </replace>
-    
-    <ear destfile="${maven.build.dir}/${maven.final.name}-site.ear"
-      appxml="${maven.build.dir}/${plugin.artifactId}/application.xml">
-      <fileset dir="${maven.build.dir}" includes="${maven.final.name}-site.war" />
-    </ear>
-  </goal>
+  <!-- ================================================================== -->
+  <!-- S I T E  P U B L I S H                                             -->
+  <!-- Synchronize the staged site to the live site                       -->
+  <!-- ================================================================== -->
 
   <goal name="site:publish" description="Synchronize the staged site to the live site" prereqs="site:remote-deploy-init">
     <j:set var="destSiteAddress" value="${pom.siteAddress}" />
@@ -334,24 +335,51 @@
       </j:otherwise>
     </j:choose> 
   </goal>
+  
+  <!-- ================================================================== -->
+  <!-- S I T E  W A R                                                     -->
+  <!-- Create an WAR File from the generated site                         -->
+  <!-- ================================================================== -->
 
-  <goal name="site:rsyncdeploy" 
-    description="Deploy the generated site using rsync"
-    prereqs="site:init,site:remote-deploy-init">
-    <echo>rsyncing...</echo>
-    <exec dir="." executable="${maven.ssh.executable}" failonerror="${maven.site.failonerror}">
-      <arg line="${siteUsername}@${siteAddress} 'mkdir -p ${siteDirectory}'" />
-    </exec>
-    
-    <maven:makeRelativePath var="relativeDocsDest" path="${docsDest}" separator="/" basedir="${basedir}" />
-    <j:if test="${siteClean}">
-      <echo>Cleaning destination</echo>
-      <j:set var="rsyncArgs" value="${rsyncArgs} --delete" />
-    </j:if>
-    <!-- Note: trailing slash is important! -->
-    <exec dir="." executable="${maven.rsync.executable}" failonerror="${maven.site.failonerror}">
-      <arg line="-az ${rsyncArgs} ${relativeDocsDest}/ ${siteUsername}@${siteAddress}:${siteDirectory}" />
-    </exec>
+  <goal name="site:war" description="Create a WAR File from the generated site"
+    prereqs="site:init, site">
+    <mkdir dir="${docsDest}/WEB-INF" />
+    <war destfile="${maven.build.dir}/${maven.final.name}-site.war"
+      webxml="${plugin.resources}/web.xml">
+      <fileset dir="${docsDest}" />
+    </war>
   </goal>
+
+  <!-- ================================================================== -->
+  <!-- S I T E  E A R                                                     -->
+  <!-- Create an EAR File from the generated site                         -->
+  <!-- ================================================================== -->
+
+  <goal name="site:ear" prereqs="site:war"
+    description="Create an EAR File from the generated site">
+
+    <j:set var="docType1" value="&lt;" />
+    <j:set var="docType2">!DOCTYPE application PUBLIC '-//Sun Microsystems, Inc.//DTD J2EE Application 1.2//EN' 'http://java.sun.com/j2ee/dtds/application_1_2.dtd'</j:set>
+    <j:set var="docType3" value="&gt;" />
+    <mkdir dir="${maven.build.dir}/${plugin.artifactId}" />
+    <j:set var="warName" value="${maven.final.name}-site.war" />
+    
+    <copy file="${plugin.resources}/application.xml"
+      tofile="${maven.build.dir}/${plugin.artifactId}/application.xml"/>
+      
+    <replace file="${maven.build.dir}/${plugin.artifactId}/application.xml">
+      <replacefilter token="@name@" value="${pom.artifactId}"/>
+      <replacefilter token="@shortDescription@"
+        value="${pom.shortDescription}"/>
+      <replacefilter token="@warName@" value="${warName}" />
+      <replacefilter token="@contextRoot@" value="${maven.final.name}" />
+    </replace>
+    
+    <ear destfile="${maven.build.dir}/${maven.final.name}-site.ear"
+      appxml="${maven.build.dir}/${plugin.artifactId}/application.xml">
+      <fileset dir="${maven.build.dir}" includes="${maven.final.name}-site.war" />
+    </ear>
+  </goal>
+
 </project>
 
diff --git a/site/project.xml b/site/project.xml
index 6dad82b8..19e2ea20 100644
--- a/site/project.xml
+++ b/site/project.xml
@@ -22,7 +22,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-site-plugin</id>
   <name>Maven Site Plugin</name>
-  <currentVersion>1.7</currentVersion>
+  <currentVersion>1.7.1-SNAPSHOT</currentVersion>
   <description>Generate web site.</description>
   <shortDescription>Generate web site</shortDescription>
   <developers>
diff --git a/site/xdocs/changes.xml b/site/xdocs/changes.xml
index b8730ee5..4d7d11ea 100644
--- a/site/xdocs/changes.xml
+++ b/site/xdocs/changes.xml
@@ -23,6 +23,10 @@
     <author email="dion@multitask.com.au">dIon Gillard</author>
   </properties>
   <body>
+    <release version="1.7.1-SNAPSHOT" date="In SVN">
+      <action dev="aheritier" type="fix">Update files modes on the remote host after deployment with rsync (you don't have to use the same rights in your local directory).</action>
+      <action dev="aheritier" type="fix">Update root directory mode on the remote host (rsync and ssh).</action>
+    </release>
     <release version="1.7" date="2006-05-07">
       <action dev="ltheussl" type="add" issue="MPSITE-50" due-to="Shinobu Kawai">New property
         <code>maven.site.reports.ignoreErrors</code>to ignore any errors in all reports during site generation.