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/08 16:01:02 UTC
[2/3] ant git commit: Tidy tag soup, remove inlined styling,
adjust formatting
http://git-wip-us.apache.org/repos/asf/ant/blob/94d36a9f/manual/Types/mapper.html
----------------------------------------------------------------------
diff --git a/manual/Types/mapper.html b/manual/Types/mapper.html
index b557360..38c3824 100644
--- a/manual/Types/mapper.html
+++ b/manual/Types/mapper.html
@@ -24,7 +24,7 @@
<body>
-<h2><a name="mapper">Mapping File Names</a></h2>
+<h2 id="mapper">Mapping File Names</h2>
<p>Some tasks take source files and create target files. Depending on
the task, it may be quite obvious which name a target file will have
(using <a href="../Tasks/javac.html">javac</a>, you know there will be
@@ -40,7 +40,7 @@ that can be parameterized with <code>from</code> and <code>to</code>
attributes - the exact meaning of which is implementation-dependent.</p>
<p>These instances are defined in <code><mapper></code> elements
with the following attributes:</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -93,17 +93,16 @@ instead.
<p>The classpath can be specified via a nested
<code><classpath></code>, as well - that is,
a <a href="../using.html#path">path</a>-like structure.</p>
-<p><b>Since Ant 1.7.0,</b> nested File Mappers can
+<p><em>Since Ant 1.7.0</em>, nested File Mappers can
be supplied via either <CODE><mapper></CODE> elements or
<a href="../Tasks/typedef.html"><code><typedef></code></a>'d
implementations of <CODE>org.apache.tools.ant.util.FileNameMapper</CODE>.
If nested File Mappers are specified by either means, the mapper will be
implicitly configured as a <a href="#composite-mapper">composite mapper</a>.
</p>
-<hr>
-<h3>The built-in mapper types are:</h3>
+<h3>The built-in mapper types</h3>
<p>All built-in mappers are case-sensitive.</p>
-<p><b>As of Ant 1.7.0,</b> each of the built-in mapper implementation
+<p><em>Since Ant 1.7.0</em>, each of the built-in mapper implementation
types is directly accessible using a specific tagname. This makes it
possible for filename mappers to support attributes in addition to
the generally available <i>to</i> and <i>from</i>.<br>
@@ -114,7 +113,7 @@ implicitly configured as a <a href="#composite-mapper">composite mapper</a>.
<!-- Identity Mapper -->
<!-- -->
-<h4><a name="identity-mapper">identity</a></h4>
+<h4 id="identity-mapper">identity</h4>
<p>The target file name is identical to the source file name. Both
<code>to</code> and <code>from</code> will be ignored.</p>
<b>Examples:</b>
@@ -122,7 +121,7 @@ implicitly configured as a <a href="#composite-mapper">composite mapper</a>.
<mapper type="identity"/>
<identitymapper/>
</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Source file name</b></td>
<td valign="top"><b>Target file name</b></td>
@@ -149,7 +148,7 @@ implicitly configured as a <a href="#composite-mapper">composite mapper</a>.
<!-- Flatten Mapper -->
<!-- -->
-<h4><a name="flatten-mapper">flatten</a></h4>
+<h4 id="flatten-mapper">flatten</h4>
<p>The target file name is identical to the source file name, with all
leading directory information stripped off. Both <code>to</code> and
<code>from</code> will be ignored.</p>
@@ -158,7 +157,7 @@ leading directory information stripped off. Both <code>to</code> and
<mapper type="flatten"/>
<flattenmapper/>
</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Source file name</b></td>
<td valign="top"><b>Target file name</b></td>
@@ -185,7 +184,7 @@ leading directory information stripped off. Both <code>to</code> and
<!-- Merge Mapper -->
<!-- -->
-<h4><a name="merge-mapper">merge</a></h4>
+<h4 id="merge-mapper">merge</h4>
<p>The target file name will always be the same, as defined by
<code>to</code> - <code>from</code> will be ignored.</p>
<h5>Examples:</h5>
@@ -193,7 +192,7 @@ leading directory information stripped off. Both <code>to</code> and
<mapper type="merge" to="archive.tar"/>
<mergemapper to="archive.tar"/>
</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Source file name</b></td>
<td valign="top"><b>Target file name</b></td>
@@ -220,7 +219,7 @@ leading directory information stripped off. Both <code>to</code> and
<!-- Glob Mapper -->
<!-- -->
-<h4><a name="glob-mapper">glob</a></h4>
+<h4 id="glob-mapper">glob</h4>
<p>Both <code>to</code> and <code>from</code> are required and define patterns that may
contain at most one <code>*</code>. For each source file that matches
the <code>from</code> pattern, a target file name will be constructed
@@ -233,7 +232,7 @@ that don't match the <code>from</code> pattern will be ignored.</p>
<mapper type="glob" from="*.java" to="*.java.bak"/>
<globmapper from="*.java" to="*.java.bak"/>
</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Source file name</b></td>
<td valign="top"><b>Target file name</b></td>
@@ -259,7 +258,7 @@ that don't match the <code>from</code> pattern will be ignored.</p>
<mapper type="glob" from="C*ies" to="Q*y"/>
<globmapper from="C*ies" to="Q*y"/>
</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Source file name</b></td>
<td valign="top"><b>Target file name</b></td>
@@ -284,7 +283,7 @@ that don't match the <code>from</code> pattern will be ignored.</p>
<p>
The globmapper mapper can take the following extra attributes.
</p>
- <table border="1" cellpadding="2" cellspacing="0">
+ <table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -295,7 +294,7 @@ that don't match the <code>from</code> pattern will be ignored.</p>
<td valign="top">
If this is false, the mapper will ignore case when matching the glob pattern.
This attribute can be true or false, the default is true.
- <em>Since Ant 1.6.3.</em>
+ <em>Since Ant 1.6.3</em>
</td>
<td align="center" valign="top">No</td>
</tr>
@@ -306,7 +305,7 @@ that don't match the <code>from</code> pattern will be ignored.</p>
directory separator characters - \ and /.
This attribute can be true or false, the default is false.
This attribute is useful for cross-platform build files.
- <em>Since Ant 1.6.3.</em>
+ <em>Since Ant 1.6.3</em>
<td align="center" valign="top">No</td>
</tr>
</table>
@@ -344,12 +343,11 @@ that don't match the <code>from</code> pattern will be ignored.</p>
will output "x is f/j.java".
</p>
-
<!-- -->
<!-- RegExp Mapper -->
<!-- -->
-<h4><a name="regexp-mapper">regexp</a></h4>
+<h4 id="regexp-mapper">regexp</h4>
<p>Both <code>to</code> and <code>from</code> are required and define
regular expressions. If the source file name (as a whole or in part)
@@ -371,9 +369,9 @@ another dollar-sign in Ant.</p>
<p>The regexp mapper needs a supporting library and an implementation
of <code>org.apache.tools.ant.util.regexp.RegexpMatcher</code> that
- hides the specifics of the library. <em>Since Ant 1.8.0</em> Ant
- requires Java 1.4 to run, so the implementation based on
- the <code>java.util.regex</code> package will always be available.
+ hides the specifics of the library. <em>Since Ant 1.8.0</em>,
+ Java 1.4 or later is required, so the implementation based on
+ the <code>java.util.regex</code> package is always be available.
You can still use the now retired Jakarta ORO or Jakarta Regex instead if your
provide the corresponding jar in your CLASSPATH.</p>
@@ -410,7 +408,7 @@ should be used.</li>
<mapper type="regexp" from="^(.*)\.java$$" to="\1.java.bak"/>
<regexpmapper from="^(.*)\.java$$" to="\1.java.bak"/>
</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Source file name</b></td>
<td valign="top"><b>Target file name</b></td>
@@ -436,7 +434,7 @@ should be used.</li>
<mapper type="regexp" from="^(.*)/([^/]+)/([^/]*)$$" to="\1/\2/\2-\3"/>
<regexpmapper from="^(.*)/([^/]+)/([^/]*)$$" to="\1/\2/\2-\3"/>
</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Source file name</b></td>
<td valign="top"><b>Target file name</b></td>
@@ -462,7 +460,7 @@ should be used.</li>
<mapper type="regexp" from="^(.*)\.(.*)$$" to="\2.\1"/>
<regexpmapper from="^(.*)\.(.*)$$" to="\2.\1"/>
</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Source file name</b></td>
<td valign="top"><b>Target file name</b></td>
@@ -488,7 +486,7 @@ should be used.</li>
<mapper type="regexp" from="^(.*?)(\$$[^/\\\.]*)?\.class$$" to="\1.java"/>
<regexpmapper from="^(.*?)(\$$[^/\\\.]*)?\.class$$" to="\1.java"/>
</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Source file name</b></td>
<td valign="top"><b>Target file name</b></td>
@@ -513,7 +511,7 @@ should be used.</li>
<p>
The regexpmapper mapper can take the following extra attributes.
</p>
- <table border="1" cellpadding="2" cellspacing="0">
+ <table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -524,7 +522,7 @@ should be used.</li>
<td valign="top">
If this is false, the mapper will ignore case when matching the pattern.
This attribute can be true or false, the default is true.
- <em>Since Ant 1.6.3.</em>
+ <em>Since Ant 1.6.3</em>
</td>
<td align="center" valign="top">No</td>
</tr>
@@ -535,7 +533,7 @@ should be used.</li>
as a / for the purposes of matching.
This attribute can be true or false, the default is false.
This attribute is useful for cross-platform build files.
- <em>Since Ant 1.6.3.</em>
+ <em>Since Ant 1.6.3</em>
<td align="center" valign="top">No</td>
</tr>
</table>
@@ -574,7 +572,7 @@ should be used.</li>
<!-- Package Mapper -->
<!-- -->
-<h4><a name="package-mapper">package</a></h4>
+<h4 id="package-mapper">package</h4>
<p>Sharing the same syntax as the <a href="#glob-mapper">glob mapper</a>,
the package mapper replaces
directory separators found in the matched source pattern with dots in the target
@@ -586,7 +584,7 @@ with <code><uptodate></code> and <code><junit></code> output.</p>
<mapper type="package" from="*Test.java" to="TEST-*Test.xml"/>
<packagemapper from="*Test.java" to="TEST-*Test.xml"/>
</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Source file name</b></td>
<td valign="top"><b>Target file name</b></td>
@@ -605,7 +603,7 @@ with <code><uptodate></code> and <code><junit></code> output.</p>
<!-- Unpackage Mapper -->
<!-- -->
-<h4><a name="unpackage-mapper">unpackage (since Ant 1.6.0)</a></h4>
+<h4 id="unpackage-mapper">unpackage (<em>since Ant 1.6.0</em>)</h4>
<p>This mapper is the inverse of the <a href="#package-mapper">package</a> mapper.
It replaces the dots in a package name with directory separators. This
is useful for matching XML formatter results against their JUnit test
@@ -618,7 +616,7 @@ with <code><uptodate></code> and <code><junit></code> output.</p>
<mapper type="unpackage" from="TEST-*Test.xml" to="${test.src.dir}/*Test.java">
<unpackagemapper from="TEST-*Test.xml" to="${test.src.dir}/*Test.java">
</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Source file name</b></td>
<td valign="top"><b>Target file name</b></td>
@@ -633,7 +631,7 @@ with <code><uptodate></code> and <code><junit></code> output.</p>
<!-- Composite Mapper -->
<!-- -->
-<h4><a name="composite-mapper">composite (since Ant 1.7.0)</a></h4>
+<h4 id="composite-mapper">composite (<em>since Ant 1.7.0</em>)</h4>
<p>This mapper implementation can contain multiple nested mappers.
File mapping is performed by passing the source filename to each nested
<code><mapper></code> in turn, returning all results.
@@ -648,7 +646,7 @@ with <code><uptodate></code> and <code><junit></code> output.</p>
<packagemapper from="*.java" to="*"/>
</compositemapper>
</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Source file name</b></td>
<td valign="top"><b>Target file names</b></td>
@@ -669,7 +667,7 @@ with <code><uptodate></code> and <code><junit></code> output.</p>
<!-- Chained Mapper -->
<!-- -->
-<h4><a name="chained-mapper">chained (since Ant 1.7.0)</a></h4>
+<h4 id="chained-mapper">chained (<em>since Ant 1.7.0</em>)</h4>
<p>This mapper implementation can contain multiple nested mappers.
File mapping is performed by passing the source filename to the first
nested mapper, its results to the second, and so on. The target filenames
@@ -686,7 +684,7 @@ with <code><uptodate></code> and <code><junit></code> output.</p>
</mapper>
</chainedmapper>
</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Source file name</b></td>
<td valign="top"><b>Target file names</b></td>
@@ -714,7 +712,7 @@ with <code><uptodate></code> and <code><junit></code> output.</p>
<!-- Filter Mapper -->
<!-- -->
-<h4><a name="filter-mapper">filtermapper (since Ant 1.6.3)</a></h4>
+<h4 id="filter-mapper">filtermapper (<em>since Ant 1.6.3</em>)</h4>
<p>
This mapper implementation applies a <a href="filterchain.html">filterchain</a>
to the source file name.
@@ -726,7 +724,7 @@ with <code><uptodate></code> and <code><junit></code> output.</p>
</filtermapper>
</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Source file name</b></td>
<td valign="top"><b>Target file names</b></td>
@@ -744,7 +742,7 @@ with <code><uptodate></code> and <code><junit></code> output.</p>
</filtermapper>
</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Source file name</b></td>
<td valign="top"><b>Target file names</b></td>
@@ -763,12 +761,13 @@ with <code><uptodate></code> and <code><junit></code> output.</p>
<!-- Script Mapper -->
<!-- -->
-<h4><a name="script-mapper">scriptmapper (since Ant 1.7)</a></h4>
+<h4 id="script-mapper">scriptmapper (<em>since Ant 1.7</em>)</h4>
<p>
This mapper executes a script written in <a href="http://jakarta.apache.org/bsf" target="_top">Apache BSF</a>
or
<a href="https://scripting.dev.java.net">JSR 223</a>
supported language, once per file to map.</p>
+<p>
The script can be declared inline or in a specified file.
</p>
<p>
@@ -776,7 +775,7 @@ See the <a href="../Tasks/script.html">Script</a> task for
an explanation of scripts and dependencies.
</p>
- <table border="1" cellpadding="2" cellspacing="0">
+ <table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -807,13 +806,13 @@ an explanation of scripts and dependencies.
</tr>
<tr>
<td valign="top">encoding</td>
- <td valign="top">The encoding of the script as a file. <em>since Ant 1.10.2.</em></td>
+ <td valign="top">The encoding of the script as a file. <em>Since Ant 1.10.2</em></td>
<td valign="top" align="center">No - defaults to default JVM encoding</td>
</tr>
<tr>
<td valign="top">setbeans</td>
<td valign="top">whether to have all properties, references and targets as
- global variables in the script. <em>since Ant 1.8.0</em></td>
+ global variables in the script. <em>Since Ant 1.8.0</em></td>
<td valign="top" align="center">No, default is "true".</td>
</tr>
<tr>
@@ -846,7 +845,7 @@ an explanation of scripts and dependencies.
</scriptmapper>
</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Source file name</b></td>
<td valign="top"><b>Target file names</b></td>
@@ -866,7 +865,7 @@ and the ability to return multiple mappings. Here are the relevant beans and
their methods. The script is called once for every source file, with the
list of mapped names reset after every invocation.
- <table border="1" cellpadding="2" cellspacing="0">
+ <table>
<tr>
<td valign="top"><b>Script bean</b></td>
<td valign="top"><b>Description</b></td>
@@ -901,7 +900,7 @@ list of mapped names reset after every invocation.
<code><mapper <b>type</b>></code> attribute.
</p>
-<h4><a name="firstmatch-mapper">firstmatchmapper (since Ant 1.8.0)</a></h4>
+<h4 id="firstmatch-mapper">firstmatchmapper (<em>since Ant 1.8.0</em>)</h4>
<p>
This mapper supports an arbitrary number of nested mappers and
returns the results of the first mapper that matches. This is
@@ -915,7 +914,7 @@ list of mapped names reset after every invocation.
</firstmatchmapper>
</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Source file name</b></td>
<td valign="top"><b>Target file names</b></td>
@@ -934,7 +933,7 @@ list of mapped names reset after every invocation.
<code><mapper <b>type</b>></code> attribute.
</p>
-<h4><a name="cutdirs-mapper">cutdirsmapper (since Ant 1.8.2)</a></h4>
+<h4 id="cutdirs-mapper">cutdirsmapper (<em>since Ant 1.8.2</em>)</h4>
<p>This mapper strips a configured number of leading directories from
the source file name.</p>
@@ -944,7 +943,7 @@ list of mapped names reset after every invocation.
<cutdirsmapper dirs="1"/>
</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Source file name</b></td>
<td valign="top"><b>Target file names</b></td>
@@ -958,7 +957,7 @@ list of mapped names reset after every invocation.
<p>The cutdirsmapper has no
corresponding <code><mapper <b>type</b>></code> attribute.</p>
- <table border="1" cellpadding="2" cellspacing="0">
+ <table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
http://git-wip-us.apache.org/repos/asf/ant/blob/94d36a9f/manual/Types/multirootfileset.html
----------------------------------------------------------------------
diff --git a/manual/Types/multirootfileset.html b/manual/Types/multirootfileset.html
index 29a4f54..cbe1fdc 100644
--- a/manual/Types/multirootfileset.html
+++ b/manual/Types/multirootfileset.html
@@ -24,7 +24,7 @@
<body>
-<h2><a name="multirootfileset">MultiRootFileSet</a></h2>
+<h2 id="multirootfileset">MultiRootFileSet</h2>
<p><em>Since Ant 1.9.4</em></p>
@@ -41,7 +41,7 @@ that share the same patterns and selectors.</p>
<p>MultiRootFileSet supports all attributes and nested elements of
FileSet and DirSet except for the "dir" attribute.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -141,7 +141,6 @@ an <code><and></code> selector container.</p>
nested <code>basedir</code> elements that have a
single <code>file</code> attribute.</p>
-
<h4>Examples</h4>
<blockquote><pre>
@@ -170,4 +169,3 @@ an <code><and></code> selector container.</p>
</body>
</html>
-
http://git-wip-us.apache.org/repos/asf/ant/blob/94d36a9f/manual/Types/namespace.html
----------------------------------------------------------------------
diff --git a/manual/Types/namespace.html b/manual/Types/namespace.html
index 3adfa80..5488022 100644
--- a/manual/Types/namespace.html
+++ b/manual/Types/namespace.html
@@ -14,14 +14,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html><head><link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
-<title>XmlNamespaceSupport</title></head>
+<html>
+<head>
+ <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
+<title>XmlNamespaceSupport</title>
+</head>
<body>
- <h2><a name="namespace">XML Namespace Support</a></h2>
- Apache Ant 1.6 introduces support for XML namespaces.
+ <h2 id="namespace">XML Namespace Support</h2>
+ Apache Ant 1.6 introduces support for XML namespaces.
<h3>History</h3>
-
+
<p>
All releases of Ant prior to Ant 1.6 do not support XML namespaces.
No support basically implies two things here:
@@ -72,7 +74,7 @@
and another time to actually map the namespace to occurrences of
elements from that namespace, by using the 'xmlns' attribute. This
mapping can happen at any level in the build file:
- </p><pre> <project name="test" xmlns:my="<a href="http://example.org/tasks">http://example.org/tasks</a>">
+ </p><pre> <project name="test" xmlns:my="<a href="http://example.org/tasks">http://example.org/tasks</a>">
<typedef resource="org/example/tasks.properties" uri="<a href="http://example.org/tasks">http://example.org/tasks</a>"/>
<my:task>
...
@@ -82,7 +84,7 @@
<p>
Use of a namespace prefix is of course optional. Therefore
the example could also look like this:
- </p><pre> <project name="test">
+ </p><pre> <project name="test">
<typedef resource="org/example/tasks.properties" uri="<a href="http://example.org/tasks">http://example.org/tasks</a>"/>
<task xmlns="<a href="http://example.org/tasks">http://example.org/tasks</a>">
...
@@ -104,8 +106,6 @@
</task>
</pre>
-
-
<h3>Namespaces and Nested Elements</h3>
<p>
@@ -132,14 +132,14 @@
From Ant 1.6.2, elements nested inside a namespaced element may also be
in Ant's default namespace. This means that the following is now allowed:
</p>
- </p><pre> <typedef resource="org/example/tasks.properties"
+ <pre> <typedef resource="org/example/tasks.properties"
uri="<a href="http://example.org/tasks">http://example.org/tasks</a>"/>
<my:task xmlns:my="<a href="http://example.org/tasks">http://example.org/tasks</a>">
<config a="foo" b="bar"/>
...
</my:task>
</pre>
-
+
<h3>Namespaces and Attributes</h3>
<p>
http://git-wip-us.apache.org/repos/asf/ant/blob/94d36a9f/manual/Types/patternset.html
----------------------------------------------------------------------
diff --git a/manual/Types/patternset.html b/manual/Types/patternset.html
index 4ad433d..e06cfc2 100644
--- a/manual/Types/patternset.html
+++ b/manual/Types/patternset.html
@@ -24,7 +24,7 @@
<body>
-<h2><a name="patternset">PatternSet</a></h2>
+<h2 id="patternset">PatternSet</h2>
<p><a href="../dirtasks.html#patterns">Patterns</a> can be grouped to
sets and later be referenced by their <code>id</code> attribute. They
are defined via a <code>patternset</code> element, which can appear
@@ -36,7 +36,7 @@ the same level as <code>target</code> — i.e., as children of
<code>target</code>.</p> <p>Patterns can be specified by nested
<code><include></code>, or <code><exclude></code> elements
or the following attributes.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -71,7 +71,7 @@ or the following attributes.</p>
<h4><code>include</code> and <code>exclude</code></h4>
<p>Each such element defines a single pattern for files to include or
exclude.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -102,7 +102,7 @@ attributes or elements. Using the attribute, you can only specify a
single file of each type, while the nested elements can be specified
more than once - the nested elements also support if/unless attributes
you can use to test the existence of a property.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -169,24 +169,21 @@ that it should be used only if a property is not set.</p>
<p>and</p>
<blockquote><pre>
<patternset>
- <includesfile name="some-file"/>
+ <includesfile name="some-file"/>
<patternset/>
</pre></blockquote>
<p>are identical. The include patterns will be read from the file
<code>some-file</code>, one pattern per line.</p>
<blockquote><pre>
<patternset>
- <includesfile name="some-file"/>
- <includesfile name="${some-other-file}"
- if="some-other-file"
- />
+ <includesfile name="some-file"/>
+ <includesfile name="${some-other-file}"
+ if="some-other-file"/>
<patternset/>
</pre></blockquote>
<p>will also read include patterns from the file the property
<code>some-other-file</code> points to, if a property of that name has
been defined.</p>
-
</body>
</html>
-
http://git-wip-us.apache.org/repos/asf/ant/blob/94d36a9f/manual/Types/permissions.html
----------------------------------------------------------------------
diff --git a/manual/Types/permissions.html b/manual/Types/permissions.html
index f7b90b7..a1438e5 100644
--- a/manual/Types/permissions.html
+++ b/manual/Types/permissions.html
@@ -24,26 +24,26 @@
<body>
-<h2><a name="permissions">Permissions</a></h2>
+<h2 id="permissions">Permissions</h2>
<p>
Permissions represents a set of security permissions granted or revoked to
a specific part code executed in the JVM where Apache Ant is running in.
The actual Permissions are specified via a set of nested permission items either
<code><grant></code>ed or <code><revoke></code>d.</p>
<p>
-In the base situation a <a href="#baseset">base set</a> of permissions granted.
+In the base situation a <a href="#baseset">base set</a> of permissions granted.
Extra permissions can be
granted. A granted permission can be overruled by revoking a permission.
-The security manager installed by the permissions will throw an
+The security manager installed by the permissions will throw an
<code>SecurityException</code> if
-the code subject to these permissions try to use an permission that has not been
+the code subject to these permissions try to use an permission that has not been
granted or that has been revoked.</p>
<h3>Nested elements</h3>
<h4>grant</h4>
<p>
-Indicates a specific permission is always granted. Its attributes indicate which
+Indicates a specific permission is always granted. Its attributes indicate which
permissions are granted.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -62,7 +62,7 @@ permissions are granted.</p>
</tr>
<tr>
<td valign="top">actions</td>
- <td valign="top">The actions allowed. The actual contents depend on the
+ <td valign="top">The actions allowed. The actual contents depend on the
Permission class and name.</td>
<td valign="top" align="center">No</td>
</tr>
@@ -77,7 +77,7 @@ Permission class.
<h4>revoke</h4>
<p>
Indicates a specific permission is revoked.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -96,7 +96,7 @@ Indicates a specific permission is revoked.</p>
</tr>
<tr>
<td valign="top">actions</td>
- <td valign="top">The actions allowed. The actual contents depend on the
+ <td valign="top">The actions allowed. The actual contents depend on the
Permission class and name.</td>
<td valign="top" align="center">No</td>
</tr>
@@ -105,14 +105,14 @@ Indicates a specific permission is revoked.</p>
Implied permissions are not resolved and therefore also not revoked.
</p>
<p>
-The name can handle the * wildcard at the end of the name, in which case all
+The name can handle the * wildcard at the end of the name, in which case all
permissions of the specified class of which the name starts with the specified name
(excluding the *) are revoked. Note that the - wildcard often supported by the
granted properties is not supported.
If the name is left empty all names match, and are revoked.
If the actions are left empty all actions match, and are revoked.
</p>
-<h3><a name="baseset">Base set</a></h3>
+<h3 id="baseset">Base set</h3>
A permissions set implicitly contains the following permissions:
<blockquote><pre>
<grant class="java.net.SocketPermission" name="localhost:1024-" actions="listen">
@@ -136,7 +136,7 @@ A permissions set implicitly contains the following permissions:
<grant class="java.util.PropertyPermission" name="java.vm.version" actions="read">
<grant class="java.util.PropertyPermission" name="java.vm.vendor" actions="read">
<grant class="java.util.PropertyPermission" name="java.vm.name" actions="read">
-</blockquote></pre>
+</pre></blockquote>
These permissions can be revoked via <code><revoke></code> elements if necessary.
<h3>Examples</h3>
http://git-wip-us.apache.org/repos/asf/ant/blob/94d36a9f/manual/Types/propertyset.html
----------------------------------------------------------------------
diff --git a/manual/Types/propertyset.html b/manual/Types/propertyset.html
index 81d491e..9227236 100644
--- a/manual/Types/propertyset.html
+++ b/manual/Types/propertyset.html
@@ -24,13 +24,13 @@
<body>
-<h2><a name="propertyset">PropertySet</a></h2>
+<h2 id="propertyset">PropertySet</h2>
<p><em>Since Apache Ant 1.6</em></p>
<p>Groups a set of properties to be used by reference in a task that
supports this.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -59,7 +59,7 @@ supports this.</p>
<p>Selects properties from the current project to be included in the
set.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -136,8 +136,5 @@ changes the names to start with "bar" instead.</p>
<p>If supplied, the nested mapper will be applied
subsequent to any negation of matched properties.</p>
-
-
</body>
</html>
-
http://git-wip-us.apache.org/repos/asf/ant/blob/94d36a9f/manual/Types/redirector.html
----------------------------------------------------------------------
diff --git a/manual/Types/redirector.html b/manual/Types/redirector.html
index d0e3683..56264a5 100644
--- a/manual/Types/redirector.html
+++ b/manual/Types/redirector.html
@@ -24,7 +24,7 @@
<body>
-<h2><a name="redirector">I/O redirection</a></h2>
+<h2 id="redirector">I/O redirection</h2>
<p>For many tasks, input and output can be defined in a fairly
straightforward fashion. The <a href="../Tasks/exec.html">exec</a>
task, used to execute an external process, stands as a very
@@ -36,7 +36,7 @@ of redirecting input and output featuring the use of
<a href="./mapper.html">File Mapper</a>s to specify
source (input) and destination (output/error) files. <em>Since Apache Ant 1.6.2</em>
<p>The <code><redirector></code> element accepts the following attributes:</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -124,7 +124,7 @@ source (input) and destination (output/error) files. <em>Since Apache Ant 1.6.2
<tr>
<td valign="top">alwayslog</td>
<td valign="top">Always send to the log in addition to
- any other destination. <i>Since Ant 1.6.3</i>.
+ any other destination. <em>Since Ant 1.6.3</em>
</td>
<td align="center" valign="top">No, default is <code>false</code></td>
</tr>
@@ -132,7 +132,7 @@ source (input) and destination (output/error) files. <em>Since Apache Ant 1.6.2
<td valign="top">loginputstring</td>
<td valign="top">Controls the display of <i>inputstring</i>'s value in
log messages. Set to <code>false</code> when sending sensitive data
- (e.g. passwords) to external processes. <i>Since Ant 1.6.3</i>.
+ (e.g. passwords) to external processes. <em>Since Ant 1.6.3</em>
</td>
<td align="center" valign="top">No, default is <code>true</code></td>
</tr>
@@ -142,7 +142,7 @@ source (input) and destination (output/error) files. <em>Since Apache Ant 1.6.2
output into lines - which it will usually do in order to separate
error from normal output. This setting will not prevent binary
output from getting corrupted if you also specify filter chains.
- <i>Since Ant 1.9.4</i>.
+ <em>Since Ant 1.9.4</em>
</td>
<td align="center" valign="top">No, default is <code>false</code></td>
</tr>
@@ -187,7 +187,5 @@ Tasks known to support I/O redirection:
dependent on the supporting task. Any possible points of confusion
should be noted at the task level.</p>
-
</body>
</html>
-
http://git-wip-us.apache.org/repos/asf/ant/blob/94d36a9f/manual/Types/regexp.html
----------------------------------------------------------------------
diff --git a/manual/Types/regexp.html b/manual/Types/regexp.html
index 0628bb9..5e01ec3 100644
--- a/manual/Types/regexp.html
+++ b/manual/Types/regexp.html
@@ -24,11 +24,11 @@
<body>
-<h2><a name="regexp">Regexp</a></h2>
+<h2 id="regexp">Regexp</h2>
<p>
Regexp represents a regular expression.
<h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -54,7 +54,7 @@ Defines a regular expression for later use with id myregexp.
<p>
Use the regular expression with id myregexp.
</p>
-<h3><a name="implementation">Choice of regular expression implementation</a></h3>
+<h3 id="implementation">Choice of regular expression implementation</h3>
<p>
Apache Ant comes with
wrappers for
@@ -65,7 +65,7 @@ See <a href="../install.html#librarydependencies">installation dependencies</a>
concerning the supporting libraries.</p>
<p>
The property <code>ant.regexp.regexpimpl</code> governs which regular expression implementation will be chosen.
-Possible values for this property are :
+ Possible values for this property are:</p>
<ul>
<li>
org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp
@@ -77,20 +77,21 @@ org.apache.tools.ant.util.regexp.JakartaOroRegexp
org.apache.tools.ant.util.regexp.JakartaRegexpRegexp
</li>
</ul>
-It can also be another implementation of the interface <code>org.apache.tools.ant.util.regexp.Regexp</code>.
+<p>It can also be another implementation of the interface <code>org.apache.tools.ant.util.regexp.Regexp</code>.
If <code>ant.regexp.regexpimpl</code> is not defined, Ant uses Jdk14Regexp as this is always available.</p>
<p>
There are cross-platform issues for matches related to line terminator.
For example if you use $ to anchor your regular expression on the end of a line
the results might be very different depending on both your platform and the regular
expression library you use. It is 'highly recommended' that you test your pattern on
-both Unix and Windows platforms before you rely on it.
+ both Unix and Windows platforms before you rely on it.</p>
<ul>
<li>Jakarta Oro defines a line terminator as '\n' and is consistent with Perl.</li>
<li>Jakarta RegExp uses a system-dependent line terminator.</li>
<li>JDK 1.4 uses '\n', '\r\n', '\u0085', '\u2028', '\u2029' as a default
but is configured in the wrapper to use only '\n' (UNIX_LINE)</li>
</ul>
+<p>
<em>We used to recommend that you use Jakarta ORO but since its
development has been retired Java's built-in regex package is likely
the best choice going forward.</em>
http://git-wip-us.apache.org/repos/asf/ant/blob/94d36a9f/manual/Types/resources.html
----------------------------------------------------------------------
diff --git a/manual/Types/resources.html b/manual/Types/resources.html
index b90ee23..d16650a 100644
--- a/manual/Types/resources.html
+++ b/manual/Types/resources.html
@@ -24,7 +24,7 @@
<body>
-<h2><a name="resource">Resources</a></h2>
+<h2 id="resource">Resources</h2>
<p>
A file-like entity can be abstracted to the concept of a <i>resource</i>.
In addition to providing access to file-like attributes, a resource
@@ -53,7 +53,7 @@ explicit use beginning in <b>Ant 1.7</b>.
<li><a href="#zipentry">zipentry</a> - an entry in a zip file.</li>
</ul>
-<h4><a name="basic">resource</a></h4>
+<h4 id="basic">resource</h4>
<p>A basic resource. Other resource types derive from this basic
type; as such all its attributes are available, though in most cases
@@ -62,7 +62,7 @@ implementations are also usable as single-element
<a href="#collection">Resource Collections</a>.
</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -95,11 +95,11 @@ implementations are also usable as single-element
</tr>
</table>
-<h4><a name="file">file</a></h4>
+<h4 id="file">file</h4>
<p>Represents a file accessible via local filesystem conventions.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -119,11 +119,11 @@ implementations are also usable as single-element
</tr>
</table>
-<h4><a name="javaresource">javaresource</a></h4>
+<h4 id="javaresource">javaresource</h4>
<p>Represents a resource loadable via a Java classloader.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -167,13 +167,12 @@ implementations are also usable as single-element
where <b><classpath></b> is a <a
href="../using.html#path">path-like structure</a>.</p>
-
-<h4><a name="javaconstant">javaconstant</a></h4>
-<p>Loads the value of a java constant. As a specialisation of
+<h4 id="javaconstant">javaconstant</h4>
+<p>Loads the value of a java constant. As a specialisation of
<a href="#javaresource">javaresource</a> all of its attributes and nested elements are
supported. A constant must be specified as <tt>public static</tt> otherwise it could not be loaded.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -206,15 +205,14 @@ of that constant (<tt>build.xml</tt>).
<javaconstant name="org.apache.tools.ant.Main.DEFAULT_BUILD_FILENAME"/>
</copy></code></pre>
-
-<h4><a name="zipentry">zipentry</a></h4>
+<h4 id="zipentry">zipentry</h4>
<p>Represents an entry in a ZIP archive. The archive can be specified
using the archive attribute or a nested single-element resource
collection. <code>zipentry</code> only supports file system resources
as nested elements.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -239,13 +237,13 @@ as nested elements.</p>
</tr>
</table>
-<h4><a name="tarentry">tarentry</a></h4>
+<h4 id="tarentry">tarentry</h4>
<p>Represents an entry in a TAR archive. The archive can be specified
using the archive attribute or a nested single-element resource
collection.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -264,21 +262,21 @@ collection.</p>
</tr>
</table>
-<h4><a name="gzipresource">gzipresource</a></h4>
+<h4 id="gzipresource">gzipresource</h4>
<p>This is not a stand-alone resource, but a wrapper around another
resource providing compression of the resource's contents on the fly.
A single element resource collection must be specified as a nested
element.</p>
-<h4><a name="bzip2resource">bzip2resource</a></h4>
+<h4 id="bzip2resource">bzip2resource</h4>
<p>This is not a stand-alone resource, but a wrapper around another
resource providing compression of the resource's contents on the fly.
A single element resource collection must be specified as a nested
element.</p>
-<h4><a name="xzresource">xzresource</a></h4>
+<h4 id="xzresource">xzresource</h4>
<p>This is not a stand-alone resource, but a wrapper around another
resource providing compression of the resource's contents on the fly.
@@ -290,11 +288,11 @@ depends on external libraries not included in the Ant distribution.
See <a href="../install.html#librarydependencies">Library
Dependencies</a> for more information.</p>
-<h4><a name="url">url</a></h4>
+<h4 id="url">url</h4>
<p>Represents a URL.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -321,12 +319,12 @@ Dependencies</a> for more information.</p>
</tr>
</table>
-<h4><a name="string">string</a></h4>
+<h4 id="string">string</h4>
<p>Represents a Java String. It can be written to, but only once, after which
it will be an error to write to again.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -346,14 +344,12 @@ it will be an error to write to again.</p>
self.log("Ant version =${ant.version}");
</string>
</pre>
-
-</p>
-<h4><a name="propertyresource">propertyresource</a></h4>
+<h4 id="propertyresource">propertyresource</h4>
<p>Represents an Ant property.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -366,12 +362,13 @@ it will be an error to write to again.</p>
</tr>
</table>
-<hr>
-<h2><a name="collection">Resource Collections</a></h2>
+<hr/>
+<h2 id="collection">Resource Collections</h2>
<p>
A Resource Collection is an abstraction of an entity that groups
together a number of <a href="#resource">resources</a>. Several of
Ant's "legacy" datatypes have been modified to behave as Resource Collections:
+</p>
<ul>
<li><a href="fileset.html">fileset</a>,
<a href="dirset.html">dirset</a>,
@@ -392,8 +389,7 @@ Ant's "legacy" datatypes have been modified to behave as Resource Collections:
exposes <a href="#propertyresource">property</a> resources
</li>
</ul>
-</p>
-<p>Strangely, some tasks can even legitimately behave as resource collections:
+<p>Strangely, some tasks can even legitimately behave as resource collections:</p>
<ul>
<li><a href="../Tasks/concat.html">concat</a>
exposes a concatenated resource, and adds e.g.
@@ -401,7 +397,6 @@ Ant's "legacy" datatypes have been modified to behave as Resource Collections:
to Ant's resource-related capabilities.
</li>
</ul>
-</p>
<h3>The additional built-in resource collections are:</h3>
<ul>
<li><a href="#resources">resources</a> - generic resource collection</li>
@@ -434,7 +429,8 @@ Ant's "legacy" datatypes have been modified to behave as Resource Collections:
<li><a href="#resourcelist">resourcelist</a> - a collection of
resources whose names have been read from another resource.</li>
</ul>
-<h4><a name="resources">resources</a></h4>
+
+<h4 id="resources">resources</h4>
<p>A generic resource collection, designed for use with
<a href="../using.html#references">references</a>.
For example, if a third-party Ant task generates a Resource Collection
@@ -445,7 +441,7 @@ Ant's "legacy" datatypes have been modified to behave as Resource Collections:
duplicate resources (contrast with <a href="#union">union</a>).
</p>
<blockquote>
- <table border="1" cellpadding="2" cellspacing="0">
+ <table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -459,7 +455,7 @@ Ant's "legacy" datatypes have been modified to behave as Resource Collections:
</table>
</blockquote>
-<h4><a name="files">files</a></h4>
+<h4 id="files">files</h4>
<p>A group of files. These files are matched by <b>absolute</b> patterns
taken from a number of <a href="patternset.html">PatternSets</a>.
These can be specified as nested <code><patternset></code>
@@ -483,7 +479,7 @@ Ant's "legacy" datatypes have been modified to behave as Resource Collections:
the file has been included based on pattern-based selection.
</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -532,17 +528,16 @@ Ant's "legacy" datatypes have been modified to behave as Resource Collections:
</tr>
</table>
-<p><a name="symlink"><b>Note</b></a>: All files/directories for which
+<p id="symlink"><b>Note</b>: All files/directories for which
the canonical path is different from its path are considered symbolic
links. On Unix systems this usually means the file really is a
symbolic link but it may lead to false results on other
platforms.
</p>
-<h4><a name="restrict">restrict</a></h4>
+<h4 id="restrict">restrict</h4>
<p>Restricts a nested resource collection using resource selectors:
-<blockquote>
- <table border="1" cellpadding="2" cellspacing="0">
+ <table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -555,11 +550,11 @@ platforms.
<td valign="top" align="center">No, default <i>true</i></td>
</tr>
</table>
- <h4>Parameters specified as nested elements</h4>
+ <h5>Parameters specified as nested elements</h5>
<p>A single resource collection is required.</p>
<p>Nested resource selectors are used to "narrow down" the included
- resources, combined via a logical <i>AND</i>. These are patterned
- after <a href="selectors.html">file selectors</a> but are,
+ resources, combined via a logical <i>AND</i>. These are patterned
+ after <a href="selectors.html">file selectors</a> but are,
unsurprisingly, targeted to resources.
Several built-in resource selectors are available in the internal
<a href="antlib.html">antlib</a>
@@ -583,7 +578,7 @@ platforms.
by a majority of nested resource selectors.</li>
<li><a href="selectors.html#modified">modified</a> - select resources which
content has changed.</li>
- <li><a href="selectors.html#containsselect">contains</a> - select resources
+ <li><a href="selectors.html#containsselect">contains</a> - select resources
containing a particular text string.</li>
<li><a href="selectors.html#regexpselect">containsregexp</a> - select
resources whose contents match a particular regular expression.</li>
@@ -595,9 +590,9 @@ platforms.
Select files (resources must be files) if they are writable.</li>
</ul>
- <h4><a name="rsel.name">name</a></h4>
+ <h5 id="rsel.name">name</h5>
<p>Selects resources by name.</p>
- <table border="1" cellpadding="2" cellspacing="0">
+ <table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -626,17 +621,17 @@ platforms.
resource name or name attribute as a / for the purposes of
matching. This attribute can be true or false, the default is
false.
- <em>Since Ant 1.8.0.</em>
+ <em>Since Ant 1.8.0</em>
<td align="center" valign="top">No</td>
</tr>
</table>
- <h4><a name="rsel.exists">exists</a></h4>
+ <h5 id="rsel.exists">exists</h5>
<p>Selects existing resources.</p>
- <h4><a name="rsel.date">date</a></h4>
+ <h5 id="rsel.date">date</h5>
<p>Selects resources by date.</p>
- <table border="1" cellpadding="2" cellspacing="0">
+ <table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -675,9 +670,9 @@ platforms.
</tr>
</table>
- <h4><a name="rsel.type">type</a></h4>
+ <h5 id="rsel.type">type</h5>
<p>Selects resources by type (file or directory).</p>
- <table border="1" cellpadding="2" cellspacing="0">
+ <table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -685,14 +680,14 @@ platforms.
</tr>
<tr>
<td valign="top">type</td>
- <td valign="top">One of "file", "dir", "any" (since Ant 1.8)</td>
+ <td valign="top">One of "file", "dir", "any" (<em>since Ant 1.8</em>)</td>
<td align="center" valign="top">Yes</td>
</tr>
</table>
- <h4><a name="rsel.size">size</a></h4>
+ <h5 id="rsel.size">size</h5>
<p>Selects resources by size.</p>
- <table border="1" cellpadding="2" cellspacing="0">
+ <table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -711,9 +706,9 @@ platforms.
</tr>
</table>
- <h4><a name="rsel.instanceof">instanceof</a></h4>
+ <h5 id="rsel.instanceof">instanceof</h5>
<p>Selects resources by type.</p>
- <table border="1" cellpadding="2" cellspacing="0">
+ <table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -736,25 +731,25 @@ platforms.
</tr>
</table>
- <h4><a name="rsel.and">and</a></h4>
+ <h5 id="rsel.and">and</h5>
<p>Selects a resource if it is selected by all nested resource selectors.</p>
- <h4><a name="rsel.or">or</a></h4>
+ <h5 id="rsel.or">or</h5>
<p>Selects a resource if it is selected
by at least one nested resource selector.</p>
- <h4><a name="rsel.not">not</a></h4>
+ <h5 id="rsel.not">not</h5>
<p>Negates the selection result of the single
nested resource selector allowed.</p>
- <h4><a name="rsel.none">none</a></h4>
+ <h5 id="rsel.none">none</h5>
<p>Selects a resource if it is selected
by no nested resource selectors.</p>
- <h4><a name="rsel.majority">majority</a></h4>
+ <h5 id="rsel.majority">majority</h5>
<p>Selects a resource if it is selected
by the majority of nested resource selectors.</p>
- <table border="1" cellpadding="2" cellspacing="0">
+ <table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -768,10 +763,10 @@ platforms.
</tr>
</table>
- <h4><a name="rsel.compare">compare</a></h4>
+ <h5 id="rsel.compare">compare</h5>
<p>Selects a resource based on its comparison to one or more "control"
resources using nested <a href="#rcmp">resource comparators</a>.</p>
- <table border="1" cellpadding="2" cellspacing="0">
+ <table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -790,15 +785,15 @@ platforms.
<td valign="top">No, default "all"</td>
</tr>
</table>
- <h4>Parameters specified as nested elements</h4>
+ <h6>Parameters specified as nested elements</h6>
<p>The resources against which comparisons will be made must be specified
using the nested <control> element, which denotes a
<a href="#resources">resources</a> collection.</p>
- <h4>Examples</h4>
- <p>Assuming the namespace settings
+ <h6>Examples</h6>
+ <p>Assuming the namespace settings</p>
<pre><code> rsel="antlib:org.apache.tools.ant.types.resources.selectors"
rcmp="antlib:org.apache.tools.ant.types.resources.comparators"
-</code></pre></p>
+</code></pre>
<pre>
<restrict>
<fileset dir="src" includes="a,b,c,d,e,f,g" />
@@ -858,15 +853,12 @@ platforms.
which are not present. Finally we use the <i>toString:</i> <a href="../using.html#pathshortcut">pathshortcut</a> for
getting them in a readable form: <tt>[echo] These files are missed: ....foo.txt;....bar.txt</tt></p>
-</blockquote>
-
-<h4><a name="sort">sort</a></h4>
+<h4 id="sort">sort</h4>
<p>Sorts a nested resource collection according to the resources'
natural order, or by one or more nested <a href="#rcmp">resource
comparators</a>:</p>
-<blockquote>
- <table border="1" cellpadding="2" cellspacing="0">
+ <table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -879,7 +871,7 @@ platforms.
<td valign="top" align="center">No, default <i>true</i></td>
</tr>
</table>
- <h4>Parameters specified as nested elements</h4>
+ <h5>Parameters specified as nested elements</h5>
<p>A single resource collection is required.</p>
<p>The sort can be controlled and customized by specifying one or more
resource comparators. Resources can be sorted according to multiple
@@ -888,7 +880,7 @@ platforms.
are available in the internal <a href="antlib.html">antlib</a>
<code>org.apache.tools.ant.types.resources.comparators</code>:
</p>
- <h4><a name="rcmp">Resource Comparators:</a></h4>
+ <h5 id="rcmp">Resource Comparators:</h5>
<ul>
<li><a href="#rcmp.name">name</a> - sort resources by name</li>
<li><a href="#rcmp.exists">exists</a> - sort resources by existence</li>
@@ -900,26 +892,26 @@ platforms.
or that of a single nested resource comparator</li>
</ul>
- <h4><a name="rcmp.name">name</a></h4>
+ <h6 id="rcmp.name">name</h6>
<p>Sort resources by name.</p>
- <h4><a name="rcmp.exists">exists</a></h4>
+ <h6 id="rcmp.exists">exists</h6>
<p>Sort resources by existence.
Not existing is considered "less than" existing.</p>
- <h4><a name="rcmp.date">date</a></h4>
+ <h6 id="rcmp.date">date</h6>
<p>Sort resources by date.</p>
- <h4><a name="rcmp.type">type</a></h4>
+ <h6 id="rcmp.type">type</h6>
<p>Sort resources by type (file or directory).
Because directories contain files, they are considered "greater".</p>
- <h4><a name="rcmp.size">size</a></h4>
+ <h6 id="rcmp.size">size</h6>
<p>Sort resources by size.</p>
- <h4><a name="rcmp.content">content</a></h4>
+ <h6 id="rcmp.content">content</h6>
<p>Sort resources by content.</p>
- <table border="1" cellpadding="2" cellspacing="0">
+ <table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -928,16 +920,16 @@ platforms.
<tr>
<td valign="top">binary</td>
<td valign="top">Whether content should be compared in binary mode.
- If <i>false<i>, content will be compared without regard to
+ If <i>false</i>, content will be compared without regard to
platform-specific line-ending conventions.</td>
<td valign="top">No, default <i>true</i></td>
</tr>
</table>
- <h4><a name="rcmp.reverse">reverse</a></h4>
+ <h6 id="rcmp.reverse">reverse</h6>
<p>Reverse the natural sort order, or that of a single nested comparator.</p>
- <h4>Examples</h4>
+ <h5>Examples</h5>
<pre>
<property name="eol" value="${line.separator}" />
<pathconvert property="sorted" pathsep="${eol}">
@@ -948,10 +940,10 @@ platforms.
</tokens>
</sort>
</pathconvert></pre>
- <p>The resource of type string "foo bar etc baz" is split into four tokens by
+ <p>The resource of type string "foo bar etc baz" is split into four tokens by
the stringtokenizer. These tokens are sorted and there <i>sorted</i> gets the value
of "bar baz etc foo".</p>
-
+
<pre>
<sort>
<fileset dir="foo" />
@@ -966,15 +958,12 @@ platforms.
their namespace must be set explicitly.
</p>
-</blockquote>
-
-<h4><a name="first">first</a></h4>
+<h4 id="first">first</h4>
<p>Includes the first <i>count</i> resources from a nested resource collection.
This can be used in conjunction with the <a href="#sort">sort</a> collection,
for example, to select the first few oldest, largest, etc. resources from a
larger collection.</p>
-<blockquote>
- <table border="1" cellpadding="2" cellspacing="0">
+ <table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -992,17 +981,15 @@ larger collection.</p>
<td valign="top" align="center">No, default <i>true</i></td>
</tr>
</table>
- <h4>Parameters specified as nested elements</h4>
+ <h5>Parameters specified as nested elements</h5>
<p>A single resource collection is required.</p>
-</blockquote>
-<h4><a name="last">last</a></h4>
+<h4 id="last">last</h4>
<p>Includes the last <i>count</i> resources from a nested resource collection.
This can be used in conjunction with the <a href="#sort">sort</a> collection,
for example, to select the last few oldest, largest, etc. resources from a
-larger collection. <strong>Since Ant 1.7.1</strong>.</p>
-<blockquote>
- <table border="1" cellpadding="2" cellspacing="0">
+larger collection. <em>Since Ant 1.7.1</em></p>
+ <table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -1020,18 +1007,16 @@ larger collection. <strong>Since Ant 1.7.1</strong>.</p>
<td valign="top" align="center">No, default <i>true</i></td>
</tr>
</table>
- <h4>Parameters specified as nested elements</h4>
+ <h5>Parameters specified as nested elements</h5>
<p>A single resource collection is required.</p>
-</blockquote>
-<h4><a name="allbutfirst">allbutfirst</a></h4>
+<h4 id="allbutfirst">allbutfirst</h4>
<p>Includes all elements except for the first <i>count</i> resources
from a nested resource collection. This can be used in conjunction
with the <a href="#sort">sort</a> collection, for example, to select
all but the first few oldest, largest, etc. resources from a larger
-collection. <strong>Since Ant 1.9.5</strong>.</p>
-<blockquote>
- <table border="1" cellpadding="2" cellspacing="0">
+collection. <em>Since Ant 1.9.5</em></p>
+ <table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -1049,18 +1034,16 @@ collection. <strong>Since Ant 1.9.5</strong>.</p>
<td valign="top" align="center">No, default <i>true</i></td>
</tr>
</table>
- <h4>Parameters specified as nested elements</h4>
+ <h5>Parameters specified as nested elements</h5>
<p>A single resource collection is required.</p>
-</blockquote>
-<h4><a name="allbutlast">allbutlast</a></h4>
+<h4 id="allbutlast">allbutlast</h4>
<p>Includes all elements except for the last <i>count</i> resources
from a nested resource collection. This can be used in conjunction
with the <a href="#sort">sort</a> collection, for example, to select
all but the last few oldest, largest, etc. resources from a larger
-collection. <strong>Since Ant 1.9.5</strong>.</p>
-<blockquote>
- <table border="1" cellpadding="2" cellspacing="0">
+collection. <em>Since Ant 1.9.5</em></p>
+ <table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -1078,19 +1061,17 @@ collection. <strong>Since Ant 1.9.5</strong>.</p>
<td valign="top" align="center">No, default <i>true</i></td>
</tr>
</table>
- <h4>Parameters specified as nested elements</h4>
+ <h5>Parameters specified as nested elements</h5>
<p>A single resource collection is required.</p>
-</blockquote>
-<h4><a name="tokens">tokens</a></h4>
+<h4 id="tokens">tokens</h4>
<p>Includes the <a href="#string">string</a> tokens gathered from a nested
resource collection. Uses the same tokenizers supported by the
<a href="filterchain.html#tokenfilter">TokenFilter</a>. Imaginative
use of this resource collection can implement equivalents for such Unix
functions as <code>sort</code>, <code>grep -c</code>, <code>wc</code> and
<code>wc -l</code>.</p>
-<blockquote>
- <table border="1" cellpadding="2" cellspacing="0">
+ <table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -1108,14 +1089,14 @@ collection. <strong>Since Ant 1.9.5</strong>.</p>
<td valign="top" align="center">No, default <i>true</i></td>
</tr>
</table>
- <h4>Parameters specified as nested elements</h4>
+ <h5>Parameters specified as nested elements</h5>
<ul>
<li>A single resource collection is required.</li>
<li>One nested tokenizer may be specified. If omitted, a
<a href="filterchain.html#linetokenizer">LineTokenizer</a> will be used.
</li>
</ul>
- <h4>Examples</h4>
+ <h5>Examples</h5>
<pre><concat>
<union>
<sort>
@@ -1128,10 +1109,8 @@ collection. <strong>Since Ant 1.9.5</strong>.</p>
</concat>
</pre>
<p>Implements Unix <i>sort -u</i> against resource collection <i>input</i>.</p>
-</blockquote>
-<h4><a name="setlogic">Set operations</a></h4>
-<blockquote>
+<h4 id="setlogic">Set operations</h4>
<p>The following resource collections implement set operations:</p>
<ul>
<li><a href="#union">union</a></li>
@@ -1139,18 +1118,18 @@ collection. <strong>Since Ant 1.9.5</strong>.</p>
<li><a href="#difference">difference</a></li>
</ul>
- <h4><a name="union">union</a></h4>
+ <h4 id="union">union</h4>
<p>Union of nested resource collections.</p>
- <h4><a name="intersect">intersect</a></h4>
+ <h4 id="intersect">intersect</h4>
<p>Intersection of nested resource collections.</p>
- <h4><a name="difference">difference</a></h4>
+ <h4 id="difference">difference</h4>
<p>Difference of nested resource collections.</p>
<p>The following attributes apply to all set-operation resource collections:
</p>
- <table border="1" cellpadding="2" cellspacing="0">
+ <table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -1163,8 +1142,8 @@ collection. <strong>Since Ant 1.9.5</strong>.</p>
<td valign="top" align="center">No, default <i>true</i></td>
</tr>
</table>
-
- <h4>Examples</h4>
+
+ <h5>Examples</h5>
<pre>
<resources id="A">
<string value="a"/>
@@ -1186,9 +1165,8 @@ collection. <strong>Since Ant 1.9.5</strong>.</p>
difference: ${toString:difference} = a;c
</echo>
</pre>
-</blockquote>
-<h4><a name="mappedresources">mappedresources</a></h4>
+<h4 id="mappedresources">mappedresources</h4>
<p><em>Since Ant 1.8.0</em></p>
@@ -1201,10 +1179,9 @@ collection. <strong>Since Ant 1.9.5</strong>.</p>
use <em>mappedresources</em> with tasks that only allow file-system
based resources.</p>
-<blockquote>
- <h4>Parameters specified as attributes</h4>
+ <h5>Parameters specified as attributes</h5>
- <table border="1" cellpadding="2" cellspacing="0">
+ <table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -1222,18 +1199,18 @@ collection. <strong>Since Ant 1.9.5</strong>.</p>
If true the the collection will use all the mappings for a
given source path. If false the it will only process the first
resource.
- <em>since Ant 1.8.1</em>.</td>
+ <em>since Ant 1.8.1</em></td>
<td align="center">No - defaults to false.</td>
</tr>
</table>
- <h4>Parameters specified as nested elements</h4>
+ <h5>Parameters specified as nested elements</h5>
<p>A single resource collection is required.</p>
<p>A single <a href="mapper.html">mapper</a> can be used to map
names. If no mapper has been given (which doesn't make any sense,
honestly), an identity mapper will be used.</p>
- <h4>Examples</h4>
+ <h5>Examples</h5>
<p>Copies all files from a given directory to a target directory
adding ".bak" as an extension. Note this could be done with a
@@ -1265,10 +1242,9 @@ collection. <strong>Since Ant 1.9.5</strong>.</p>
</chainedmapper>
</mappedresources>
</war>
- </pre>
-</blockquote>
+ </pre>
-<h4><a name="archives">archives</a></h4>
+<h4 id="archives">archives</h4>
<p><em>Since Ant 1.8.0</em></p>
@@ -1284,8 +1260,7 @@ collection. <strong>Since Ant 1.9.5</strong>.</p>
<p><em>archives</em> doesn't support any attributes.</p>
-<blockquote>
- <h4>Parameters specified as nested elements</h4>
+ <h5>Parameters specified as nested elements</h5>
<p><code><archives></code> has two nested
elements <code><zips></code> and
@@ -1296,7 +1271,7 @@ collection. <strong>Since Ant 1.9.5</strong>.</p>
<p>The nested resources of <zips> are treated as ZIP archives,
the nested resources of <tars> as TAR archives.</p>
- <h4>Examples</h4>
+ <h5>Examples</h5>
<p>Copies all files from all jars that are on the classpath
to <code>${target}</code>.</p>
@@ -1313,9 +1288,8 @@ collection. <strong>Since Ant 1.9.5</strong>.</p>
</archives>
</copy>
</pre>
-</blockquote>
-<h4><a name="resourcelist">resourcelist</a></h4>
+<h4 id="resourcelist">resourcelist</h4>
<p><em>Since Ant 1.8.0</em></p>
@@ -1335,8 +1309,7 @@ collection. <strong>Since Ant 1.9.5</strong>.</p>
<p><code><resourcelist></code> is a generalization
of <a href="filelist.html"><code><filelist></code></a>.</p>
-<blockquote>
- <table border="1" cellpadding="2" cellspacing="0">
+ <table>
<tr>
<td valign="top"><b>Attribute</b></td>
<td valign="top"><b>Description</b></td>
@@ -1348,10 +1321,8 @@ collection. <strong>Since Ant 1.9.5</strong>.</p>
<td valign="top" align="center">No, default is platform default</td>
</tr>
</table>
-</blockquote>
-<blockquote>
- <h4>Parameters specified as nested elements</h4>
+ <h5>Parameters specified as nested elements</h5>
<p><code><resourcelist></code> accepts arbitrary many
resource(collection)s as nested elements.</p>
@@ -1362,7 +1333,7 @@ collection. <strong>Since Ant 1.9.5</strong>.</p>
expanded. Such a nested element corresponds to
a <a href="filterchain.html">filterchain</a>.</p>
- <h4>Examples</h4>
+ <h5>Examples</h5>
<p>The following example copies a file from the first URL of
several alternatives that can actually be reached. It assumes
@@ -1375,7 +1346,7 @@ http://second.best.mirror.example.org/mirror/of/best/
https://yet.another.mirror/
http://the.original.site/
</pre>
-
+
<pre>
<copy todir="${target}">
<first>
@@ -1388,7 +1359,6 @@ http://the.original.site/
</first>
</copy>
</pre>
-</blockquote>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/94d36a9f/manual/Types/selectors-program.html
----------------------------------------------------------------------
diff --git a/manual/Types/selectors-program.html b/manual/Types/selectors-program.html
index 074a542..55698fc 100644
--- a/manual/Types/selectors-program.html
+++ b/manual/Types/selectors-program.html
@@ -169,9 +169,7 @@
<li>verify the work</li>
</ol>
-
-
- <p>An example test would be:<pre>
+ <p>An example test would be:</p><pre>
package org.apache.tools.ant.types.selectors;
public class MySelectorTest {
@@ -182,7 +180,6 @@ public class MySelectorTest {
@Test
public void testCase1() {
-
// Configure the selector
MySelector s = new MySelector();
s.addParam("key1", "value1");
@@ -203,7 +200,7 @@ public class MySelectorTest {
[junit] expected:<FTTTFTTTF...> but was:<TTTTTTTTT...>
[junit] at junit.framework.Assert.assertEquals(Assert.java:81)
[junit] at org.apache.tools.ant.types.selectors.BaseSelectorTest.performTest(BaseSelectorTest.java:194)
- </pre></p>
+ </pre>
<p>Described above the test class should provide a <tt>getInstance()</tt>
method. But that isn't used here. The used <tt>getSelector()</tt> method is
@@ -213,7 +210,6 @@ public class MySelectorTest {
ability to use its own Project object (<tt>getProject()</tt>), for example
for logging.</p>
-
<h3>Logging</h3>
<p>During development and maybe later you sometimes need the output of information.
@@ -221,7 +217,7 @@ public class MySelectorTest {
BaseSelector it is an Ant <tt>DataType</tt> and therefore a <tt>ProjectComponent</tt>. <br>
That means that you have access to the project object and its logging capability.
<tt>ProjectComponent</tt> itself provides <i>log</i> methods which will do the
- access to the project instance. Logging is therefore done simply with:
+ access to the project instance. Logging is therefore done simply with:</p>
<pre>
log( "message" );
</pre>
@@ -229,16 +225,14 @@ public class MySelectorTest {
<pre>
log( "message" , loglevel );
</pre>
- where the <tt>loglevel</tt> is one of the values <ul>
+ where the <tt>loglevel</tt> is one of the values
+ <ul>
<li> org.apache.tools.ant.Project.MSG_ERR </li>
<li> org.apache.tools.ant.Project.MSG_WARN </li>
<li> org.apache.tools.ant.Project.MSG_INFO (= default) </li>
<li> org.apache.tools.ant.Project.MSG_VERBOSE </li>
<li> org.apache.tools.ant.Project.MSG_DEBUG </li>
</ul>
- </p>
-
</body>
-
</html>