Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 92847 invoked from network); 10 Mar 2005 13:01:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 10 Mar 2005 13:01:59 -0000 Received: (qmail 7983 invoked by uid 500); 10 Mar 2005 13:01:58 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 7758 invoked by uid 500); 10 Mar 2005 13:01:57 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 7743 invoked by uid 500); 10 Mar 2005 13:01:57 -0000 Received: (qmail 7738 invoked by uid 99); 10 Mar 2005 13:01:57 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 10 Mar 2005 05:01:56 -0800 Received: (qmail 92815 invoked by uid 1539); 10 Mar 2005 13:01:55 -0000 Date: 10 Mar 2005 13:01:55 -0000 Message-ID: <20050310130155.92814.qmail@minotaur.apache.org> From: peterreilly@apache.org To: ant-cvs@apache.org Subject: cvs commit: ant/docs/manual/CoreTasks echo.html genkey.html java.html mail.html style.html tar.html unzip.html waitfor.html X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N peterreilly 2005/03/10 05:01:55 Modified: docs/manual/CoreTasks echo.html genkey.html java.html mail.html style.html tar.html unzip.html waitfor.html Log: some fixes to align examples Revision Changes Path 1.14 +1 -1 ant/docs/manual/CoreTasks/echo.html Index: echo.html =================================================================== RCS file: /home/cvs/ant/docs/manual/CoreTasks/echo.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- echo.html 7 Mar 2005 18:09:09 -0000 1.13 +++ echo.html 10 Mar 2005 13:01:55 -0000 1.14 @@ -86,7 +86,7 @@ 
<echo file="runner.csh" append="false">#\!/bin/tcsh
   java-1.3.1 -mx1024m ${project.entrypoint} $$*
  -
+</echo> Generate a shell script by echoing to a file. Note the use of a double $ symbol to stop Ant filtering out the single $ during variable expansion 1.11 +7 -6 ant/docs/manual/CoreTasks/genkey.html Index: genkey.html =================================================================== RCS file: /home/cvs/ant/docs/manual/CoreTasks/genkey.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- genkey.html 7 Mar 2005 18:09:09 -0000 1.10 +++ genkey.html 10 Mar 2005 13:01:55 -0000 1.11 @@ -86,20 +86,21 @@

The following two examples are identical:

Examples

-
-

<genkey alias="apache-group" storepass="secret" - dname="CN=Ant Group, OU=Jakarta Division, O=Apache.org, C=US"/>

-
+
  +<genkey alias="apache-group" storepass="secret" 
  +  dname="CN=Ant Group, OU=Jakarta Division, O=Apache.org, C=US"/>
  +
- 
<genkey alias="apache-group" storepass="secret" >
  +  
  +<genkey alias="apache-group" storepass="secret" >
     <dname>
       <param name="CN" value="Ant Group"/>
       <param name="OU" value="Jakarta Division"/>
       <param name="O"  value="Apache.Org"/>
       <param name="C"  value="US"/>
     </dname>
  -</genkey>

  +</genkey>

Copyright © 2000-2001,2003,2005 Apache Software Foundation. All rights 1.38 +6 -3 ant/docs/manual/CoreTasks/java.html Index: java.html =================================================================== RCS file: /home/cvs/ant/docs/manual/CoreTasks/java.html,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- java.html 7 Mar 2005 18:09:09 -0000 1.37 +++ java.html 10 Mar 2005 13:01:55 -0000 1.38 @@ -302,7 +302,8 @@ Run a class in this JVM with a new jar on the classpath -

        <java jar="dist/test.jar"
  +
  +       <java jar="dist/test.jar"
              fork="true"
              failonerror="true"
              maxmemory="128m"
  @@ -318,7 +319,8 @@
   using the manifest supplied entry point, forking (as required),
   and with a maximum memory of 128MB. Any non zero return code breaks the build.
   
  -
        <java
  +
  +       <java
              dir="${exec.dir}"
              jar="${exec.dir}/dist/test.jar"
              fork="true"
  @@ -339,7 +341,8 @@
   
   
   
  <java classname="test.Main"/>

  -
  <java classname="test.Main"
  +
  +  <java classname="test.Main"
           fork="yes" >
       <sysproperty key="DEBUG" value="true"/>
       <arg value="-h"/>
  
  
  
  1.28      +20 -12    ant/docs/manual/CoreTasks/mail.html
  
  Index: mail.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/mail.html,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- mail.html	7 Mar 2005 18:09:09 -0000	1.27
  +++ mail.html	10 Mar 2005 13:01:55 -0000	1.28
  @@ -10,18 +10,26 @@
   
   
