You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2018/02/09 05:54:13 UTC
[3/4] ant git commit: Chop off redundant blockquotes
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/presetdef.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/presetdef.html b/manual/Tasks/presetdef.html
index d975bf9..8becea2 100644
--- a/manual/Tasks/presetdef.html
+++ b/manual/Tasks/presetdef.html
@@ -71,7 +71,6 @@
srcdir and destdir
attributes set. It also has a src element to source files from a generated
directory.
- <blockquote>
<pre class="code">
<presetdef name="my.javac">
<javac debug="${debug}" deprecation="${deprecation}"
@@ -80,24 +79,18 @@
</javac>
</presetdef>
</pre>
- </blockquote>
This can be used as a normal javac task - example:
- <blockquote>
<pre class="code">
<my.javac/>
</pre>
- </blockquote>
The attributes specified in the preset task may be overridden - i.e.
they may be seen as optional attributes - example:
- <blockquote>
<pre class="code">
<my.javac srcdir="${test.src}" deprecation="no"/>
</pre>
- </blockquote>
One may put a presetdef definition in an antlib.
For example suppose the jar file antgoodies.jar has
the antlib.xml as follows:
- <blockquote>
<pre class="code">
<antlib>
<taskdef resource="com/acme/antgoodies/tasks.properties"/>
@@ -108,9 +101,7 @@
</presetdef>
</antlib>
</pre>
- </blockquote>
One may then use this in a build file as follows:
- <blockquote>
<pre class="code">
<project default="example" xmlns:antgoodies="antlib:com.acme.antgoodies">
<target name="example">
@@ -121,12 +112,10 @@
</target>
</project>
</pre>
- </blockquote>
<p>
The following is an example of evaluation of properties when the
definition is used:
</p>
- <blockquote>
<pre class="code">
<target name="defineandcall">
<presetdef name="showmessage">
@@ -143,11 +132,9 @@
<showmessage/>
</target>
</pre>
- </blockquote>
<p>
The command ant defineandcall results in the output:
</p>
- <blockquote>
<pre class="code">
defineandcall:
[showmessage] message is '${message}'
@@ -156,14 +143,13 @@ defineandcall:
called:
[showmessage] message is 'Message 2'
</pre>
- </blockquote>
<p>
It is possible to use a trick to evaluate properties when the definition is
<em>made</em> rather than used. This can be useful if you do not expect some
properties to be available in child builds run with
<code><ant ... inheritall="false"></code>:
</p>
-<blockquote><pre class="code">
+<pre class="code">
<macrodef name="showmessage-presetdef">
<attribute name="messageval"/>
<presetdef name="showmessage">
@@ -171,7 +157,7 @@ properties to be available in child builds run with
</presetdef>
</macrodef>
<showmessage-presetdef messageval="${message}"/>
-</pre></blockquote>
+</pre>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/propertyfile.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/propertyfile.html b/manual/Tasks/propertyfile.html
index f698301..49444b7 100644
--- a/manual/Tasks/propertyfile.html
+++ b/manual/Tasks/propertyfile.html
@@ -191,7 +191,7 @@ The slashes conform to the expectations of the Properties class. The file will
The layout and comment of the original file is preserved. New properties are added at the end of the file. Existing properties are overwritten in place.
</p>
-<blockquote><pre><propertyfile
+<pre><propertyfile
file="my.properties"
comment="My properties">
<entry key="akey" value="avalue"/>
@@ -200,10 +200,10 @@ The layout and comment of the original file is preserved. New properties are add
<entry key="formated.int" type="int" default="0013" operation="+" pattern="0000"/>
<entry key="formated.date" type="date" value="now" pattern="DDD HH:mm"/>
</propertyfile>
-</pre></blockquote>
+</pre>
<p>
To produce dates relative from today :</p>
-<blockquote><pre><propertyfile
+<pre><propertyfile
file="my.properties"
comment="My properties">
<entry key="formated.date-1"
@@ -213,21 +213,21 @@ To produce dates relative from today :</p>
type="date" default="now" pattern="DDD"
operation="+" value="1"/>
</propertyfile>
-</pre></blockquote>
+</pre>
<p>
Concatenation of strings :</p>
-<blockquote><pre><propertyfile
+<pre><propertyfile
file="my.properties"
comment="My properties">
<entry key="progress" default="" operation="+" value="."/>
</propertyfile>
-</pre></blockquote>
+</pre>
<p>Each time called, a "." will be appended to "progress"
</p>
<p>Pumps the project version to the next minor version (increase minor and set path=0):</p>
-<blockquote><pre><target name="nextMinorVersion">
+<pre><target name="nextMinorVersion">
<property
name="header"
value="##Generated file - do not modify!"/>
@@ -238,7 +238,7 @@ Concatenation of strings :</p>
<entry key="product.build.date" type="date" value="now" />
</propertyfile>
</target>
-</pre></blockquote>
+</pre>
After running this target the version changed e.g. from 3.2.2 to 3.3.0.
</body>
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/renameextensions.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/renameextensions.html b/manual/Tasks/renameextensions.html
index d54d1fa..664edfd 100644
--- a/manual/Tasks/renameextensions.html
+++ b/manual/Tasks/renameextensions.html
@@ -105,16 +105,14 @@ supports most attributes of <code><fileset></code>
</tr>
</table>
<h3>Examples</h3>
-<blockquote>
- <p><code><renameext srcDir="/source/project1"
+
+ <pre><renameext srcDir="/source/project1"
includes="**"
excludes="**/samples/*"
fromExtension=".java.keep"
toExtension=".java"
replace="true"/>
-</code>
- </p>
-</blockquote>
+ </pre>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/replace.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/replace.html b/manual/Tasks/replace.html
index bc1988f..c2981cd 100644
--- a/manual/Tasks/replace.html
+++ b/manual/Tasks/replace.html
@@ -159,30 +159,30 @@ them.</p>
<tr>
<td valign="top">expandProperties</td>
<td valign="top">Whether to expand properties in the nested text.
- <em>since Ant 1.8.0</em>.</td>
+ <em>Since Ant 1.8.0</em>.</td>
<td align="center">No, defaults to true.</td>
</tr>
</table>
<h3>Examples</h3>
-<blockquote><pre>
+<pre>
<replace dir="${src}" value="wombat">
<include name="**/*.html"/>
<replacetoken><![CDATA[multi line
token]]></replacetoken>
</replace>
-</pre></blockquote>
+</pre>
<p>replaces occurrences of the string "multi
line<i>\n</i>token" with the string "wombat", in all
HTML files in the directory <code>${src}</code>.Where <i>\n</i> is
the platform specific line separator.</p>
-<blockquote><pre>
+<pre>
<replace file="${src}/index.html">
<replacetoken><![CDATA[two line
token]]></replacetoken>
<replacevalue><![CDATA[two line
token]]></replacevalue>
</replace>
-</pre></blockquote>
+</pre>
<h4>replacefilter</h4>
<p>In addition to allowing for multiple replacements, optional nested <code><replacefilter></code> elements allow replacement values to be extracted from a property file. The name of this file is specified using the <code><replace></code> attribute <i>propertyFile</i>.
</p>
@@ -213,7 +213,7 @@ token]]></replacevalue>
<p>If neither <i>value</i> nor <i>property</i> is used, the value provided using the <code><replace></code> attribute <i>value</i> and/or the <code><replacevalue></code> element is used. If no value was specified using either of these options, the token is replaced with an empty string.
</p>
<h3>Examples</h3>
-<blockquote><pre>
+<pre>
<replace
file="configure.sh"
value="defaultvalue"
@@ -231,7 +231,7 @@ token]]></replacevalue>
<replacevalue>value4</replacevalue>
</replacefilter>
</replace>
-</pre></blockquote>
+</pre>
<p>In file <code>configure.sh</code>, replace all instances of "@token1@" with "defaultvalue", all instances of "@token2@" with "value2", and all instances of "@token3@" with the value of the property "property.key", as it appears in property file <code>src/name.properties</code>.</p>
<p><strong>Note</strong>: It is possible to use either the <i>token</i>/<code><replacetoken></code> and <i>value</i>/<code><replacevalue></code> attributes/elements, the nested replacefilter elements, or both in the same operation.</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/replaceregexp.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/replaceregexp.html b/manual/Tasks/replaceregexp.html
index 68e6523..68f2c72 100644
--- a/manual/Tasks/replaceregexp.html
+++ b/manual/Tasks/replaceregexp.html
@@ -115,23 +115,22 @@ value, in the file <code>${src}/build.properties</code></p>
<p>This task supports a nested <i><a href="../Types/regexp.html">Regexp</a></i> element to specify
the regular expression. You can use this element to refer to a previously
defined regular expression datatype instance.</p>
-<blockquote>
+
<regexp id="id" pattern="alpha(.+)beta"/><br>
<regexp refid="id"/>
-</blockquote>
+
<p>This task supports a nested <i>Substitution</i> element to specify
the substitution pattern. You can use this element to refer to a previously
defined substitution pattern datatype instance.</p>
-<blockquote>
+
<substitution id="id" expression="beta\1alpha"/><br>
<substitution refid="id"/>
-</blockquote>
+
<h3>Examples</h3>
-<blockquote>
- <pre>
+<pre>
<replaceregexp byline="true">
<regexp pattern="OldProperty=(.*)"/>
<substitution expression="NewProperty=\1"/>
@@ -139,62 +138,54 @@ value, in the file <code>${src}/build.properties</code></p>
<include name="*.properties"/>
</fileset>
</replaceregexp>
-</pre></blockquote>
+</pre>
<p>replaces occurrences of the property name "OldProperty"
with "NewProperty" in a properties file, preserving the existing
value, in all files ending in <code>.properties</code> in the current directory</p>
-<br>
-<blockquote>
<pre><replaceregexp match="\s+" replace=" " flags="g" byline="true">
<fileset dir="${html.dir}" includes="**/*.html"/>
</replaceregexp>
-</pre></blockquote>
+</pre>
<p>replaces all whitespaces (blanks, tabs, etc) by one blank remaining the
line separator. So with input</p>
-<blockquote>
+
<pre>
<html> <body>
<<TAB>><h1> T E S T </h1> <<TAB>>
<<TAB>> </body></html>
-</pre></blockquote>
+</pre>
<p>would converted to</p>
-<blockquote>
<pre>
<html> <body>
<h1> T E S T </h1> </body></html>
</pre>
-</blockquote>
<br><!-- small distance from code of the previous example -->
-<blockquote>
+
<pre><replaceregexp match="\\n" replace="${line.separator}" flags="g" byline="true">
<fileset dir="${dir}"/>
</replaceregexp>
-</pre></blockquote>
+</pre>
<p>replaces all <tt>\n</tt> markers (beware the quoting of the backslash) by a line break.
So with input</p>
-<blockquote>
<pre>
one\ntwo\nthree
-</pre></blockquote>
+</pre>
<p>would converted to</p>
-<blockquote>
<pre>
one
two
three
</pre>
-</blockquote>
+
<p>Beware that inserting line breaks could break file syntax. For example in xml:</p>
-<blockquote>
<pre>
<root>
<text>line breaks \n should work in text</text>
<attribute value="but breaks \n attributes" />
</root>
</pre>
-</blockquote>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/rexec.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/rexec.html b/manual/Tasks/rexec.html
index 7874c7b..c3940fc 100644
--- a/manual/Tasks/rexec.html
+++ b/manual/Tasks/rexec.html
@@ -100,14 +100,14 @@ this is "true" by default
<h3>Example</h3>
A simple example of connecting to a server and running a command.
-<blockquote><pre>
+<pre>
<rexec userid="bob" password="badpass" server="localhost" command="ls"/>
-</pre></blockquote>
+</pre>
The task can be used with other ports as well:
-<blockquote><pre>
+<pre>
<rexec port="80" userid="bob" password="badpass" server="localhost" command="ls"/>
-</pre></blockquote>
+</pre>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/script.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/script.html b/manual/Tasks/script.html
index eedbb17..375c1f9 100644
--- a/manual/Tasks/script.html
+++ b/manual/Tasks/script.html
@@ -162,7 +162,7 @@ different location values.</p>
</p>
<h3>Examples</h3>
The following snippet shows use of five different languages:
- <blockquote><pre>
+ <pre>
<property name="message" value="Hello world"/>
<script language="groovy">
@@ -185,7 +185,6 @@ The following snippet shows use of five different languages:
print "message is %s" % message
</script>
</pre>
- </blockquote>
<p>
Note that for the <i>jython</i> example, the script contents <b>must</b>
start on the first column.
@@ -196,28 +195,26 @@ print "message is %s" % message
<p>
The following script shows a little more complicated jruby example:
</p>
- <blockquote><pre>
+ <pre>
<script language="ruby">
xmlfiles = Dir.new(".").entries.delete_if { |i| ! (i =~ /\.xml$/) }
xmlfiles.sort.each { |i| $self.log(i) }
</script>
</pre>
- </blockquote>
<p>
The same example in groovy is:
</p>
- <blockquote><pre>
+ <pre>
<script language="groovy">
xmlfiles = new java.io.File(".").listFiles().findAll{ it =~ "\.xml$"}
xmlfiles.sort().each { self.log(it.toString())}
</script>
</pre>
- </blockquote>
<p>
The following example shows the use of classpath to specify the location
of the beanshell jar file.
</p>
- <blockquote><pre>
+ <pre>
<script language="beanshell" setbeans="true">
<classpath>
<fileset dir="${user.home}/lang/beanshell" includes="*.jar" />
@@ -225,12 +222,11 @@ print "message is %s" % message
System.out.println("Hello world");
</script>
</pre>
- </blockquote>
<p>
The following script uses javascript to create a number of
echo tasks and execute them.
</p>
-<blockquote><pre>
+<pre>
<project name="squares" default="main" basedir=".">
<target name="main">
@@ -248,9 +244,9 @@ print "message is %s" % message
</target>
</project>
-</pre></blockquote>
+</pre>
<p>generates</p>
-<blockquote><pre>
+<pre>
main:
1
4
@@ -264,11 +260,11 @@ main:
100
BUILD SUCCESSFUL
-</pre></blockquote>
+</pre>
<p>Now a more complex example using the Java API and the Ant API. The goal is to list the
filesizes of all files a <code><fileset/></code> caught.</p>
-<blockquote><pre>
+<pre>
<?xml version="1.0" encoding="ISO-8859-1"?>
<project name="<font color=blue>MyProject</font>" basedir="." default="main">
@@ -316,7 +312,7 @@ filesizes of all files a <code><fileset/></code> caught.</p>
]]></script>
</target>
</project>
-</pre></blockquote>
+</pre>
<p>We want to use the Java API. Because we don't want always typing the package signature
we do an import. Rhino knows two different methods for import statements: one for packages
and one for a single class. By default only the <i>java</i> packages are available, so
@@ -343,7 +339,7 @@ appropriate logging before and after invoking execute().
task. This task will add filesets and paths to a referenced
path. If the path does not exist, it will be created.
</p>
-<blockquote><pre>
+<pre>
<!--
Define addtopath task
-->
@@ -372,14 +368,14 @@ appropriate logging before and after invoking execute().
}
project.addTaskDefinition("addtopath", AddToPath.class);
</script>
-</pre></blockquote>
+</pre>
<p>
An example of using this task to create a path
from a list of directories (using antcontrib's
<a href="http://ant-contrib.sourceforge.net/tasks/tasks/for.html">
<for></a> task) follows:
</p>
-<blockquote><pre>
+<pre>
<path id="main.path">
<fileset dir="build/classes"/>
</path>
@@ -392,7 +388,7 @@ appropriate logging before and after invoking execute().
</addtopath>
</sequential>
</ac:for>
-</pre></blockquote>
+</pre>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/scriptdef.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/scriptdef.html b/manual/Tasks/scriptdef.html
index 1d016e6..554e04e 100644
--- a/manual/Tasks/scriptdef.html
+++ b/manual/Tasks/scriptdef.html
@@ -282,8 +282,8 @@ error. For example in the above script, removing the closing curly bracket
would result in this error
</p>
-<p><code>build.xml:15: SyntaxError: missing } in compound
-statement (scriptdef <code><scripttest2></code>; line 10)</code></p>
+<pre>build.xml:15: SyntaxError: missing } in compound
+statement (scriptdef <code><scripttest2></code>; line 10)</pre>
<p>
Script errors are only detected when a script task is actually executed.
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/setpermissions.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/setpermissions.html b/manual/Tasks/setpermissions.html
index 28bf999..7ef1449 100644
--- a/manual/Tasks/setpermissions.html
+++ b/manual/Tasks/setpermissions.html
@@ -91,18 +91,18 @@
<p><a href="../Types/resources.html#collection">Resource
Collection</a>s are used to select groups of resources.</p>
<h3>Examples</h3>
- <blockquote><pre>
+<pre>
<setpermissions mode="755">
<file file="${dist}/start.sh"/>
</setpermissions>
- </pre></blockquote>
+</pre>
<p>makes the "start.sh" file readable and executable for
anyone and in addition writable by the owner.</p>
- <blockquote><pre>
+<pre>
<setpermissions permissions="OWNER_READ,OWNER_WRITE,OWNER_EXECUTE,OTHERS_READ,OTHERS_EXECUTE,GROUP_READ,GROUP_EXECUTE">
<file file="${dist}/start.sh"/>
</setpermissions>
- </pre></blockquote>
+</pre>
<p>makes the "start.sh" file readable and executable for
anyone and in addition writable by the owner.</p>
</body>
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/signjar.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/signjar.html b/manual/Tasks/signjar.html
index a422b9f..e414db9 100644
--- a/manual/Tasks/signjar.html
+++ b/manual/Tasks/signjar.html
@@ -223,15 +223,15 @@ block</td>
<h3>Examples</h3>
<p>For instructions on generating a code signing certificate, see the <a target="_blank" href="http://docs.oracle.com/javase/7/docs/technotes/tools/windows/keytool.html">keytool documentation</a> and/or instructions from your certificate authority.</p>
- <blockquote><pre>
+<pre>
<signjar jar="${dist}/lib/ant.jar"
alias="apache-group" storepass="secret"/>
-</pre></blockquote>
+</pre>
<p>
signs the ant.jar with alias "apache-group" accessing the
keystore and private key via "secret" password.
</p>
- <blockquote><pre>
+<pre>
<signjar destDir="signed"
alias="testonly" keystore="testkeystore"
storepass="apacheant"
@@ -241,14 +241,13 @@ alias="apache-group" storepass="secret"/>
</path>
<flattenmapper />
</signjar>
-</pre></blockquote>
+</pre>
<p>
Sign all JAR files matching the dist/**/*.jar pattern, copying them to the
directory "signed" afterwards. The flatten mapper means that they will
all be copied to this directory, not to subdirectories.
-
</p>
- <blockquote><pre>
+<pre>
<signjar
alias="testonly" keystore="testkeystore"
storepass="apacheant"
@@ -258,12 +257,12 @@ all be copied to this directory, not to subdirectories.
<fileset dir="dist" includes="**/*.jar" />
</path>
</signjar>
-</pre></blockquote>
+</pre>
<p>
Sign all the JAR files in dist/**/*.jar <i>in-situ</i>. Lazy signing is used,
so the files will only be signed if they are not already signed.
</p>
- <blockquote><pre>
+<pre>
<signjar
alias="testonly" keystore="testkeystore"
storepass="apacheant"
@@ -273,7 +272,7 @@ so the files will only be signed if they are not already signed.
<fileset dir="dist" includes="**/*.jar" />
</path>
</signjar>
-</pre></blockquote>
+</pre>
<p>
Sign all the JAR files in dist/**/*.jar using the digest algorithm SHA1 and the
signature algorithm MD5withRSA. This is especially useful when you want to use
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/sound.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/sound.html b/manual/Tasks/sound.html
index f0de67d..7f8f341 100644
--- a/manual/Tasks/sound.html
+++ b/manual/Tasks/sound.html
@@ -84,7 +84,7 @@ will be logged.
</table>
<h3>Examples</h3>
-<blockquote>
+
<pre>
<target name="fun" if="fun" unless="fun.done">
<sound>
@@ -94,7 +94,6 @@ will be logged.
<property name="fun.done" value="true"/>
</target>
</pre>
-</blockquote>
plays the <code>bell.wav</code> sound-file if the build succeeded, or
the <code>ohno.wav</code> sound-file if the build failed, three times,
if the <code>fun</code> property is set to <code>true</code>.
@@ -103,7 +102,6 @@ is a dependency of an "initialization" target that other
targets depend on, the
<code>fun.done</code> property prevents the target from being executed
more than once.
-<blockquote>
<pre>
<target name="fun" if="fun" unless="fun.done">
<sound>
@@ -113,7 +111,6 @@ more than once.
<property name="fun.done" value="true"/>
</target>
</pre>
-</blockquote>
randomly selects a sound-file to play when the build succeeds or fails.
</body>
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/splash.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/splash.html b/manual/Tasks/splash.html
index cf8bcad..e8eed69 100644
--- a/manual/Tasks/splash.html
+++ b/manual/Tasks/splash.html
@@ -105,7 +105,6 @@ the build exactly what is going on.
<td valign="top">User to authenticate to the proxy as.</td>
<td valign="top" align="center">No</td>
<td valign="top" align="center">None</td>
-
</tr>
<tr>
<td valign="top">password</td>
@@ -113,23 +112,20 @@ the build exactly what is going on.
<td valign="top" align="center">No</td>
<td valign="top" align="center">None</td>
</tr>
-
</table>
<h3>Examples</h3>
-<blockquote><pre>
-<splash/>
-</pre></blockquote>
+<pre><splash/></pre>
<p>Splash <code>images/ant_logo_large.gif</code> from the classpath.</p>
-<blockquote><pre>
+<pre>
<splash imageurl="http://jakarta.apache.org/images/jakarta-logo.gif"
useproxy="true"
showduration="5000"/>
-</pre></blockquote>
+</pre>
<p>Splashes the jakarta logo, for an initial period of 5 seconds.</p>
<p>Splash with controlled progress and nondefault text</p>
-<blockquote><pre>
+<pre>
<target name="test_new_features">
<echo>New features</echo>
<splash progressRegExp="Progress: (.*)%" showduration="0" displayText="Test text"/>
@@ -145,7 +141,7 @@ the build exactly what is going on.
<echo>Progress: 100%</echo>
<sleep seconds="3"/>
</target>
-</pre></blockquote>
+</pre>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/sql.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/sql.html b/manual/Tasks/sql.html
index 4e52ae4..58d673f 100644
--- a/manual/Tasks/sql.html
+++ b/manual/Tasks/sql.html
@@ -352,19 +352,19 @@ href="../using.html#path">PATH like structure</a> and can also be set via a nest
</table>
<h3>Examples</h3>
-<blockquote><pre><sql
+<pre><sql
driver="org.database.jdbcDriver"
url="jdbc:database-url"
userid="sa"
password="pass"
src="data.sql"/>
-</pre></blockquote>
+</pre>
<p>Connects to the database given in <i>url</i> as the sa user using the
org.database.jdbcDriver and executes the SQL statements contained within
the file data.sql</p>
-<blockquote><pre><sql
+<pre><sql
driver="org.database.jdbcDriver"
url="jdbc:database-url"
userid="sa"
@@ -372,14 +372,14 @@ the file data.sql</p>
src="data.sql">
<connectionProperty name="internal_logon" value="SYSDBA">
</sql>
-</pre></blockquote>
+</pre>
<p>Connects to the database given in <i>url</i> as the sa user using
the org.database.jdbcDriver and executes the SQL statements contained
within the file data.sql. Also sets the
property <i>internal_logon</i> to the value <i>SYSDBA</i>.</p>
-<blockquote><pre><sql
+<pre><sql
driver="org.database.jdbcDriver"
url="jdbc:database-url"
userid="sa"
@@ -390,7 +390,7 @@ values(1,2,3,4);
truncate table some_other_table;
</sql>
-</pre></blockquote>
+</pre>
<p>Connects to the database given in <i>url</i> as the sa
user using the org.database.jdbcDriver and executes the two SQL statements
@@ -402,7 +402,7 @@ truncate table some_other_table;
need to escape <code><</code>, <code>></code> <code>&</code>
or other special characters. For example:</p>
-<blockquote><pre><sql
+<pre><sql
driver="org.database.jdbcDriver"
url="jdbc:database-url"
userid="sa"
@@ -411,12 +411,12 @@ or other special characters. For example:</p>
update some_table set column1 = column1 + 1 where column2 < 42;
]]></sql>
-</pre></blockquote>
+</pre>
The following command turns property expansion in nested text on (it is off purely for backwards
compatibility), then creates a new user in the HSQLDB database using Ant properties.
-<blockquote><pre><sql
+<pre><sql
driver="org.hsqldb.jdbcDriver";
url="jdbc:hsqldb:file:${database.dir}"
userid="sa"
@@ -426,14 +426,14 @@ compatibility), then creates a new user in the HSQLDB database using Ant propert
CREATE USER ${newuser} PASSWORD ${newpassword}
</transaction>
</sql>
-</pre></blockquote>
+</pre>
<p>The following connects to the database given in url as the sa user using
the org.database.jdbcDriver and executes the SQL statements contained within
the files data1.sql, data2.sql and data3.sql and then executes the truncate
operation on <i>some_other_table</i>.</p>
-<blockquote><pre><sql
+<pre><sql
driver="org.database.jdbcDriver"
url="jdbc:database-url"
userid="sa"
@@ -445,14 +445,14 @@ operation on <i>some_other_table</i>.</p>
truncate table some_other_table;
</transaction>
</sql>
-</pre></blockquote>
+</pre>
<p>The following example does the same as (and may execute additional
SQL files if there are more files matching the pattern
<code>data*.sql</code>) but doesn't guarantee that data1.sql will be
run before <code>data2.sql</code>.</p>
-<blockquote><pre><sql
+<pre><sql
driver="org.database.jdbcDriver"
url="jdbc:database-url"
userid="sa"
@@ -466,14 +466,14 @@ run before <code>data2.sql</code>.</p>
truncate table some_other_table;
</transaction>
</sql>
-</pre></blockquote>
+</pre>
<p>The following connects to the database given in url as the sa user using the
org.database.jdbcDriver and executes the SQL statements contained within the
file data.sql, with output piped to outputfile.txt, searching /some/jdbc.jar
as well as the system classpath for the driver class.</p>
-<blockquote><pre><sql
+<pre><sql
driver="org.database.jdbcDriver"
url="jdbc:database-url"
userid="sa"
@@ -485,12 +485,12 @@ as well as the system classpath for the driver class.</p>
<pathelement location="/some/jdbc.jar"/>
</classpath>
</sql>
-</pre></blockquote>
+</pre>
<p>The following will only execute if the RDBMS is "oracle" and the version
starts with "8.1."</p>
-<blockquote><pre><sql
+<pre><sql
driver="org.database.jdbcDriver"
url="jdbc:database-url"
userid="sa"
@@ -504,7 +504,7 @@ values(1,2,3,4);
truncate table some_other_table;
</sql>
-</pre></blockquote>
+</pre>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/sync.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/sync.html b/manual/Tasks/sync.html
index e315cec..a598175 100644
--- a/manual/Tasks/sync.html
+++ b/manual/Tasks/sync.html
@@ -137,23 +137,23 @@ defaults to false.</p>
<h3>Examples</h3>
-<blockquote><pre>
+<pre>
<sync todir="site">
<fileset dir="generated-site"/>
</sync>
-</pre></blockquote>
+</pre>
<p>overwrites all files in <em>site</em> with newer files from
<em>generated-site</em>, deletes files from <em>site</em> that are not
present in <em>generated-site</em>.</p>
-<blockquote><pre>
+<pre>
<sync todir="site">
<fileset dir="generated-site"/>
<preserveintarget>
<include name="**/CVS/**"/>
</preserveintarget>
</sync>
-</pre></blockquote>
+</pre>
<p>overwrites all files in <em>site</em> with newer files from
<em>generated-site</em>, deletes files from <em>site</em> that are not
present in <em>generated-site</em> but keeps all files in any
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/telnet.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/telnet.html b/manual/Tasks/telnet.html
index af507fb..c2c9dc9 100644
--- a/manual/Tasks/telnet.html
+++ b/manual/Tasks/telnet.html
@@ -101,16 +101,16 @@ A simple example of connecting to a server and running a command. This assumes
a prompt of "ogin:" for the userid, and a prompt of "assword:"
for the password.
-<blockquote><pre>
+<pre>
<telnet userid="bob" password="badpass" server="localhost">
<read>/home/bob</read>
<write>ls</write>
<read string="/home/bob"/>
</telnet>
-</pre></blockquote>
+</pre>
This task can be rewritten as:
-<blockquote><pre>
+<pre>
<telnet server="localhost">
<read>ogin:</read>
<write>bob</write>
@@ -120,28 +120,28 @@ This task can be rewritten as:
<write>ls</write>
<read>/home/bob</read>
</telnet>
-</pre></blockquote>
+</pre>
A timeout can be specified at the <code><telnet></code> level or at the <code><read></code> level.
This will connect, issue a sleep command that is suppressed from displaying and wait
10 seconds before quitting.
-<blockquote><pre>
+<pre>
<telnet userid="bob" password="badpass" server="localhost" timeout="20">
<read>/home/bob</read>
<write echo="false">sleep 15</write>
<read timeout="10">/home/bob</read>
</telnet>
-</pre></blockquote>
+</pre>
The task can be used with other ports as well:
-<blockquote><pre>
+<pre>
<telnet port="80" server="localhost" timeout="20">
<read/>
<write>GET / http/0.9</write>
<write/>
<read timeout="10">&lt;/HTML&gt;</read>
</telnet>
-</pre></blockquote>
+</pre>
<p>
To use this task against the WinNT telnet service, you need to configure the service to use
classic authentication rather than NTLM negotiated authentication.
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/unpack.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/unpack.html b/manual/Tasks/unpack.html
index 6537d31..ac278d2 100644
--- a/manual/Tasks/unpack.html
+++ b/manual/Tasks/unpack.html
@@ -66,32 +66,22 @@ resource collection</h4>
<p>The specified resource will be used as src.</p>
<h3>Examples</h3>
-<blockquote><pre>
-<gunzip src="test.tar.gz"/>
-</pre></blockquote>
+<pre><gunzip src="test.tar.gz"/></pre>
<p>expands <i>test.tar.gz</i> to <i>test.tar</i></p>
-<blockquote><pre>
-<bunzip2 src="test.tar.bz2"/>
-</pre></blockquote>
+<pre><bunzip2 src="test.tar.bz2"/></pre>
<p>expands <i>test.tar.bz2</i> to <i>test.tar</i></p>
-<blockquote><pre>
-<unxz src="test.tar.xz"/>
-</pre></blockquote>
+<pre><unxz src="test.tar.xz"/></pre>
<p>expands <i>test.tar.xz</i> to <i>test.tar</i></p>
-<blockquote><pre>
-<gunzip src="test.tar.gz" dest="test2.tar"/>
-</pre></blockquote>
+<pre><gunzip src="test.tar.gz" dest="test2.tar"/></pre>
<p>expands <i>test.tar.gz</i> to <i>test2.tar</i></p>
-<blockquote><pre>
-<gunzip src="test.tar.gz" dest="subdir"/>
-</pre></blockquote>
+<pre><gunzip src="test.tar.gz" dest="subdir"/></pre>
<p>expands <i>test.tar.gz</i> to <i>subdir/test.tar</i> (assuming
subdir is a directory).</p>
-<blockquote><pre>
+<pre>
<gunzip dest=".">
<url url="http://example.org/archive.tar.gz"/>
</gunzip>
-</pre></blockquote>
+</pre>
<p>downloads <i>http://example.org/archive.tar.gz</i> and expands it
to <i>archive.tar</i> in the project's basedir on the fly.</p>
@@ -100,9 +90,7 @@ to <i>archive.tar</i> in the project's basedir on the fly.</p>
<pre>
<gunzip src="some-archive.gz" dest="some-dest-dir"/>
</pre>
-
is identical to
-
<pre>
<copy todir="some-dest-dir">
<gzipresource>
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/verifyjar.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/verifyjar.html b/manual/Tasks/verifyjar.html
index 58a751b..8908b31 100644
--- a/manual/Tasks/verifyjar.html
+++ b/manual/Tasks/verifyjar.html
@@ -126,12 +126,11 @@ supported
</tr>
</table>
-
<h3>Examples</h3>
- <blockquote><pre>
+<pre>
<verifyjar jar="${dist}/lib/ant.jar"
alias="apache-group" storepass="secret"/>
-</pre></blockquote>
+</pre>
<p>
verifies the ant.jar with alias "apache-group" accessing the
keystore and private key via "secret" password.
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/vss.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/vss.html b/manual/Tasks/vss.html
index a11f8bb..e02b76d 100644
--- a/manual/Tasks/vss.html
+++ b/manual/Tasks/vss.html
@@ -198,7 +198,7 @@ label only one will be used in the order version, date, label.</p>
</table>
<p>Note that only one of version, date or label should be specified</p>
<h3>Examples</h3>
-<blockquote>
+
<pre>
<vssget localPath="C:\mysrc\myproject"
recursive="true"
@@ -207,7 +207,7 @@ label only one will be used in the order version, date, label.</p>
vsspath="$/source/aProject"
writable="true"/>
</pre>
-</blockquote>
+
<p>Does a get on the VSS-Project <i>$/source/myproject</i> using the username
<i>me</i> and the password <i>mypassword</i>. It will recursively get the files
which are labeled <i>Release1</i> and write them to the local directory
@@ -282,24 +282,24 @@ project.</p>
</tr>
</table>
<h3>Examples</h3>
-<blockquote>
+
<pre>
<vsslabel vsspath="$/source/aProject"
login="me,mypassword"
label="Release1"/>
</pre>
-</blockquote>
+
<p>Labels the current version of the VSS project <i>$/source/aProject</i> with
the label <i>Release1</i> using the username <i>me</i> and the password
<i>mypassword</i>.
</p>
-<blockquote>
+
<pre>
<vsslabel vsspath="$/source/aProject/myfile.txt"
version="4"
label="1.03.004"/>
</pre>
-</blockquote>
+
<p>Labels version 4 of the VSS file <i>$/source/aProject/myfile.txt</i> with the
label <i>1.03.004</i>. If this version already has a label, the operation (and
the build) will fail.
@@ -414,25 +414,25 @@ Task to perform HISTORY commands to Microsoft Visual SourceSafe.
<h3>Examples</h3>
-<blockquote>
+
<pre>
<vsshistory vsspath="$/myProject" recursive="true"
fromLabel="Release1"
toLabel="Release2"/>
</pre>
-</blockquote>
+
<p>Shows all changes between "Release1" and "Release2".</p>
-<blockquote>
+
<pre>
<vsshistory vsspath="$/myProject" recursive="true"
fromDate="01.01.2001"
toDate="31.03.2001"/>
</pre>
-</blockquote>
+
<p>Shows all changes between January 1st 2001 and March 31st 2001 (in Germany, date must be specified according to your locale).</p>
-<blockquote>
+
<pre>
<tstamp>
<format property="to.tstamp" pattern="M-d-yy;h:mma"/>
@@ -443,7 +443,7 @@ Task to perform HISTORY commands to Microsoft Visual SourceSafe.
dateFormat="M-d-yy;h:mma"
toDate="${to.tstamp}"/>
</pre>
-</blockquote>
+
<p>Shows all changes in the 14 days before today.</p>
<hr>
@@ -517,13 +517,13 @@ Task to perform CHECKIN commands to Microsoft Visual SourceSafe.
</table>
<h3>Examples</h3>
-<blockquote>
+
<pre>
<vsscheckin vsspath="$/test/test*"
localpath="D:\build\"
comment="Modified by automatic build"/>
</pre>
-</blockquote>
+
<p>Checks in the file(s) named <i>test*</i> in the project <i>$/test</i> using
the local directory <i>D:\build</i>.</p>
<hr>
@@ -621,14 +621,14 @@ label only one will be used in the order version, date, label.</p>
</table>
<h3>Examples</h3>
-<blockquote>
+
<pre>
<vsscheckout vsspath="$/test"
localpath="D:\build"
recursive="true"
login="me,mypass"/>
</pre>
-</blockquote>
+
<p>Does a recursive checkout of the project <i>$/test</i> to the directory D:\build.
</p>
<hr>
@@ -697,12 +697,12 @@ Task to perform ADD commands to Microsoft Visual SourceSafe.
</table>
<h3>Examples</h3>
-<blockquote>
+
<pre>
<vssadd localpath="D:\build\build.00012.zip"
comment="Added by automatic build"/>
</pre>
-</blockquote>
+
<p>Add the file named build.00012.zip into the project current working
directory (see vsscp).</p>
<hr>
@@ -753,11 +753,9 @@ directory (see vsscp).</p>
</table>
<h3>Examples</h3>
-<blockquote>
-<pre>
-<vsscp vsspath="$/Projects/ant"/>
-</pre>
-</blockquote>
+
+<pre><vsscp vsspath="$/Projects/ant"/></pre>
+
<p>Sets the current VSS project to <i>$/Projects/ant</i>.</p>
<hr>
@@ -811,11 +809,9 @@ directory (see vsscp).</p>
</tr>
</table>
<h3>Examples</h3>
-<blockquote>
-<pre>
-<vsscreate vsspath="$/existingProject/newProject"/>
-</pre>
-</blockquote>
+
+<pre><vsscreate vsspath="$/existingProject/newProject"/></pre>
+
<p>Creates the VSS-Project <i>$/existingProject/newProject</i>.</p>
</body>
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/waitfor.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/waitfor.html b/manual/Tasks/waitfor.html
index 30dc465..890ede6 100644
--- a/manual/Tasks/waitfor.html
+++ b/manual/Tasks/waitfor.html
@@ -102,27 +102,27 @@ true within the specified time.</p>
<a href="conditions.html">here</a> for the full list.</p>
<h3>Examples</h3>
-<blockquote><pre>
+<pre>
<waitfor maxwait="30" maxwaitunit="second">
<available file="errors.log"/>
</waitfor>
-</pre></blockquote>
+</pre>
<p>waits up to 30 seconds for a file called errors.log to appear.</p>
-<blockquote><pre>
+<pre>
<waitfor maxwait="3" maxwaitunit="minute" checkevery="500">
<http url="http://localhost/myapp/index.html"/>
</waitfor>
-</pre></blockquote>
+</pre>
<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><pre>
+<pre>
<waitfor maxwait="10" maxwaitunit="second">
<and>
<socket server="dbserver" port="1521"/>
<http url="http://webserver/mypage.html"/>
</and>
</waitfor>
-</pre></blockquote>
+</pre>
<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>
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/whichresource.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/whichresource.html b/manual/Tasks/whichresource.html
index 72eb2ee..27ee95e 100644
--- a/manual/Tasks/whichresource.html
+++ b/manual/Tasks/whichresource.html
@@ -31,9 +31,9 @@
The named property is set if the item can be found.
For example:
</p>
-<blockquote><pre>
+<pre>
<whichresource resource="/log4j.properties" property="log4j.url" >
-</pre></blockquote>
+</pre>
<h3>Parameters</h3>
<table>
<tr>
@@ -91,7 +91,7 @@
<p>
The following shows using a classpath reference.
</p>
-<blockquote><pre>
+<pre>
<path id="bsf.classpath">
<fileset dir="${user.home}/lang/bsf" includes="*.jar"/>
</path>
@@ -99,11 +99,11 @@
class="org.apache.bsf.BSFManager"
classpathref="bsf.classpath"/>
<echo>${bsf.class.location}</echo>
-</pre></blockquote>
+</pre>
<p>
The following shows using a nested classpath.
</p>
-<blockquote><pre>
+<pre>
<whichresource
property="ant-contrib.antlib.location"
resource="net/sf/antcontrib/antlib.xml">
@@ -112,6 +112,6 @@
</classpath>
</whichresource>
<echo>${ant-contrib.antlib.location}</echo>
-</pre></blockquote>
+</pre>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Types/antlib.html
----------------------------------------------------------------------
diff --git a/manual/Types/antlib.html b/manual/Types/antlib.html
index 0e738c0..bace8de 100644
--- a/manual/Types/antlib.html
+++ b/manual/Types/antlib.html
@@ -25,7 +25,6 @@
<body>
<h2 id="antlib">Antlib</h2>
-
<h3>Description</h3>
<p>
An antlib file is an xml file with a root element of "antlib".
@@ -53,8 +52,7 @@
A group of tasks and types may be defined together in an antlib
file. For example the file <i>sample.xml</i> contains the following:
</p>
- <blockquote>
- <pre>
+ <pre>
<?xml version="1.0"?>
<antlib>
<typedef name="if" classname="org.acme.ant.If"/>
@@ -70,17 +68,14 @@
</sequential>
</macrodef>
</antlib>
- </pre>
- </blockquote>
+ </pre>
<p>
It defines two types or tasks, <i>if</i> and <i>scriptpathmapper</i>.
This antlib file may be used in a build script as follows:
</p>
- <blockquote>
- <pre>
+ <pre>
<typedef file="sample.xml"/>
- </pre>
- </blockquote>
+ </pre>
<p>
The other attributes of <code><typedef></code> may be used as well.
For example, assuming that the <i>sample.xml</i> is in a jar
@@ -88,25 +83,20 @@
following build fragment will define the <i>if</i> and <i>scriptpathmapper</i>
tasks/types and place them in the namespace uri <i>samples:/acme.org</i>.
</p>
- <blockquote>
- <pre>
+ <pre>
<typedef resource="org/acme/ant/sample.xml"
uri="samples:/acme.org"/>
- </pre>
- </blockquote>
+ </pre>
<p>
The definitions may then be used as follows:
</p>
- <blockquote>
- <pre>
+ <pre>
<sample:if valuetrue="${props}" xmlns:sample="samples:/acme.org">
<sample:scriptpathmapper language="beanshell">
some bean shell
</sample:scriptpathmapper>
</sample:if>
- </pre>
- </blockquote>
-
+ </pre>
<h3 id="antlibnamespace">Antlib namespace</h3>
<p>
@@ -125,8 +115,7 @@
defined, the following build file will automatically load the antcontrib
definitions at location <i>HERE</i>:
</p>
- <blockquote>
- <pre>
+ <pre>
<project default="deletetest" xmlns:antcontrib="antlib:net.sf.antcontrib">
<macrodef name="showdir">
<attribute name="dir"/>
@@ -148,22 +137,18 @@
<showdir dir="a"/>
</target>
</project>
- </pre>
- </blockquote>
+ </pre>
<p>
The requirement that the resource is in the default classpath
may be removed in future versions of Ant.
</p>
-
-
<h3 id="loadFromInside">Load antlib from inside of the buildfile</h3>
<p>
If you want to separate the antlib from your local Ant installation, e.g. because you
want to hold that jar in your projects SCM system, you have to specify a classpath, so
that Ant could find that jar. The best solution is loading the antlib with <tt><taskdef></tt>.
</p>
- <blockquote>
- <pre>
+ <pre>
<project xmlns:<font color="green">antcontrib</font>="<font color="red">antlib:net.sf.antcontrib</font>">
<taskdef uri="<font color="red">antlib:net.sf.antcontrib</font>"
resource="net/sf/antcontrib/antlib.xml"
@@ -178,9 +163,7 @@
</antcontrib:for>
</target>
</project>
- </pre>
- </blockquote>
-
+ </pre>
<h3 id="currentnamespace">Current namespace</h3>
<p>
Definitions defined in antlibs may be used in antlibs. However
@@ -192,8 +175,7 @@
type <code><isallowed></code> and a macro
<code><ifallowed></code> that makes use of the task and type:
</p>
- <blockquote>
- <pre>
+ <pre>
<antlib xmlns:current="ant:current">
<taskdef name="if" classname="org.acme.ant.If"/>
<typedef name="isallowed" classname="org.acme.ant.Isallowed"/>
@@ -210,10 +192,7 @@
</sequential>
</macrodef>
</antlib>
- </pre>
- </blockquote>
-
-
+ </pre>
<h3>Other examples and comments</h3>
<p>
Antlibs may make use of other antlibs.
@@ -226,8 +205,7 @@
following antlib may be used to define defaults for various
tasks:
</p>
- <blockquote>
- <pre>
+ <pre>
<antlib xmlns:antcontrib="antlib:net.sf.antcontrib">
<presetdef name="javac">
<javac deprecation="${deprecation}"
@@ -240,21 +218,18 @@
<antcontrib:shellscript shell="bash"/>
</presetdef>
</antlib>
- </pre>
- </blockquote>
+ </pre>
<p>
This may be used as follows:
</p>
- <blockquote>
- <pre>
+ <pre>
<project xmlns:local="localpresets">
<typedef file="localpresets.xml" uri="localpresets"/>
<local:shellscript>
echo "hello world"
</local:shellscript>
</project>
- </pre>
- </blockquote>
+ </pre>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Types/classfileset.html
----------------------------------------------------------------------
diff --git a/manual/Types/classfileset.html b/manual/Types/classfileset.html
index 5e7642c..5f25108 100644
--- a/manual/Types/classfileset.html
+++ b/manual/Types/classfileset.html
@@ -85,28 +85,28 @@ relative location of the classfile in the fileset. So, the file
<code>org.apache.tools.ant.Project</code>.</p>
<h4>Examples</h4>
-<blockquote><pre>
+<pre>
<classfileset id="reqdClasses" dir="${classes.dir}">
<root classname="org.apache.tools.ant.Project"/>
</classfileset>
-</pre></blockquote>
+</pre>
<p>This example creates a fileset containing all the class files upon which the
<code>org.apache.tools.ant.Project</code> class depends. This fileset could
then be used to create a jar.
</p>
-<blockquote><pre>
+<pre>
<jar destfile="minimal.jar">
<fileset refid="reqdClasses"/>
</jar>
-</pre></blockquote>
+</pre>
-<blockquote><pre>
+<pre>
<classfileset id="reqdClasses" dir="${classes.dir}">
<rootfileset dir="${classes.dir}" includes="org/apache/tools/ant/Project*.class"/>
</classfileset>
-</pre></blockquote>
+</pre>
<p>This example constructs the classfileset using all the class with names starting with Project
in the org.apache.tools.ant package</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Types/custom-programming.html
----------------------------------------------------------------------
diff --git a/manual/Types/custom-programming.html b/manual/Types/custom-programming.html
index 3010b83..5f851e4 100644
--- a/manual/Types/custom-programming.html
+++ b/manual/Types/custom-programming.html
@@ -64,8 +64,7 @@
For example a custom condition that returns true if a
string is all upper case could be written as:
</p>
- <blockquote>
- <pre>
+ <pre>
package com.mydomain;
import org.apache.tools.ant.BuildException;
@@ -87,31 +86,25 @@ public class AllUpperCaseCondition implements Condition {
return value.toUpperCase().equals(value);
}
}
- </pre>
- </blockquote>
-
+ </pre>
<p>
Adding the condition to the system is achieved as follows:
</p>
- <blockquote>
- <pre>
+ <pre>
<typedef
name="alluppercase"
classname="com.mydomain.AllUpperCaseCondition"
classpath="${mydomain.classes}"/>
- </pre>
- </blockquote>
+ </pre>
<p>
This condition can now be used wherever a Core Ant condition
is used.
</p>
- <blockquote>
- <pre>
+ <pre>
<condition property="allupper">
<alluppercase value="THIS IS ALL UPPER CASE"/>
</condition>
- </pre>
- </blockquote>
+ </pre>
<h3 id="customselectors">Custom Selectors</h3>
<p>
Custom selectors are datatypes that implement
@@ -128,8 +121,7 @@ public class AllUpperCaseCondition implements Condition {
An example of a custom selection that selects filenames ending
in ".java" would be:
</p>
- <blockquote>
- <pre>
+ <pre>
package com.mydomain;
import java.io.File;
import org.apache.tools.ant.types.selectors.FileSelector;
@@ -138,34 +130,28 @@ public class JavaSelector implements FileSelector {
return filename.toLowerCase().endsWith(".java");
}
}
- </pre>
- </blockquote>
+ </pre>
<p>
Adding the selector to the system is achieved as follows:
</p>
- <blockquote>
- <pre>
+ <pre>
<typedef
name="javaselector"
classname="com.mydomain.JavaSelector"
classpath="${mydomain.classes}"/>
- </pre>
- </blockquote>
- <p>
+ </pre>
+ <p>
This selector can now be used wherever a Core Ant selector
is used, for example:
</p>
- <blockquote>
- <pre>
+ <pre>
<copy todir="to">
<fileset dir="src">
<javaselector/>
</fileset>
</copy>
- </pre>
- </blockquote>
-
- <p>
+ </pre>
+ <p>
One may use
<code>org.apache.tools.ant.types.selectors.BaseSelector</code>,
a convenience class that provides reasonable default
@@ -197,8 +183,7 @@ public class JavaSelector implements FileSelector {
if a certain number of contained selectors select, one could write
a selector as follows:
</p>
- <blockquote>
- <pre>
+ <pre>
public class MatchNumberSelectors extends BaseSelectorContainer {
private int number = -1;
public void setNumber(int number) {
@@ -221,13 +206,11 @@ public class MatchNumberSelectors extends BaseSelectorContainer {
return numberSelected == number;
}
}
- </pre>
- </blockquote>
+ </pre>
<p>
To define and use this selector one could do:
</p>
- <blockquote>
- <pre>
+ <pre>
<typedef name="numberselected"
classname="com.mydomain.MatchNumberSelectors"/>
...
@@ -238,8 +221,7 @@ public class MatchNumberSelectors extends BaseSelectorContainer {
<javaselector/>
</numberselected>
</fileset>
- </pre>
- </blockquote>
+ </pre>
<p>
<i>The custom selector</i>
</p>
@@ -250,7 +232,7 @@ public class MatchNumberSelectors extends BaseSelectorContainer {
<p>You can write your own selectors and use them within the selector
containers by specifying them within the <code><custom></code> tag.</p>
- <p>To create a new Custom Selector, you have to create a class that
+ <p>To create a new Custom Selector, you have to create a class that
implements
<code>org.apache.tools.ant.types.selectors.ExtendFileSelector</code>.
The easiest way to do that is through the convenience base class
@@ -305,15 +287,13 @@ public class MatchNumberSelectors extends BaseSelectorContainer {
<p>Here is how you use <code><custom></code> to
use your class as a selector:
</p>
-
- <blockquote><pre>
+ <pre>
<fileset dir="${mydir}" includes="**/*">
<custom classname="com.mydomain.MySelector">
<param name="myattribute" value="myvalue"/>
</custom>
</fileset>
- </pre></blockquote>
-
+ </pre>
<p>The core selectors that can also be used as custom selectors
are</p>
@@ -337,15 +317,13 @@ public class MatchNumberSelectors extends BaseSelectorContainer {
<p>Here is the example from the Depth Selector section rewritten
to use the selector through <code><custom></code>.</p>
-
- <blockquote><pre>
+ <pre>
<fileset dir="${doc.path}" includes="**/*">
<custom classname="org.apache.tools.ant.types.selectors.DepthSelector">
<param name="max" value="1"/>
</custom>
</fileset>
- </pre></blockquote>
-
+ </pre>
<p>Selects all files in the base directory and one directory below
that.</p>
@@ -363,8 +341,7 @@ public class MatchNumberSelectors extends BaseSelectorContainer {
For example a filterreader that removes every second character
could be:
</p>
- <blockquote>
- <pre>
+ <pre>
public class RemoveOddCharacters implements ChainableReader {
public Reader chain(Reader reader) {
return new BaseFilterReader(reader) {
@@ -384,8 +361,7 @@ public class RemoveOddCharacters implements ChainableReader {
}
}
}
- </pre>
- </blockquote>
+ </pre>
<p>
For line oriented filters it may be easier to extend
<code>ChainableFilterReader</code> an inner class of
@@ -394,8 +370,7 @@ public class RemoveOddCharacters implements ChainableReader {
<p>
For example a filter that appends the line number could be
</p>
- <blockquote>
- <pre>
+ <pre>
public class AddLineNumber extends ChainableReaderFilter {
private void lineNumber = 0;
public String filter(String string) {
@@ -403,8 +378,7 @@ public class AddLineNumber extends ChainableReaderFilter {
return "" + lineNumber + "\t" + string;
}
}
- </pre>
- </blockquote>
+ </pre>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Types/dirset.html
----------------------------------------------------------------------
diff --git a/manual/Types/dirset.html b/manual/Types/dirset.html
index 24adf54..3e790dc 100644
--- a/manual/Types/dirset.html
+++ b/manual/Types/dirset.html
@@ -98,9 +98,8 @@ equivalent to an <code><and></code> selector container.</p>
Specify what happens if the base directory does not exist.
If true a build error will happen, if false, the dirset
will be ignored/empty.
- Defaults to true.
- <em>Since Apache Ant 1.7.1 (default is true for backward compatibility
- reasons.)</em>
+ Defaults to true (for backward compatibility reasons).
+ <em>Since Apache Ant 1.7.1</em>
</td>
<td valign="top" align="center">No</td>
</tr>
@@ -108,43 +107,43 @@ equivalent to an <code><and></code> selector container.</p>
<h4>Examples</h4>
-<blockquote><pre>
+<pre>
<dirset dir="${build.dir}">
<include name="apps/**/classes"/>
<exclude name="apps/**/*Test*"/>
</dirset>
-</pre></blockquote>
+</pre>
<p>Groups all directories named <code>classes</code> found under the
<code>apps</code> subdirectory of <code>${build.dir}</code>, except those
that have the text <code>Test</code> in their name.</p>
-<blockquote><pre>
+<pre>
<dirset dir="${build.dir}">
<patternset id="non.test.classes">
<include name="apps/**/classes"/>
<exclude name="apps/**/*Test*"/>
</patternset>
</dirset>
-</pre></blockquote>
+</pre>
<p>Groups the same directories as the above example, but also establishes
a PatternSet that can be referenced in other
<code><dirset></code> elements, rooted at a different directory.</p>
-<blockquote><pre>
+<pre>
<dirset dir="${debug_build.dir}">
<patternset refid="non.test.classes"/>
</dirset>
-</pre></blockquote>
+</pre>
<p>Groups all directories in directory <code>${debug_build.dir}</code>,
using the same patterns as the above example.</p>
-<blockquote><pre>
+<pre>
<dirset id="dirset" dir="${workingdir}">
<present targetdir="${workingdir}">
<mapper type="glob" from="*" to="*/${markerfile}" />
</present>
</dirset>
-</pre></blockquote>
+</pre>
<p>Selects all directories somewhere under <code>${workingdir}</code>
which contain a <code>${markerfile}</code>.</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Types/extension.html
----------------------------------------------------------------------
diff --git a/manual/Types/extension.html b/manual/Types/extension.html
index b54d899..12193e2 100644
--- a/manual/Types/extension.html
+++ b/manual/Types/extension.html
@@ -83,7 +83,7 @@ Java2 Standard Edition package, in file
</table>
<h4>Examples</h4>
-<blockquote><pre>
+<pre>
<extension id="e1"
extensionName="MyExtensions"
specificationVersion="1.0"
@@ -92,18 +92,18 @@ Java2 Standard Edition package, in file
implementationVendor="Apache"
implementationVersion="2.0"
implementationURL="http://somewhere.com/myExt.jar"/>
-</pre></blockquote>
+</pre>
-<p>Fully specific extension object.</p>
+<p>Fully specified extension object.</p>
-<blockquote><pre>
+<pre>
<extension id="e1"
extensionName="MyExtensions"
specificationVersion="1.0"
specificationVendor="Peter Donald"/>
-</pre></blockquote>
+</pre>
-<p>Extension object that just species the specification details.</p>
+<p>Extension object that just specifies the specification details.</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Types/extensionset.html
----------------------------------------------------------------------
diff --git a/manual/Types/extensionset.html b/manual/Types/extensionset.html
index a42d8f4..4b1d444 100644
--- a/manual/Types/extensionset.html
+++ b/manual/Types/extensionset.html
@@ -48,7 +48,7 @@ Java2 Standard Edition package, in file
may be modified by attributes of libfileset</p>
<h4>Examples</h4>
-<blockquote><pre>
+<pre>
<extension id="e1"
extensionName="MyExtensions"
specificationVersion="1.0"
@@ -72,8 +72,7 @@ Java2 Standard Edition package, in file
<libfileset refid="lfs"/>
<extension refid="e1"/>
</extensionSet>
-
-</pre></blockquote>
+</pre>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Types/filelist.html
----------------------------------------------------------------------
diff --git a/manual/Types/filelist.html b/manual/Types/filelist.html
index 3a3f61c..6a9eb62 100644
--- a/manual/Types/filelist.html
+++ b/manual/Types/filelist.html
@@ -74,42 +74,42 @@ types.
</tr>
</table>
<h4>Examples</h4>
-<blockquote><pre>
+<pre>
<filelist
id="docfiles"
dir="${doc.src}"
files="foo.xml,bar.xml"/>
-</pre></blockquote>
+</pre>
<p>The files <code>${doc.src}/foo.xml</code> and
<code>${doc.src}/bar.xml</code>. Note that these files may not (yet)
actually exist.
</p>
-<blockquote><pre>
+<pre>
<filelist
id="docfiles"
dir="${doc.src}"
files="foo.xml
bar.xml"/>
-</pre></blockquote>
+</pre>
<p>Same files as the example above.</p>
-<blockquote><pre>
+<pre>
<filelist refid="docfiles"/>
-</pre></blockquote>
+</pre>
<p>Same files as the example above.</p>
-<blockquote><pre>
+<pre>
<filelist
id="docfiles"
dir="${doc.src}">
<file name="foo.xml"/>
<file name="bar.xml"/>
</filelist>
-</pre></blockquote>
+</pre>
<p>Same files as the example above.</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Types/fileset.html
----------------------------------------------------------------------
diff --git a/manual/Types/fileset.html b/manual/Types/fileset.html
index 47fcbec..920e85d 100644
--- a/manual/Types/fileset.html
+++ b/manual/Types/fileset.html
@@ -122,60 +122,60 @@ symbolic link but it may lead to false results on other
platforms.</p>
<h4>Examples</h4>
-<blockquote><pre>
+<pre>
<fileset dir="${server.src}" casesensitive="yes">
<include name="**/*.java"/>
<exclude name="**/*Test*"/>
</fileset>
-</pre></blockquote>
+</pre>
<p>Groups all files in directory <code>${server.src}</code> that are Java
source files and don't have the text <code>Test</code> in their
name.</p>
-<blockquote><pre>
+<pre>
<fileset dir="${server.src}" casesensitive="yes">
<patternset id="non.test.sources">
<include name="**/*.java"/>
<exclude name="**/*Test*"/>
</patternset>
</fileset>
-</pre></blockquote>
+</pre>
<p>Groups the same files as the above example, but also establishes
a PatternSet that can be referenced in other
<code><fileset></code> elements, rooted at a different directory.</p>
-<blockquote><pre>
+<pre>
<fileset dir="${client.src}" >
<patternset refid="non.test.sources"/>
</fileset>
-</pre></blockquote>
+</pre>
<p>Groups all files in directory <code>${client.src}</code>, using the
same patterns as the above example.</p>
-<blockquote><pre>
+<pre>
<fileset dir="${server.src}" casesensitive="yes">
<filename name="**/*.java"/>
<filename name="**/*Test*" negate="true"/>
</fileset>
-</pre></blockquote>
+</pre>
<p>Groups the same files as the top example, but using the
<code><filename></code> selector.</p>
-<blockquote><pre>
+<pre>
<fileset dir="${server.src}" casesensitive="yes">
<filename name="**/*.java"/>
<not>
<filename name="**/*Test*"/>
</not>
</fileset>
-</pre></blockquote>
+</pre>
<p>Groups the same files as the previous example using a combination of the
<code><filename></code> selector and the <code><not></code>
selector container.</p>
-<blockquote><pre>
+<pre>
<fileset dir="src" includes="main/" />
-</pre></blockquote>
+</pre>
<p>Selects all files in <i>src/main</i> (e.g. <i>src/main/Foo.java</i> or
<i>src/main/application/Bar.java</i>).</p>