dion        2003/04/01 16:13:36

  Modified:    src/plugins-build/site/xdocs properties.xml changes.xml
               src/plugins-build/site plugin.jelly project.xml
                        plugin.properties
  Log:
  - Applied a modified version of the patch in MAVEN-358
  - Upped the project version to 1.2-SNAPSHOT
  - Documented new properties
  - Added changes record for this release
  
  Revision  Changes    Path
  1.2       +19 -0     maven/src/plugins-build/site/xdocs/properties.xml
  
  Index: properties.xml
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/site/xdocs/properties.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- properties.xml    24 Jan 2003 03:45:50 -0000      1.1
  +++ properties.xml    2 Apr 2003 00:13:36 -0000       1.2
  @@ -42,6 +42,25 @@
               The <code>siteDirectory</code> property will be used to copy the site 
to.
             </td>
           </tr>
  +        <tr>
  +          <td>maven.site.tar.executable</td>
  +          <td>Yes</td>
  +          <td>
  +            Specifies the executable to use for 'tar' when deploying the site. 
  +            Defaults to <code>tar</code>. Override this property if your
  +            system has a default version of tar that is failing.
  +          </td>
  +        </tr>
  +        
  +        <tr>
  +          <td>maven.site.gunzip.executable</td>
  +          <td>Yes</td>
  +          <td>
  +            Specifies the executable to use for 'gunzip' when deploying the site. 
  +            Defaults to <code>gunzip</code>. Override this property if your
  +            system has a default version of gunzip that is failing.
  +          </td>
  +        </tr>
         </table>
       </section>
     </body>
  
  
  
  1.2       +11 -1     maven/src/plugins-build/site/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/site/xdocs/changes.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- changes.xml       24 Jan 2003 03:45:50 -0000      1.1
  +++ changes.xml       2 Apr 2003 00:13:36 -0000       1.2
  @@ -6,16 +6,26 @@
     </properties>
   
     <body>
  -    <release version="1.1" date="in CVS">
  +
  +    <release version="1.2" date="in CVS">
  +      <action dev="dion" type="add" due-to="John Casey">
  +        Added properties <code>maven.site.gunzip.executable</code>
  +        and <code>maven.site.tar.executable</code>
  +      </action>
  +    </release>
  +  
  +    <release version="1.1" date="2002-02-12">
         <action dev="dion" type="add" due-to="Alef Arendsen">
           Added ability to deploy via filesystem
         </action>
       </release>
  +    
       <release version="1.0" date="2002-08-04">
         <action dev="jvanzyl" type="add">
           Original release for Maven 1.0-beta6
         </action>
       </release>
  +
     </body>
   </document>
   
  
  
  
  1.13      +1 -1      maven/src/plugins-build/site/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/site/plugin.jelly,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- plugin.jelly      30 Mar 2003 16:17:20 -0000      1.12
  +++ plugin.jelly      2 Apr 2003 00:13:36 -0000       1.13
  @@ -99,7 +99,7 @@
       </exec>
   
       <exec dir="." executable="${maven.ssh.executable}">
  -      <arg line="${pom.siteAddress} -l ${maven.username} 'cd 
${maven.homepage};gunzip ${maven.final.name}-site.tar.gz;tar xUvf 
${maven.final.name}-site.tar;chmod -R g+u *;rm ${maven.final.name}-site.tar'"/>
  +      <arg line="${pom.siteAddress} -l ${maven.username} 'cd 
${maven.homepage};${maven.site.gunzip.executable} 
${maven.final.name}-site.tar.gz;${maven.site.tar.executable} xUvf 
${maven.final.name}-site.tar;chmod -R g+u *;rm ${maven.final.name}-site.tar'"/>
       </exec>
   
       <delete file="${maven.build.dir}/${maven.final.name}-site.tar.gz"/>
  
  
  
  1.9       +1 -1      maven/src/plugins-build/site/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/site/project.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- project.xml       19 Mar 2003 05:36:11 -0000      1.8
  +++ project.xml       2 Apr 2003 00:13:36 -0000       1.9
  @@ -5,7 +5,7 @@
     <pomVersion>3</pomVersion>
     <id>maven-site-plugin</id>
     <name>Maven Site Plugin</name>
  -  <currentVersion>1.1</currentVersion>
  +  <currentVersion>1.2-SNAPSHOT</currentVersion>
     <description/>
     <shortDescription>Java Project Management Tools</shortDescription>
     <url>http://maven.apache.org/reference/plugins/site/</url>
  
  
  
  1.3       +3 -0      maven/src/plugins-build/site/plugin.properties
  
  Index: plugin.properties
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/site/plugin.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- plugin.properties 25 Jan 2003 18:19:55 -0000      1.2
  +++ plugin.properties 2 Apr 2003 00:13:36 -0000       1.3
  @@ -10,5 +10,8 @@
   # to copy the site to
   maven.site.deploy.method=ssh
   
  +maven.site.tar.executable=tar
  +maven.site.gunzip.executable=gunzip
  +
   maven.username=USERNAME_NOT_SET
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to