peterreilly 2005/03/10 05:02:15
Modified: docs/manual/CoreTasks Tag: ANT_16_BRANCH echo.html
genkey.html java.html mail.html style.html tar.html
unzip.html waitfor.html
Log:
sync
Revision Changes Path
No revision
No revision
1.10.2.4 +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.10.2.3
retrieving revision 1.10.2.4
diff -u -r1.10.2.3 -r1.10.2.4
--- echo.html 22 Jun 2004 21:59:05 -0000 1.10.2.3
+++ echo.html 10 Mar 2005 13:02:14 -0000 1.10.2.4
@@ -86,7 +86,7 @@
<pre><echo file="runner.csh" append="false">#\!/bin/tcsh
java-1.3.1 -mx1024m ${project.entrypoint} $$*
-</echo></pre>
+</echo></pre>
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.8.2.2 +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.8.2.1
retrieving revision 1.8.2.2
diff -u -r1.8.2.1 -r1.8.2.2
--- genkey.html 9 Oct 2003 21:01:06 -0000 1.8.2.1
+++ genkey.html 10 Mar 2005 13:02:14 -0000 1.8.2.2
@@ -86,20 +86,21 @@
<p>The following two examples are identical: </p>
<h3>Examples</h3>
-<blockquote>
- <p><code><genkey alias="apache-group"
storepass="secret"
- dname="CN=Ant Group, OU=Jakarta Division, O=Apache.org,
C=US"/></code></p>
-</blockquote>
+<blockquote><pre>
+<genkey alias="apache-group" storepass="secret"
+ dname="CN=Ant Group, OU=Jakarta Division, O=Apache.org,
C=US"/>
+</pre></blockquote>
<blockquote>
- <pre><code><genkey alias="apache-group"
storepass="secret" >
+ <pre>
+<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></code></pre>
+</genkey></pre>
</blockquote>
<hr>
<p align="center">Copyright © 2000-2001,2003 Apache Software
Foundation. All rights
1.24.2.10 +4 -2 ant/docs/manual/CoreTasks/java.html
Index: java.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTasks/java.html,v
retrieving revision 1.24.2.9
retrieving revision 1.24.2.10
diff -u -r1.24.2.9 -r1.24.2.10
--- java.html 19 Nov 2004 09:10:00 -0000 1.24.2.9
+++ java.html 10 Mar 2005 13:02:14 -0000 1.24.2.10
@@ -280,7 +280,8 @@
</pre>
Run a class in this JVM with a new jar on the classpath
-<pre> <java jar="dist/test.jar"
+<pre>
+ <java jar="dist/test.jar"
fork="true"
failonerror="true"
maxmemory="128m"
@@ -296,7 +297,8 @@
and with a maximum memory of 128MB. Any non zero return code breaks the
build.
<pre> <java classname="test.Main"/></pre>
-<pre> <java classname="test.Main"
+<pre>
+ <java classname="test.Main"
fork="yes" >
<sysproperty key="DEBUG" value="true"/>
<arg value="-h"/>
1.21.2.6 +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.21.2.5
retrieving revision 1.21.2.6
diff -u -r1.21.2.5 -r1.21.2.6
--- mail.html 3 Mar 2005 09:59:06 -0000 1.21.2.5
+++ mail.html 10 Mar 2005 13:02:14 -0000 1.21.2.6
@@ -10,18 +10,26 @@
<h2><a name="mail">Mail</a></h2>
<h3>Description</h3>
-<p>A task to send SMTP email.<br></br><br></br>
-This task can send mail using either plain
-text, UU encoding, or MIME format mail, depending on what is
available.<br></br><br></br>
-<br>
-SMTP auth and SSL/TLS require JavaMail and are only available in MIME
format.<br></br><br></br>
-Attachments may be sent using nested
-<a href="../CoreTypes/fileset.html">fileset</a> elements.</p>
-<p><strong>Note:</strong> This task may depend on external libraries
-that are not included
-in the Ant distribution. See <a href="../install.html#librarydependencies">
-Library Dependencies</a> for more information.
-</p>
+ <p>
+ A task to send SMTP email.
+ </p>
+ <p>
+ This task can send mail using either plain
+ text, UU encoding, or MIME format mail, depending on what is available.
+ </p>
+ <p>
+ SMTP auth and SSL/TLS require JavaMail and are only available in MIME
format.
+ </p>
+ <p>
+ Attachments may be sent using nested
+ <a href="../CoreTypes/fileset.html">fileset</a> elements.
+ </p>
+ <p>
+ <strong>Note:</strong> This task may depend on external libraries
+ that are not included in the Ant distribution.
+ See <a href="../install.html#librarydependencies">Library
Dependencies</a>
+ for more information.
+ </p>
<h3>Parameters</h3>
<table border="1" cellpadding="2" cellspacing="0">
1.29.2.6 +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.29.2.5
retrieving revision 1.29.2.6
diff -u -r1.29.2.5 -r1.29.2.6
--- style.html 19 Nov 2004 09:10:00 -0000 1.29.2.5
+++ style.html 10 Mar 2005 13:02:14 -0000 1.29.2.6
@@ -306,7 +306,8 @@
<style basedir="doc" destdir="build/doc"
extension=".html"
style="style/apache.xsl"/></pre>
<h4>Using an xmlcatalog</h4>
- <pre><xslt basedir="doc" destdir="build/doc"
+ <pre>
+<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></pre>
+</xslt>
+</pre>
<h4>Using XSL parameters</h4>
-<pre><xslt basedir="doc" destdir="build/doc"
+<pre>
+<xslt basedir="doc" destdir="build/doc"
extension=".html" style="style/apache.xsl">
<param name="date" expression="07-01-2000"/>
</xslt></pre>
@@ -331,16 +334,19 @@
</p>
<h4>Using output properties</h4>
-<pre><xslt in="doc.xml" out="build/doc/output.xml"
+<pre>
+<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></pre>
+</xslt>
+</pre>
<h4>Using factory settings</h4>
-<pre><xslt in="doc.xml" out="build/doc/output.xml"
+<pre>
+<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></pre>
<h4>Using a mapper</h4>
-<pre><xslt basedir="in" destdir="out"
+<pre>
+<xslt basedir="in" destdir="out"
style="style/apache.xsl">
<mapper type="glob" from="*.xml.en"
to="*.html.en"/>
</xslt></pre>
1.19.2.4 +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.19.2.3
retrieving revision 1.19.2.4
diff -u -r1.19.2.3 -r1.19.2.4
--- tar.html 15 Mar 2004 15:32:40 -0000 1.19.2.3
+++ tar.html 10 Mar 2005 13:02:14 -0000 1.19.2.4
@@ -182,15 +182,17 @@
</table>
<h3>Examples</h3>
-<pre> <tar tarfile="${dist}/manual.tar"
basedir="htdocs/manual"/>
- <gzip zipfile="${dist}/manual.tar.gz"
src="${dist}/manual.tar"/></pre>
+<pre>
+<tar tarfile="${dist}/manual.tar"
basedir="htdocs/manual"/>
+<gzip zipfile="${dist}/manual.tar.gz"
src="${dist}/manual.tar"/></pre>
<p>tars all files in the <code>htdocs/manual</code> directory into a file
called <code>manual.tar</code>
in the <code>${dist}</code> directory, then applies the gzip task to
compress
it.</p>
-<pre> <tar destfile="${dist}/manual.tar"
- basedir="htdocs/manual"
- excludes="mydocs/**, **/todo.html"
- /></pre>
+<pre>
+<tar destfile="${dist}/manual.tar"
+ basedir="htdocs/manual"
+ excludes="mydocs/**, **/todo.html"
+/></pre>
<p>tars all files in the <code>htdocs/manual</code> directory into a file
called <code>manual.tar</code>
in the <code>${dist}</code> directory. Files in the directory
<code>mydocs</code>,
or files with the name <code>todo.html</code> are excluded.</p>
@@ -219,7 +221,8 @@
</p>
-<pre><tar longfile="gnu"
+<pre>
+<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> </pre>
+</tar>
+</pre>
<p>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.12.2.3 +11 -14 ant/docs/manual/CoreTasks/unzip.html
Index: unzip.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTasks/unzip.html,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -u -r1.12.2.2 -r1.12.2.3
--- unzip.html 9 Feb 2004 22:12:07 -0000 1.12.2.2
+++ unzip.html 10 Mar 2005 13:02:14 -0000 1.12.2.3
@@ -69,17 +69,15 @@
</table>
<h3>Examples</h3>
-<blockquote>
- <p><code><unzip src="${tomcat_src}/tools-src.zip"
dest="${tools.home}"/></code></p>
-</blockquote>
-<blockquote>
- <p><code>
-<gunzip src="tools.tar.gz"/><br>
+<pre>
+<unzip src="${tomcat_src}/tools-src.zip"
dest="${tools.home}"/>
+</pre>
+<p/>
+<pre>
+<gunzip src="tools.tar.gz"/>
<untar src="tools.tar" dest="${tools.home}"/>
-</code></p>
-</blockquote>
-<blockquote>
-<p><pre>
+</pre>
+<pre>
<unzip src="${tomcat_src}/tools-src.zip"
dest="${tools.home}">
<patternset>
@@ -87,10 +85,9 @@
<exclude name="**/Test*.java"/>
</patternset>
</unzip>
-</pre></p>
-</blockquote>
-<blockquote>
-<p><pre>
+</pre>
+<p/>
+<pre>
<unzip dest="${tools.home}">
<patternset>
<include name="**/*.java"/>
1.6.4.3 +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.6.4.2
retrieving revision 1.6.4.3
diff -u -r1.6.4.2 -r1.6.4.3
--- waitfor.html 9 Feb 2004 22:12:07 -0000 1.6.4.2
+++ waitfor.html 10 Mar 2005 13:02:15 -0000 1.6.4.3
@@ -86,27 +86,27 @@
<a href="conditions.html">here</a> for the full list.</p>
<h3>Examples</h3>
-<blockquote>
- <p><code><waitfor maxwait="30"
maxwaitunit="second"><br>
- <available file="errors.log"/><br>
- </waitfor></code></p>
-</blockquote>
+<blockquote><pre>
+<waitfor maxwait="30" maxwaitunit="second">
+ <available file="errors.log"/>
+</waitfor>
+</pre></blockquote>
<p>waits up to 30 seconds for a file called errors.log to appear.</p>
-<blockquote>
- <p><code><waitfor maxwait="3" maxwaitunit="minute"
checkevery="500"><br>
- <http
url="http://localhost/myapp/index.html"/><br>
- </waitfor></code></p>
-</blockquote>
+<blockquote><pre>
+<waitfor maxwait="3" maxwaitunit="minute" checkevery="500">
+ <http url="http://localhost/myapp/index.html"/>
+</waitfor>
+</pre></blockquote>
<p>waits up to 3 minutes (and checks every 500 milliseconds) for a web
server on localhost
to serve up the specified URL.</p>
-<blockquote>
- <p><code><waitfor maxwait="10"
maxwait="second"><br>
- <and><br>
- <socket
server="dbserver" port="1521"/><br>
- <http
url="http://webserver/mypage.html"/><br>
- </and><br>
- </waitfor></code></p>
-</blockquote>
+<blockquote><pre>
+<waitfor maxwait="10" maxwait="second">
+ <and>
+ <socket server="dbserver" port="1521"/>
+ <http url="http://webserver/mypage.html"/>
+ </and>
+</waitfor>
+</pre></blockquote>
<p>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.</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