Mail

   
Description

  -
A task to send SMTP email.




  -This task can send mail using either plain
  -text, UU encoding, or MIME format mail, depending on what is available.




  -

  -SMTP auth and SSL/TLS require JavaMail and are only available in MIME format.




  -Attachments may be sent using nested
  -fileset elements.

  -
Note: This task may depend on external libraries
  -that are not included
  -in the Ant distribution.  See 
  -Library Dependencies for more information.
  -

  +  

  +    A task to send SMTP email.
  +  

  +  

  +    This task can send mail using either plain
  +    text, UU encoding, or MIME format mail, depending on what is available.
  +  

  +  

  +    SMTP auth and SSL/TLS require JavaMail and are only available in MIME format.
  +  

  +  

  +    Attachments may be sent using nested
  +    fileset elements.
  +  

  +  

  +    Note: This task may depend on external libraries
  +    that are not included in the Ant distribution. 
  +    See Library Dependencies
  +    for more information.
  +  

   
   
Parameters

   
  
  
  
  1.35      +14 -7     ant/docs/manual/CoreTasks/style.html
  
  Index: style.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/style.html,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- style.html	7 Mar 2005 18:09:09 -0000	1.34
  +++ style.html	10 Mar 2005 13:01:55 -0000	1.35
  @@ -306,7 +306,8 @@
   <style basedir="doc" destdir="build/doc"
          extension=".html" style="style/apache.xsl"/>
Using an xmlcatalog

  -  
<xslt basedir="doc" destdir="build/doc"
  +  
  +<xslt basedir="doc" destdir="build/doc"
         extension=".html" style="style/apache.xsl">
     <xmlcatalog refid="mycatalog"/>
   </xslt>
  @@ -318,9 +319,11 @@
            publicId="-//ArielPartners//DTD XML Article V1.0//EN"
            location="com/arielpartners/knowledgebase/dtd/article.dtd"/>
      </xmlcatalog>
  -</xslt>

  +</xslt>
  +
Using XSL parameters

  -
<xslt basedir="doc" destdir="build/doc"
  +
  +<xslt basedir="doc" destdir="build/doc"
         extension=".html" style="style/apache.xsl">
     <param name="date" expression="07-01-2000"/>
   </xslt>

  @@ -331,16 +334,19 @@
     

   
     
Using output properties

  -
<xslt in="doc.xml" out="build/doc/output.xml"
  +
  +<xslt in="doc.xml" out="build/doc/output.xml"
         style="style/apache.xsl">
     <outputproperty name="method" value="xml";/>
     <outputproperty name="standalone" value="yes"/>
     <outputproperty name="encoding" value="iso8859_1"/>
     <outputproperty name="indent" value="yes"/>
  -</xslt>

  +</xslt>
  +

   
     
Using factory settings

  -
<xslt in="doc.xml" out="build/doc/output.xml"
  +
  +<xslt in="doc.xml" out="build/doc/output.xml"
         style="style/apache.xsl">
     <factory name="org.apache.xalan.processor.TransformerFactoryImpl">
       <attribute name="http://xml.apache.org/xalan/features/optimize" value="true"/>
  @@ -348,7 +354,8 @@
   </xslt>

   
     
Using a mapper

  -
<xslt basedir="in" destdir="out"
  +
  +<xslt basedir="in" destdir="out"
         style="style/apache.xsl">
     <mapper type="glob" from="*.xml.en" to="*.html.en"/>
   </xslt>

  
  
  
  1.23      +12 -8     ant/docs/manual/CoreTasks/tar.html
  
  Index: tar.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/tar.html,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- tar.html	7 Mar 2005 18:09:09 -0000	1.22
  +++ tar.html	10 Mar 2005 13:01:55 -0000	1.23
  @@ -182,15 +182,17 @@
   

     
     

   
   
Examples

  -
  <tar tarfile="${dist}/manual.tar" basedir="htdocs/manual"/>
  -  <gzip zipfile="${dist}/manual.tar.gz" src="${dist}/manual.tar"/>

  +
  +<tar tarfile="${dist}/manual.tar" basedir="htdocs/manual"/>
  +<gzip zipfile="${dist}/manual.tar.gz" src="${dist}/manual.tar"/>

   
tars all files in the htdocs/manual directory into a file called manual.tar
   in the ${dist}  directory, then applies the gzip task to compress
   it.

  -
  <tar destfile="${dist}/manual.tar"
  -       basedir="htdocs/manual"
  -       excludes="mydocs/**, **/todo.html"
  -  />

  +
  +<tar destfile="${dist}/manual.tar"
  +      basedir="htdocs/manual"
  +      excludes="mydocs/**, **/todo.html"
  +/>

   
tars all files in the htdocs/manual directory into a file called manual.tar
   in the ${dist} directory. Files in the directory mydocs,
   or files with the name todo.html are excluded.

  @@ -219,7 +221,8 @@
   

   
   
  -
<tar longfile="gnu"
  +
  +<tar longfile="gnu"
        destfile="${dist.base}/${dist.name}-src.tar" >
     <tarfileset dir="${dist.name}/.." mode="755" username="ant" group="ant">
       <include name="${dist.name}/bootstrap.sh"/>
  @@ -230,7 +233,8 @@
       <exclude name="${dist.name}/bootstrap.sh"/>
       <exclude name="${dist.name}/build.sh"/>
     </tarfileset>
  -</tar> 

  +</tar>
  +

   
   
This example shows building a tar which uses the GNU extensions for long paths and
   where some files need to be marked as executable (mode 755)
  
  
  
  1.17      +15 -20    ant/docs/manual/CoreTasks/unzip.html
  
  Index: unzip.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/unzip.html,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- unzip.html	7 Mar 2005 18:09:10 -0000	1.16
  +++ unzip.html	10 Mar 2005 13:01:55 -0000	1.17
  @@ -70,17 +70,15 @@
   
   
   
Examples

  -

  -  
<unzip src="${tomcat_src}/tools-src.zip" dest="${tools.home}"/>

  -

  -

  -  

  -<gunzip src="tools.tar.gz"/>

  +
  +<unzip src="${tomcat_src}/tools-src.zip" dest="${tools.home}"/>
  +

  +

  +
  +<gunzip src="tools.tar.gz"/>
   <untar src="tools.tar" dest="${tools.home}"/>
  -

  -

  -

  -
  +

  +
   <unzip src="${tomcat_src}/tools-src.zip"
          dest="${tools.home}">
       <patternset>
  @@ -88,10 +86,9 @@
           <exclude name="**/Test*.java"/>
       </patternset>
   </unzip>
  -

  -

  -

  -
  +

  +

  +
   <unzip dest="${tools.home}">
       <patternset>
           <include name="**/*.java"/>
  @@ -102,18 +99,16 @@
           <exclude name="**/tmp*.zip"/>
       </fileset>
   </unzip>
  -

  -

  -

  -
  +

  +

  +
   <unzip src="apache-ant-bin.zip" dest="${tools.home}">
       <patternset>
           <include name="apache-ant/lib/ant.jar"/>
       </patternset>
       <mapper type="flatten"/>
   </unzip>
  -

  -

  +

   

   
Copyright © 2000-2005 The Apache Software Foundation. All rights
   Reserved.

  
  
  
  1.9       +18 -18    ant/docs/manual/CoreTasks/waitfor.html
  
  Index: waitfor.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/waitfor.html,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- waitfor.html	7 Mar 2005 18:09:10 -0000	1.8
  +++ waitfor.html	10 Mar 2005 13:01:55 -0000	1.9
  @@ -86,27 +86,27 @@
   here for the full list.

   
   
Examples

  -

  -  
<waitfor maxwait="30" maxwaitunit="second">

  -        <available file="errors.log"/>

  -    </waitfor>

  -

  +
  +<waitfor maxwait="30" maxwaitunit="second">
  +        <available file="errors.log"/>
  +</waitfor>
  +

   
waits up to 30 seconds for a file called errors.log to appear.

  -

  -  
<waitfor maxwait="3" maxwaitunit="minute" checkevery="500">

  -        <http url="http://localhost/myapp/index.html"/>

  -    </waitfor>

  -

  +
  +<waitfor maxwait="3" maxwaitunit="minute" checkevery="500">
  +        <http url="http://localhost/myapp/index.html"/>
  +</waitfor>
  +

   
waits up to 3 minutes (and checks every 500 milliseconds) for a web server on localhost
     to serve up the specified URL.

  -

  -  
<waitfor maxwait="10" maxwait="second">

  -        <and>

  -            <socket server="dbserver" port="1521"/>

  -            <http url="http://webserver/mypage.html"/>

  -        </and>

  -    </waitfor>

  -

  +
  +<waitfor maxwait="10" maxwait="second">
  +        <and>
  +            <socket server="dbserver" port="1521"/>
  +            <http url="http://webserver/mypage.html"/>
  +        </and>
  +</waitfor>
  +

   
waits up to 10 seconds for a server on the dbserver machine to begin listening
     on port 1521 and for the http://webserver/mypage.html web page
     to become available.

  
  
  

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