ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgl...@apache.org
Subject svn commit: r953741 [2/4] - in /ant/core/branches/run-single-test-method: ./ docs/ docs/manual/ docs/manual/CoreTasks/ docs/manual/CoreTypes/ docs/manual/OptionalTasks/ docs/manual/OptionalTypes/ docs/manual/Tasks/ docs/manual/Types/ lib/ lib/optional/...
Date Fri, 11 Jun 2010 15:50:16 GMT
Modified: ant/core/branches/run-single-test-method/docs/manual/dirtasks.html
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/docs/manual/dirtasks.html?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/docs/manual/dirtasks.html (original)
+++ ant/core/branches/run-single-test-method/docs/manual/dirtasks.html Fri Jun 11 15:50:09 2010
@@ -26,11 +26,11 @@
 
 <h2><a name="directorybasedtasks">Directory-based Tasks</a></h2>
 <p>Some tasks use directory trees for the actions they perform.
-For example, the <a href="CoreTasks/javac.html">javac</a> task, which
+For example, the <a href="Tasks/javac.html">javac</a> task, which
 compiles a directory tree with <code>.java</code> files into
 <code>.class</code> files, is one of these directory-based tasks. Because
 some of these tasks do so much work with a directory tree, the task itself
-can act as an implicit <a href="CoreTypes/fileset.html">FileSet</a>.</p>
+can act as an implicit <a href="Types/fileset.html">FileSet</a>.</p>
 <p>Whether the fileset is implicit or not, it can often be very useful to
 work on a subset of the directory tree. This section describes how you can
 select a subset of such a directory tree when using one of these
@@ -41,16 +41,16 @@ which can be used at the same time:</p>
   <li>Only include files and directories that match any
     <code>include</code> patterns and do not match any
     <code>exclude</code> patterns in a given
-    <a href="CoreTypes/patternset.html">PatternSet</a>.</li>
+    <a href="Types/patternset.html">PatternSet</a>.</li>
   <li>Select files based on selection criteria defined by a collection of
-    <a href="CoreTypes/selectors.html">selector</a> nested elements.</li>
+    <a href="Types/selectors.html">selector</a> nested elements.</li>
 </ul>
 <h3><a name="patternset">Patternset</a></h3>
 
 <p>We said that Directory-based tasks can sometimes act as an implicit
-<a href="CoreTypes/fileset.html"><code>&lt;fileset&gt;</code></a>,
+<a href="Types/fileset.html"><code>&lt;fileset&gt;</code></a>,
 but in addition to that, a FileSet acts as an implicit
-<a href="CoreTypes/patternset.html"><code>&lt;patternset&gt;</code></a>.</p>
+<a href="Types/patternset.html"><code>&lt;patternset&gt;</code></a>.</p>
 
 <p>The inclusion and exclusion elements of the implicit PatternSet can be
 specified inside the directory-based task (or explicit fileset) via
@@ -190,13 +190,13 @@ For example, <code>mypackage/test/</code
 way to select just the files you want.</p>
 
 <h3><a name="selectors">Selectors</a></h3>
-<p>The <a href="CoreTypes/fileset.html"><code>&lt;fileset&gt;</code></a>,
+<p>The <a href="Types/fileset.html"><code>&lt;fileset&gt;</code></a>,
 whether implicit or explicit in the
 directory-based task, also acts as an
-<a href="CoreTypes/selectors.html#andselect"><code>&lt;and&gt;</code></a>
+<a href="Types/selectors.html#andselect"><code>&lt;and&gt;</code></a>
 selector container. This can be used to create arbitrarily complicated
 selection criteria for the files the task should work with. See the
-<a href="CoreTypes/selectors.html">Selector</a> documentation for more
+<a href="Types/selectors.html">Selector</a> documentation for more
 information.</p>
 
 <h3><a name="tasklist">Standard Tasks/Filesets</a></h3>
@@ -204,32 +204,32 @@ information.</p>
 the rules given here. This list, a subset of those, is a list of standard ant
 tasks that can act as an implicit fileset:</p>
 <ul>
-      <li><a href="CoreTasks/checksum.html"><code>&lt;checksum&gt;</code></a></li>
-  <li><a href="CoreTasks/copydir.html"><code>&lt;copydir&gt;</code></a> (deprecated)</li>
-  <li><a href="CoreTasks/delete.html"><code>&lt;delete&gt;</code></a></li>
-  <li><a href="CoreTasks/dependset.html"><code>&lt;dependset&gt;</code></a></li>
-  <li><a href="CoreTasks/fixcrlf.html"><code>&lt;fixcrlf&gt;</code></a></li>
-  <li><a href="CoreTasks/javac.html"><code>&lt;javac&gt;</code></a></li>
-  <li><a href="CoreTasks/replace.html"><code>&lt;replace&gt;</code></a></li>
-  <li><a href="CoreTasks/rmic.html"><code>&lt;rmic&gt;</code></a></li>
-  <li><a href="CoreTasks/style.html"><code>&lt;style&gt;</code> (aka <code>&lt;xslt&gt;</code>)</a></li>
-  <li><a href="CoreTasks/tar.html"><code>&lt;tar&gt;</code></a></li>
-  <li><a href="CoreTasks/zip.html"><code>&lt;zip&gt;</code></a></li>
-  <li><a href="OptionalTasks/ejb.html#ddcreator"><code>&lt;ddcreator&gt;</code></a></li>
-  <li><a href="OptionalTasks/ejb.html#ejbjar"><code>&lt;ejbjar&gt;</code></a></li>
-  <li><a href="OptionalTasks/ejb.html#ejbc"><code>&lt;ejbc&gt;</code></a></li>
-  <li><a href="OptionalTasks/cab.html"><code>&lt;cab&gt;</code></a></li>
-  <li><a href="OptionalTasks/native2ascii.html"><code>&lt;native2ascii&gt;</code></a></li>
-  <li><a href="OptionalTasks/netrexxc.html"><code>&lt;netrexxc&gt;</code></a></li>
+      <li><a href="Tasks/checksum.html"><code>&lt;checksum&gt;</code></a></li>
+  <li><a href="Tasks/copydir.html"><code>&lt;copydir&gt;</code></a> (deprecated)</li>
+  <li><a href="Tasks/delete.html"><code>&lt;delete&gt;</code></a></li>
+  <li><a href="Tasks/dependset.html"><code>&lt;dependset&gt;</code></a></li>
+  <li><a href="Tasks/fixcrlf.html"><code>&lt;fixcrlf&gt;</code></a></li>
+  <li><a href="Tasks/javac.html"><code>&lt;javac&gt;</code></a></li>
+  <li><a href="Tasks/replace.html"><code>&lt;replace&gt;</code></a></li>
+  <li><a href="Tasks/rmic.html"><code>&lt;rmic&gt;</code></a></li>
+  <li><a href="Tasks/style.html"><code>&lt;style&gt;</code> (aka <code>&lt;xslt&gt;</code>)</a></li>
+  <li><a href="Tasks/tar.html"><code>&lt;tar&gt;</code></a></li>
+  <li><a href="Tasks/zip.html"><code>&lt;zip&gt;</code></a></li>
+  <li><a href="Tasks/ejb.html#ddcreator"><code>&lt;ddcreator&gt;</code></a></li>
+  <li><a href="Tasks/ejb.html#ejbjar"><code>&lt;ejbjar&gt;</code></a></li>
+  <li><a href="Tasks/ejb.html#ejbc"><code>&lt;ejbc&gt;</code></a></li>
+  <li><a href="Tasks/cab.html"><code>&lt;cab&gt;</code></a></li>
+  <li><a href="Tasks/native2ascii.html"><code>&lt;native2ascii&gt;</code></a></li>
+  <li><a href="Tasks/netrexxc.html"><code>&lt;netrexxc&gt;</code></a></li>
   <li>
-    <a href="OptionalTasks/renameextensions.html"><code>&lt;renameextensions&gt;</code></a>
+    <a href="Tasks/renameextensions.html"><code>&lt;renameextensions&gt;</code></a>
   </li>
-  <li><a href="OptionalTasks/depend.html"><code>&lt;depend&gt;</code></a></li>
-  <li><a href="OptionalTasks/translate.html"><code>&lt;translate&gt;</code></a></li>
-  <li><a href="OptionalTasks/image.html"><code>&lt;image&gt;</code></a></li>
-  <li><a href="OptionalTasks/jlink.html"><code>&lt;jlink&gt;</code></a> (deprecated)</li>
-  <li><a href="OptionalTasks/jspc.html"><code>&lt;jspc&gt;</code></a></li>
-  <li><a href="OptionalTasks/wljspc.html"><code>&lt;wljspc&gt;</code></a></li>
+  <li><a href="Tasks/depend.html"><code>&lt;depend&gt;</code></a></li>
+  <li><a href="Tasks/translate.html"><code>&lt;translate&gt;</code></a></li>
+  <li><a href="Tasks/image.html"><code>&lt;image&gt;</code></a></li>
+  <li><a href="Tasks/jlink.html"><code>&lt;jlink&gt;</code></a> (deprecated)</li>
+  <li><a href="Tasks/jspc.html"><code>&lt;jspc&gt;</code></a></li>
+  <li><a href="Tasks/wljspc.html"><code>&lt;wljspc&gt;</code></a></li>
 </ul>
 
 <h3><a name="examples">Examples</a></h3>
@@ -288,7 +288,7 @@ attribute.</p>
 
 <p>This is the default list; note that you can modify the list of
 default excludes by using the <a
-href="CoreTasks/defaultexcludes.html">defaultexcludes</a> task.</p>
+href="Tasks/defaultexcludes.html">defaultexcludes</a> task.</p>
 
 
 

Modified: ant/core/branches/run-single-test-method/docs/manual/install.html
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/docs/manual/install.html?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/docs/manual/install.html (original)
+++ ant/core/branches/run-single-test-method/docs/manual/install.html Fri Jun 11 15:50:09 2010
@@ -26,7 +26,118 @@
 <h1>Installing Ant</h1>
 <h2><a name="getting">Getting Ant</a></h2>
 
-<h3>Download Area Layout</h3>
+<h3>The Short Story</h3>
+<p>To get up and running with the binary edition of Ant quickly, follow these steps:
+<ol>
+<li>Make sure you have a Java environment installed, See <a href="#sysrequirements">System
+Requirements</a> for details.</li>
+<li>Download Ant. See <a href="#getBinary">Binary Edition</a> for details.</li>
+<li>Uncompress the downloaded file into a directory.</li>
+<li>Set environmental variables <code>JAVA_HOME</code> to your Java environment, <code>ANT_HOME</code> to
+the directory you uncompressed Ant to, and add <code>${ANT_HOME}/bin</code> (Unix) or
+<code>%ANT_HOME%/bin</code> (Windows) to your <code>PATH</code>. See <a href="#setup">Setup</a> for details.</li>
+<li>Optionally, from the <code>ANT_HOME</code> directory run <code>ant -f fetch.xml -Ddest=system</code> to get
+the library dependencies of most of the Ant tasks that require them. If you don't do this, many of the dependent
+Ant tasks will not be available. See <a href="#optionalTasks">Optional Tasks</a> for details and other options
+for the -Ddest parameter.</li>
+<li>Optionally, add any desired Antlibs. See <a href="http://ant.apache.org/antlibs/proper.html" target="_top">Ant Libraries</a> for a list.
+</ol>
+</p>
+<p>
+Note that the links in the list above will give more details about each of the steps,
+should you need them. Or you can just continue reading the rest of this document.
+</p>
+The short story for working with the Ant source code (not needed if you are working with the binary edition) is:
+<ol>
+<li>Get the source code. See <a href="#sourceEdition">Source Edition</a> for details.</li>
+<li> Build Ant. See <a href="#buildingant">Building Ant</a> for details.</li>
+</ol>
+<p>
+</p>
+<p>
+For the full story, continue reading.
+</p>
+
+<h3><a name="getBinary">Binary Edition</a></h3>
+
+<p>The latest stable version of Ant is available from the Ant web page <a
+href="http://ant.apache.org/" target="_top">http://ant.apache.org/</a>
+</p>
+
+<p>The binary edition of Ant is shipped with 3 different compression formats:
+<ol>
+<li><b>.zip</b> - Recommended compression format for Windows, can also be used on other platforms. Supported
+by many programs and some operating systems natively.</li>
+<li><b>.tar.gz</b> - Uses the tar program to gather files together, and gzip to compress and uncompress.</li>
+<li><b>.tar.bz2</b> - Uses the tar program to gather files together, and bzip2 to compress and uncompress..</li>
+</ol>
+Choose the format that is best supported for your platform.
+</p>
+
+<h3>As a binary in an RPM Package</h3>
+
+<p>Consult the <a href="#jpackage">jpackage</a> section below.</p>
+
+<h3>Bundled in IDEs</h3>
+<p>
+    All the main Java IDEs ship with Ant, products such as Eclipse, NetBeans
+    and IntelliJ IDEA. If you install Ant this way you usually get the most recent
+    release of Ant at the time the IDE was released. Some of the IDEs (Eclipse
+    and NetBeans in particular) ship with extra tasks that only work if
+    IDE-specific tools are on Ant's path. To use these on command-line versions
+    of Ant, the relevant JARs need to be added to the command-line Ant as
+    extra libraries/tasks. Note that if it is an IDE task or extension that is
+    not behaving, the Ant team is unable to field bug reports. Try the IDE mailing
+    lists first, who will cross-file bugs if appropriate.
+</p>
+<p>
+    IDE's can invariably be pointed at different Ant installations. This lets
+    developers upgrade to a new release of Ant, and eliminate inconsistencies
+    between command-line and IDE Ant.
+</p>
+
+<h3>Bundled in Java applications</h3>
+
+<p>
+    Many Java applications, most particularly application servers, ship with
+    a version of Ant. These are primarily for internal use by the application,
+    using the Java APIs to delegate tasks such as JSP page compilation to the Ant
+    runtime. Such distributions are usually unsupported by everyone. Particularly
+    troublesome are those products that not only ship with their own Ant release,
+    they add their own version of ANT.BAT or ant.sh to the PATH. If Ant starts
+    behaving wierdly after installing something, try the
+    <a href="#diagnostics">diagnostics</a> advice.
+</p>
+
+<h3><a name="sourceEdition">Source Edition</a></h3>
+
+<p>If you prefer the source edition, you can download the source for the latest
+Ant release from
+<a href="http://ant.apache.org/srcdownload.cgi" target="_top">http://ant.apache.org/srcdownload.cgi</a>.
+
+If you prefer the leading-edge code, you can access
+the code as it is being developed via SVN. The Ant website has details on
+<a href="http://ant.apache.org/svn.html" target="_top">accessing SVN</a>.
+All bug fixes will go in against the HEAD of the source tree, and the first
+response to many bugreps will be "have you tried the latest version".
+Don't be afraid to download and build a prererelease edition, as everything
+other than new features are usually stable.
+    </p>
+<p>
+
+
+See the section <a href="#buildingant">Building Ant</a> on how to
+build Ant from the source code.
+You can also access the
+<a href="http://svn.apache.org/viewcvs.cgi/ant/" target="_top">
+Ant SVN repository</a> on-line. </p>
+
+<h3 name="archives">Archive Download Area Layout</h3>
+<p>
+Older versions of Ant are available in the archives at <a
+href="http://archive.apache.org/dist/ant/" target="_top">http://archive.apache.org/dist/ant/</a>. The
+files are organized as follows.
+</p>
 <table>
 <tr>
   <th>Filename or Path</th>
@@ -46,8 +157,10 @@
 <tr>
   <td>ant-current-bin.zip</td>
   <td>
-    ZIP-Archive containing the compiled version of Ant in the last released version. This is the file
-    most users will want to download.
+    ZIP-Archive containing the compiled version of Ant in the last released version. It is recommended that
+    you do not download the latest version this way, as the standard way of downloading described above will
+    redirect you to a mirror closer to you, thus making the download faster for you and reducing the load
+    on Apache servers.
   </td>
 </tr>
 <tr>
@@ -55,7 +168,8 @@
   <td>
     ZIP-Archive containing the sources of Ant. If you have this you could compile Ant itself.
     If you do not have the <i>required</i> dependencies, the classes depeding on them are just not
-    build.
+    built. Again, it is preferred to use the standard way of getting the source package described above
+    to make your download quicker and to reduce the load on Apache servers.
   </td>
 </tr>
 <tr>
@@ -91,7 +205,7 @@
   <td>binaries/</td>
   <td>
     The binaries directory holds specific Ant releases bundled in both ZIP and tar.gz compression
-    formats. The named releases are in contrast to the ant-current-bin.zip file in the parent 
+    formats. The named releases are in contrast to the ant-current-bin.zip file in the parent
     directory, which is always guaranteed to be the most current release of Ant.
   </td>
 </tr>
@@ -105,76 +219,14 @@
 <tr>
   <td>source/</td>
   <td>
-    The source directory holds the source code for specific Ant releases bundled in both ZIP and 
+    The source directory holds the source code for specific Ant releases bundled in both ZIP and
     tar.gz compression formats. The named releases are in contrast to the ant-current-src.zip file
-    in the parent directory, which is always guaranteed to hold the source code for the most current 
+    in the parent directory, which is always guaranteed to hold the source code for the most current
     release of Ant.
   </td>
 </tr>
 </table>
 
-<h3>Binary Edition</h3>
-<p>The latest stable version of Ant is available from the Ant web page <a
-href="http://ant.apache.org/" target="_top">http://ant.apache.org/</a>.
-
-<h3>As a binary in an RPM Package</h3>
-
-<p>Consult the <a href="#jpackage">jpackage</a> section below.</p>
-
-<h3>Bundled in IDEs</h3>
-<p>
-    All the main Java IDEs ship with Ant, products such as Eclipse, NetBeans
-    and IntelliJ IDEA. If you install Ant this way you usually get the most recent
-    release of Ant at the time the IDE was released. Some of the IDEs (Eclipse
-    and NetBeans in particular) ship with extra tasks that only work if
-    IDE-specific tools are on Ant's path. To use these on command-line versions
-    of Ant, the relevant JARs need to be added to the command-line Ant as
-    extra libraries/tasks. Note that if it is an IDE task or extension that is
-    not behaving, the Ant team is unable to field bug reports. Try the IDE mailing
-    lists first, who will cross-file bugs if appropriate.
-</p>
-<p>
-    IDE's can invariably be pointed at different Ant installations. This lets
-    developers upgrade to a new release of Ant, and eliminate inconsistencies
-    between command-line and IDE Ant.
-</p>
-
-<h3>Bundled in Java applications</h3>
-
-<p>
-    Many Java applications, most particularly application servers, ship with
-    a version of Ant. These are primarily for internal use by the application,
-    using the Java APIs to delegate tasks such as JSP page compilation to the Ant
-    runtime. Such distributions are usually unsupported by everyone. Particularly
-    troublesome are those products that non only ship with their own Ant release,
-    they add their own version of ANT.BAT or ant.sh to the PATH. If Ant starts
-    behaving wierdly after installing something, try the
-    <a href="#diagnostics">diagnostics</a> advice.
-</p>
-
-<h3>Source Edition</h3>
-
-<p>If you prefer the source edition, you can download the source for the latest
-Ant release from
-<a href="http://ant.apache.org/srcdownload.cgi" target="_top">http://ant.apache.org/srcdownload.cgi</a>.
-
-If you prefer the leading-edge code, you can access
-the code as it is being developed via SVN. The Ant website has details on
-<a href="http://ant.apache.org/svn.html" target="_top">accessing SVN</a>.
-All bug fixes will go in against the HEAD of the source tree, and the first
-response to many bugreps will be "have you tried the latest version".
-Don't be afraid to download and build a prererelease edition, as everything
-other than new features are usually stable.
-    </p>
-<p>
-
-
-See the section <a href="#buildingant">Building Ant</a> on how to
-build Ant from the source code.
-You can also access the
-<a href="http://svn.apache.org/viewcvs.cgi/ant/" target="_top">
-Ant SVN repository</a> on-line. </p>
-
 <hr>
 <h2><a name="sysrequirements">System Requirements</a></h2>
 Ant has been used successfully on many platforms, including Linux,
@@ -243,7 +295,8 @@ files there. This directory will be know
 <tr>
   <td width="5%">&nbsp;</td>
   <td><i>
-On these systems, the script used to launch Ant will have
+Note that current releases of Ant no longer support these systems. If you are using an older
+version of Ant,  however, the script used to launch Ant will have
 problems if ANT_HOME is a long filename (i.e. a filename which is not
 of the format known as &quot;8.3&quot;). This is due to
 limitations in the OS's handling of the <code>&quot;for&quot;</code>
@@ -264,7 +317,7 @@ installed in a <b>short</b>, 8.3 path, s
 </tr>
 </table>
 
-<h3>Setup</h3>
+<h3><a name="setup">Setup</a></h3>
 <p>
 Before you can run Ant there is some additional set up you
 will need to do unless you are installing the <a href="#jpackage">RPM
@@ -279,6 +332,10 @@ Windows NT/2000), but it is better to no
 (see the <a href="#advanced">Advanced</a> section below).
 This should be set to the directory where your JDK is installed.</li>
 </ul>
+<p>Operating System-specific instructions for doing this from the command
+line are in the <a href="#windows">Windows</a>, <a href="#bash">Linux/Unix (bash)</a>,
+and <a href="#tcshcsh">Linux/Unix (csh)</a> sections. Note that using this method,
+the settings will only be valid for the command line session you run them in.</p>
 <p><strong>Note:</strong> Do not install Ant's ant.jar file into the lib/ext
 directory of the JDK/JRE. Ant is an application, whilst the extension
 directory is intended for JDK extensions. In particular there are security
@@ -294,9 +351,9 @@ restrictions on the classes which may be
   <td width="5%">&nbsp;</td>
   <td>
     The ant.bat script makes use of three environment variables -
-    ANT_HOME, CLASSPATH and JAVA_HOME. <b>Ensure</b> that ANT_HOME and JAVA_HOME variables are set, 
+    ANT_HOME, CLASSPATH and JAVA_HOME. <b>Ensure</b> that ANT_HOME and JAVA_HOME variables are set,
     and that they do <b><u>not</u></b> have quotes (either
-    ' or &quot;) and they do <b><u>not</u></b> end with \ or with /. CLASSPATH should be unset or 
+    ' or &quot;) and they do <b><u>not</u></b> end with \ or with /. CLASSPATH should be unset or
     empty.
   </td>
 </tr>
@@ -309,11 +366,11 @@ should get a message like this
 Buildfile: build.xml does not exist!
 Build failed
 </pre>
-So Ant works. This message is there because you need to write an individual buildfile for your 
+So Ant works. This message is there because you need to write an individual buildfile for your
 project. With a <tt>ant -version</tt> you should get an output like
 <pre>
 Apache Ant version 1.7.1 compiled on June 27 2008
-</pre> 
+</pre>
 </p>
 <p>If this does not work ensure your environment variables are set right. They must resolve to:
 <ul>
@@ -322,7 +379,7 @@ Apache Ant version 1.7.1 compiled on Jun
   <li>required: %PATH%=...<i>maybe-other-entries</i>...;%ANT_HOME%\bin;...<i>maybe-other-entries</i>...</li>
 </ul>
 <b>ANT_HOME</b> is used by the launcher script for finding the libraries.
-<b>JAVA_HOME</b> is used by the launcher for finding the JDK/JRE to use. (JDK is recommended as some tasks 
+<b>JAVA_HOME</b> is used by the launcher for finding the JDK/JRE to use. (JDK is recommended as some tasks
 require the java tools.) If not set, the launcher tries to find one via the %PATH% environment variable.
 <b>PATH</b> is set for user convinience. With that set you can just start <i>ant</i> instead of always typing
 <i>the/complete/path/to/your/ant/installation/bin/ant</i>.
@@ -378,6 +435,50 @@ libraries must be added to Ant's classpa
 </ul>
 
 <p>
+    If you are using the binary version of Ant, or if you are working from source
+    code, you can easily gather most of the dependencies and install them for use
+    with your Ant tasks. In your <code>ANT_HOME</code> directory you should see a
+    file called <code>fetch.xml</code>. This is an Ant script that you can run to
+    install almost all the dependencies the optional Ant tasks need.
+</p>
+
+<p>
+    To do so, change to the <code>ANT_HOME</code> directory and execute the command:
+</p>
+
+<blockquote>
+  <pre>ant -f fetch.xml -Ddest=<i>[option]</i></pre>
+</blockquote
+
+<p>
+    where option is one of the following, as described above:
+    <ul>
+        <li><code>system</code> - store in Ant's lib directory <i>(Recommended)</i></li>
+        <li><code>user</code> - store in the user's home directory</li>
+        <li><code>optional</code> - store in Ant's source code lib/optional directory, used if building Ant source code</li>
+    </ul>
+</p>
+
+<p>
+  You may also need to set proxy settings. See the <a href="#proxy">Proxy Settings</a> section for details.
+</p>
+
+<p>
+Note that not all dependencies are gathered using <code>fetch.xml</code>. Tasks that depend on
+commercial software, in particular, will require you to have the commercial software installed
+in order to be used.
+</p>
+
+<p>The Apache Ant Project also provides additional tasks and types that are available as separately
+downloaded Ant Libraries. You can see the the list of available Antlibs at
+the <a href="http://ant.apache.org/antlibs/proper.html" target="_top">Ant Libraries</a> page.
+</p>
+
+<p>You can also find tasks and types provided by third-party projects at the
+<a href="http://ant.apache.org/external.html" target="_top">External Tools and Tasks</a> page.
+</p>
+
+<p>
     IDEs have different ways of adding external JAR files and third-party tasks
     to Ant. Usually it is done by some configuration dialog. Sometimes JAR files
     added to a project are automatically added to ant's classpath.
@@ -453,29 +554,55 @@ this. </p>
 
 <li><b>With Java1.5</b><br>
 
+<p>
 When you run Ant on Java1.5, you could try to use the automatic proxy setup
-mechanism with <code>-autoproxy</code>. 
+mechanism with <code>-autoproxy</code>.
+</p>
 
 </li>
 
 <li><b>With explicit JVM properties.</b><br>
-
+<p>
 These are documented <a
 href="http://java.sun.com/j2se/1.5.0/docs/guide/net/properties.html" target="_top">by Sun</a>,
 and control the proxy behaviour of the entire JVM. To set them in Ant, declare
 them in the <code>ANT_OPTS</code> environment variable. This is the best option
 for a non-mobile system. For a laptop, you have to change these settings as you
-roam.
-
+roam. To set ANT_OPTS:
+</p>
+<blockquote>
+<p>
+  For csh/tcsh:
+</p>
+<pre>
+    setenv ANT_OPTS "-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080"
+</pre>
+<p>
+  For bash:
+</p>
+<pre>
+    export ANT_OPTS="-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080"
+</pre>
+<p>
+  For Windows, set the environment variable in the appropriate dialog box
+  and open a new console. or, by hand
+</p>
+<pre>
+    set ANT_OPTS = -Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080
+</pre>
+</p>
+</blockquote>
 </li>
 
 <li><b>In the build file itself</b><br>
 
-If you are writing an build file that is always to be used behind the firewall,
+<p>
+If you are writing a build file that is always to be used behind the firewall,
 the &lt;setproxy&gt; task lets you configure the proxy (which it does by setting
 the JVM properties). If you do this, we strongly recommend using ant properties
 to define the proxy host, port, etc, so that individuals can override the
 defaults.</li>
+</p>
 
 </ul>
 
@@ -505,14 +632,14 @@ environment:</p>
 set JAVA_HOME=c:\jdk-1.5.0.05
 set PATH=%PATH%;%ANT_HOME%\bin</pre>
 
-<h3>Linux/Unix (bash)</h3>
+<h3><a name="bash">Linux/Unix (bash)</a></h3>
 <p>Assume Ant is installed in <code>/usr/local/ant</code>. The following sets up
 the environment:</p>
 <pre>export ANT_HOME=/usr/local/ant
 export JAVA_HOME=/usr/local/jdk-1.5.0.05
 export PATH=${PATH}:${ANT_HOME}/bin</pre>
 
-<h3>Linux/Unix (csh)</h3>
+<h3><a name="tcshcsh">Linux/Unix (csh)</a></h3>
 <pre>setenv ANT_HOME /usr/local/ant
 setenv JAVA_HOME /usr/local/jdk/jdk-1.5.0.05
 set path=( $path $ANT_HOME/bin )</pre>
@@ -542,20 +669,20 @@ ant and the external package (e.g. <code
 However, JPackage does not package proprietary software, and since some of the
 optional packages depend on proprietary jars, they must be handled as follows.
 This may violate the spirit of JPackage, but it is necessary if you need these proprietary packages.
-For example, suppose you want to install support for starteam, which jpackage does not
+For example, suppose you want to install support for netrexx, which jpackage does not
 support:
 <ol>
 <li>Decide where you want to deploy the extra jars.  One option is in <code>$ANT_HOME/lib</code>,
 which, for JPackage is usually <code>/usr/share/ant/lib</code>.  Another, less messy option
 is to create an <code>.ant/lib</code> subdirectory of your home directory and place your
 non-jpackage ant jars there, thereby avoiding mixing jpackage
-libraries with non-jpacakge stuff in the same folder.
+libraries with non-jpackage stuff in the same folder.
 More information on where Ant finds its libraries is available
 <a href="http://ant.apache.org/manual/running.html#libs">here</a></li>
 <li>Download a non-jpackage binary distribution from the regular
     <a href="http://ant.apache.org/bindownload.cgi" target="_top">Apache Ant site</a></li>
 <li>Unzip or untar the distribution into a temporary directory</li>
-<li>Copy the linking jar, in this case <code>ant-starteam.jar</code>, into the library directory you
+<li>Copy the linking jar, in this case <code>ant-jai.jar</code>, into the library directory you
 chose in step 1 above.</li>
 <li>Copy the proprietary jar itself into the same directory.</li>
 </ol>
@@ -572,16 +699,16 @@ least the following:</p>
 <li>The classpath for Ant must contain <code>ant.jar</code> and any jars/classes
 needed for your chosen JAXP-compliant XML parser.</li>
 <li>When you need JDK functionality
-(such as for the <a href="CoreTasks/javac.html">javac</a> task or the
-<a href="CoreTasks/rmic.html">rmic</a> task), then <code>tools.jar</code>
+(such as for the <a href="Tasks/javac.html">javac</a> task or the
+<a href="Tasks/rmic.html">rmic</a> task), then <code>tools.jar</code>
 must be added. The scripts supplied with Ant,
 in the <code>bin</code> directory, will add
 the required JDK classes automatically, if the <code>JAVA_HOME</code>
 environment variable is set.</li>
 
 <li>When you are executing platform-specific applications, such as the
-<a href="CoreTasks/exec.html">exec</a> task or the
-<a href="CoreTasks/cvs.html">cvs</a> task, the property <code>ant.home</code>
+<a href="Tasks/exec.html">exec</a> task or the
+<a href="Tasks/cvs.html">cvs</a> task, the property <code>ant.home</code>
 must be set to the directory containing where you installed Ant. Again
 this is set by the Ant scripts to the value of the ANT_HOME environment
 variable.</li>
@@ -595,7 +722,7 @@ at the source for your platform's invoca
 <hr>
 <h2><a name="buildingant">Building Ant</a></h2>
 <p>To build Ant from source, you can either install the Ant source distribution
-or checkout the ant module from SVN.</p>
+or checkout the ant module from SVN. See <a href="#sourceEdition">Source Edition</a> for details.</p>
 <p>Once you have installed the source, change into the installation
 directory.</p>
 
@@ -620,7 +747,14 @@ still need to
 make the JARs available as described under
 <a href="#installing">Installing Ant</a>.</p>
 
-<p>As of version 1.7.0 Ant has a hard dependency on JUnit and you must
+<p>You can also get most of the auxiliary jar files (ie. the jar files
+that various optional Ant tasks depend on) by running Ant on the
+<code>fetch.xml</code> build file. See <a href="#optionalTasks">Optional
+Tasks</a> for instructions on how to do this.
+</p>
+
+<p>As of version 1.7.0 Ant has a hard dependency on JUnit. The <code>fetch.xml</code> build
+  script will download JUnit automatically, but if you don't use this you must
   install it manually into <code>lib/optional</code> (download it from
   <a href="http://junit.org/" target="_top">JUnit.org</a>) if you are
   using a source distribution of Ant.</p>
@@ -894,12 +1028,6 @@ Already included Java 1.4+</td>
     <td><a href="https://jai.dev.java.net/"
         target="_top">https://jai.dev.java.net/</a></td>
   </tr>
-  <tr>
-    <td>Starteam SDK</td>
-    <td>Starteam version management tasks</td>
-    <td><a href="http://www.borland.com/downloads/download_starteam.html"
-        target="_top">http://www.borland.com/downloads/download_starteam.html</a></td>
-  </tr>
 </table>
 <br>
 <h2><a name="Troubleshooting">Troubleshooting</a></h2>

Modified: ant/core/branches/run-single-test-method/docs/manual/installlist.html
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/docs/manual/installlist.html?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/docs/manual/installlist.html (original)
+++ ant/core/branches/run-single-test-method/docs/manual/installlist.html Fri Jun 11 15:50:09 2010
@@ -33,6 +33,7 @@
 <li><a href="install.html#sysrequirements">System Requirements</a></li>
 <li><a href="install.html#installing">Installing Ant</a></li>
 <li><a href="install.html#checkInstallation">Check Installation</a></li>
+<li><a href="install.html#optionalTasks">Optional Tasks</a></li>
 <li><a href="install.html#buildingant">Building Ant</a></li>
 <li><a href="install.html#librarydependencies">Library Dependencies</a></li>
 <li><a href="platform.html">Platform Specific Issues</a></li>

Modified: ant/core/branches/run-single-test-method/docs/manual/properties.html
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/docs/manual/properties.html?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/docs/manual/properties.html (original)
+++ ant/core/branches/run-single-test-method/docs/manual/properties.html Fri Jun 11 15:50:09 2010
@@ -29,7 +29,7 @@
     expand <code>${key}</code> to <code>value</code> at runtime.</p>
 
   <p>There are many tasks that can set properties, the most common one
-    is the <a href="CoreTasks/property.html">property</a> task.  In
+    is the <a href="Tasks/property.html">property</a> task.  In
     addition properties can be defined
     via <a href="running.html">command line arguments</a> or similar
     mechanisms from outside of Ant.</p>
@@ -40,14 +40,14 @@
     defined they are available for any task or target invoked
     subsequently - it is not possible to set a property in a child
     build process created via
-    the <a href="CoreTasks/ant.html">ant</a>, antcall or subant tasks
+    the <a href="Tasks/ant.html">ant</a>, antcall or subant tasks
     and make it available to the calling build process, though.</p>
 
   <p>Starting with Ant 1.8.0
-    the <a href="CoreTasks/local.html">local</a> task can be used to
+    the <a href="Tasks/local.html">local</a> task can be used to
     create properties that are locally scoped to a target or
-    a <a href="CoreTasks/sequential.html">sequential</a> element like
-    the one of the <a href="CoreTasks/macrodef.html">macrodef</a>
+    a <a href="Tasks/sequential.html">sequential</a> element like
+    the one of the <a href="Tasks/macrodef.html">macrodef</a>
     task.</p>
 
   <h2><a name="built-in-props">Built-in Properties</a></h2>
@@ -109,7 +109,7 @@ ant.library.dir     the directory that h
     marker interface) to take care of discrete tasks such as property
     setting, retrieval, parsing, etc. This makes Ant's property
     handling highly extensible; also of interest is the
-    new <a href="CoreTasks/propertyhelper.html">propertyhelper</a>
+    new <a href="Tasks/propertyhelper.html">propertyhelper</a>
     task used to manipulate the PropertyHelper and its delegates from
     the context of the Ant buildfile.
 
@@ -139,7 +139,7 @@ ant.library.dir     the directory that h
         would
         be <code>org.apache.tools.ant.property.LocalProperties</code>
         which implements storage
-        for <a href="CoreTasks/local.html">local properties</a>.</p>
+        for <a href="Tasks/local.html">local properties</a>.</p>
 
       <p>Another reason to implement this interface is if you wanted
         to provide your own "property protocol" like
@@ -157,7 +157,7 @@ ant.library.dir     the directory that h
         would
         be <code>org.apache.tools.ant.property.LocalProperties</code>
         which implements storage
-        for <a href="CoreTasks/local.html">local properties</a>.</p>
+        for <a href="Tasks/local.html">local properties</a>.</p>
     </li>
 
   </ul>

Modified: ant/core/branches/run-single-test-method/docs/manual/proxy.html
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/docs/manual/proxy.html?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/docs/manual/proxy.html (original)
+++ ant/core/branches/run-single-test-method/docs/manual/proxy.html Fri Jun 11 15:50:09 2010
@@ -174,7 +174,7 @@ command line.
 
 <h3>SetProxy Task</h3>
 <p>
-    The <a href="OptionalTasks/setproxy.html">setproxy task</a> can be used to
+    The <a href="Tasks/setproxy.html">setproxy task</a> can be used to
     explicitly set a proxy in a build file. This manipulates the many proxy 
     configuration properties of a JVM, and controls the proxy settings for all 
     network operations in the same JVM from that moment. 
@@ -243,7 +243,7 @@ command line.
 </p>    
     If you wish to have
     a forked process pick up the Ant's settings, use the 
-    <a href="CoreTypes/propertyset.html"><code>&lt;syspropertyset&gt;</code></a>
+    <a href="Types/propertyset.html"><code>&lt;syspropertyset&gt;</code></a>
     element to propagate the normal proxy settings. The following propertyset
     is a datatype which can be referenced in a <code>&lt;java&gt;</code> task to
     pass down the current values.

Modified: ant/core/branches/run-single-test-method/docs/manual/running.html
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/docs/manual/running.html?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/docs/manual/running.html (original)
+++ ant/core/branches/run-single-test-method/docs/manual/running.html Fri Jun 11 15:50:09 2010
@@ -56,7 +56,7 @@ the <nobr><code>-D<i>property</i>=<i>val
 where <i>property</i> is the name of the property,
 and <i>value</i> is the value for that property. If you specify a
 property that is also set in the build file
-(see the <a href="CoreTasks/property.html">property</a> task),
+(see the <a href="Tasks/property.html">property</a> task),
 the value specified on the
 command line will override the value specified in the
 build file.
@@ -67,7 +67,7 @@ the value of environment variables; just
 to Ant. You can then access
 these variables inside your build file as <code>${MYVAR}</code>.
 You can also access environment variables using the
-<a href="CoreTasks/property.html"> property</a> task's
+<a href="Tasks/property.html"> property</a> task's
 <code>environment</code> attribute.
 </p>
 
@@ -296,7 +296,7 @@ org.apache.tools.ant.Executor implementa
   <td><code>ant.file</code></td>
   <td>read only: full filename of the build file</td>
   <td>This is set to the name of the build file. In
-  <a href="CoreTasks/import.html">
+  <a href="Tasks/import.html">
   &lt;import&gt;-ed</a> files, this is set to the containing build file.
   </td>
 </tr>
@@ -306,7 +306,7 @@ org.apache.tools.ant.Executor implementa
   <td>read only: full filename of the build file of Ant projects
   </td>
   <td>This is set to the name of a file by project;
-  this lets you determine the location of <a href="CoreTasks/import.html">
+  this lets you determine the location of <a href="Tasks/import.html">
   &lt;import&gt;-ed</a> files,
   </td>
 </tr>
@@ -329,7 +329,7 @@ org.apache.tools.ant.Executor implementa
 <tr>
   <td><code>ant.netrexxc.*</code></td>
   <td>several formats</td>
-  <td>Use specified values as defaults for <a href="OptionalTasks/netrexxc.html">netrexxc</a>.
+  <td>Use specified values as defaults for <a href="Tasks/netrexxc.html">netrexxc</a>.
   </td>
 </tr>
 <tr>
@@ -344,7 +344,7 @@ org.apache.tools.ant.Executor implementa
   <td><code>ant.regexp.regexpimpl</code></td>
   <td>classname</td>
   <td>classname for a RegExp implementation; if not set Ant uses JDK 1.4's implementation;
-      <a href="CoreTypes/mapper.html#regexp-mapper">RegExp-Mapper</a>
+      <a href="Types/mapper.html#regexp-mapper">RegExp-Mapper</a>
       "Choice of regular expression implementation"
   </td>
 </tr>
@@ -366,49 +366,49 @@ org.apache.tools.ant.Executor implementa
   <td><code>build.compiler</code></td>
   <td>name</td>
   <td>Specify the default compiler to use.
-      see <a href="CoreTasks/javac.html">javac</a>,
-      <a href="OptionalTasks/ejb.html#ejbjar_weblogic">EJB Tasks</a>
+      see <a href="Tasks/javac.html">javac</a>,
+      <a href="Tasks/ejb.html#ejbjar_weblogic">EJB Tasks</a>
       (compiler attribute),
-      <a href="OptionalTasks/javah.html">javah</a>
+      <a href="Tasks/javah.html">javah</a>
   </td>
 </tr>
 <tr>
   <td><code>build.compiler.emacs</code></td>
   <td>boolean (default false)</td>
   <td>Enable emacs-compatible error messages.
-      see <a href="CoreTasks/javac.html">javac</a> "Jikes Notes"
+      see <a href="Tasks/javac.html">javac</a> "Jikes Notes"
   </td>
 </tr>
 <tr>
   <td><code>build.compiler.fulldepend</code></td>
   <td>boolean (default false)</td>
   <td>Enable full dependency checking
-      see <a href="CoreTasks/javac.html">javac</a> "Jikes Notes"
+      see <a href="Tasks/javac.html">javac</a> "Jikes Notes"
   </td>
 </tr>
 <tr>
   <td><code>build.compiler.jvc.extensions</code></td>
   <td>boolean (default true)</td>
   <td>enable Microsoft extensions of their java compiler
-      see <a href="CoreTasks/javac.html">javac</a> "Jvc Notes"
+      see <a href="Tasks/javac.html">javac</a> "Jvc Notes"
   </td>
 </tr>
 <tr>
   <td><code>build.compiler.pedantic</code></td>
   <td>boolean (default false)</td>
   <td>Enable pedantic warnings.
-      see <a href="CoreTasks/javac.html">javac</a> "Jikes Notes"
+      see <a href="Tasks/javac.html">javac</a> "Jikes Notes"
   </td>
 </tr>
 <tr>
   <td><code>build.compiler.warnings</code></td>
   <td>Deprecated flag</td>
-  <td> see <a href="CoreTasks/javac.html">javac</a> "Jikes Notes" </td>
+  <td> see <a href="Tasks/javac.html">javac</a> "Jikes Notes" </td>
 </tr>
 <tr>
   <td><code>build.rmic</code></td>
   <td>name</td>
-  <td>control the <a href="CoreTasks/rmic.html">rmic</a> compiler </td>
+  <td>control the <a href="Tasks/rmic.html">rmic</a> compiler </td>
 </tr>
 <tr>
   <td><code>build.sysclasspath</code></td>
@@ -420,7 +420,7 @@ org.apache.tools.ant.Executor implementa
   <td><code>file.encoding</code></td>
   <td>name of a supported character set (e.g. UTF-8, ISO-8859-1, US-ASCII)</td>
   <td>use as default character set of email messages; use as default for source-, dest- and bundleencoding
-      in <a href="OptionalTasks/translate.html">translate</a> <br>
+      in <a href="Tasks/translate.html">translate</a> <br>
       see JavaDoc of <a target="_blank" href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">java.nio.charset.Charset</a>
       for more information about character sets (not used in Ant, but has nice docs).
   </td>
@@ -450,14 +450,14 @@ org.apache.tools.ant.Executor implementa
   <td><code>p4.port, p4.client, p4.user</code></td>
   <td>several formats</td>
   <td>Specify defaults for port-, client- and user-setting of the
-      <a href="OptionalTasks/perforce.html">perforce</a> tasks.
+      <a href="Tasks/perforce.html">perforce</a> tasks.
   </td>
 </tr>
 <tr>
   <td><code>websphere.home</code></td>
   <td>path</td>
   <td>Points to home directory of websphere.
-      see <a href="OptionalTasks/ejb.html#ejbjar_websphere">EJB Tasks</a>
+      see <a href="Tasks/ejb.html#ejbjar_websphere">EJB Tasks</a>
   </td>
 </tr>
 <tr>

Modified: ant/core/branches/run-single-test-method/docs/manual/targets.html
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/docs/manual/targets.html?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/docs/manual/targets.html (original)
+++ ant/core/branches/run-single-test-method/docs/manual/targets.html Fri Jun 11 15:50:09 2010
@@ -131,7 +131,7 @@
     option is used.</p>
 
   <p>It is a good practice to place
-    your <a href="CoreTasks/tstamp.html">tstamp</a> tasks in a
+    your <a href="Tasks/tstamp.html">tstamp</a> tasks in a
     so-called <i>initialization</i> target, on which all other targets
     depend. Make sure that target is always the first one in the
     depends list of the other targets. In this manual, most
@@ -245,7 +245,7 @@
 
   <p>The main purpose of an extension-point is to act as an extension
     point for build files designed to
-    be <a href="CoreTasks/import.html">imported</a>.  In the imported
+    be <a href="Tasks/import.html">imported</a>.  In the imported
     file an extension-point defines a state that must be reached and
     targets from other build files can join the depends list of said
     extension-point in order to contribute to that state.</p>

Modified: ant/core/branches/run-single-test-method/docs/manual/tasksoverview.html
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/docs/manual/tasksoverview.html?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/docs/manual/tasksoverview.html (original)
+++ ant/core/branches/run-single-test-method/docs/manual/tasksoverview.html Fri Jun 11 15:50:09 2010
@@ -67,109 +67,109 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/unpack.html">BUnzip2</a></td>
+    <td nowrap><a href="Tasks/unpack.html">BUnzip2</a></td>
     <td><p>Expands a file packed using GZip or BZip2.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/pack.html">BZip2</a></td>
+    <td nowrap><a href="Tasks/pack.html">BZip2</a></td>
     <td><p>Packs a file using the GZip or BZip2 algorithm. This task
      does not do any dependency checking; the output file is always
      generated</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/cab.html">Cab</a></td>
+    <td nowrap><a href="Tasks/cab.html">Cab</a></td>
     <td><p>Creates Microsoft CAB archive files. It is invoked
-     similar to the <a href="CoreTasks/jar.html">Jar</a> or
-     <a href="CoreTasks/zip.html">Zip</a> tasks. This task will work on
+     similar to the <a href="Tasks/jar.html">Jar</a> or
+     <a href="Tasks/zip.html">Zip</a> tasks. This task will work on
      Windows using the external <i>cabarc</i> tool (provided by Microsoft),
      which must be located in your executable path.</p></td>
    </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/ear.html">Ear</a></td>
-    <td><p>An extension of the <a href="CoreTasks/jar.html">Jar</a> task with
+    <td nowrap><a href="Tasks/ear.html">Ear</a></td>
+    <td><p>An extension of the <a href="Tasks/jar.html">Jar</a> task with
      special treatment for files that should end up in an
      Enterprise Application archive.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/gunzip.html">GUnzip</a></td>
+    <td nowrap><a href="Tasks/gunzip.html">GUnzip</a></td>
     <td><p>Expands a GZip file.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/gzip.html">GZip</a></td>
+    <td nowrap><a href="Tasks/gzip.html">GZip</a></td>
     <td><p>GZips a set of files.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/jar.html">Jar</a></td>
+    <td nowrap><a href="Tasks/jar.html">Jar</a></td>
     <td><p>Jars a set of files.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/jlink.html">Jlink</a></td>
+    <td nowrap><a href="Tasks/jlink.html">Jlink</a></td>
     <td><p><i>Deprecated.</i> Use the <code>zipfileset</code>
      and <code>zipgroupfileset</code> attributes of the
-     <a href="CoreTasks/jar.html">Jar</a> or
-     <a href="CoreTasks/zip.html">Zip</a> tasks instead.</p></td>
+     <a href="Tasks/jar.html">Jar</a> or
+     <a href="Tasks/zip.html">Zip</a> tasks instead.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/manifest.html">Manifest</a></td>
+    <td nowrap><a href="Tasks/manifest.html">Manifest</a></td>
     <td><p>Creates a manifest file.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/rpm.html">Rpm</a></td>
+    <td nowrap><a href="Tasks/rpm.html">Rpm</a></td>
     <td><p>Invokes the <i>rpm</i> executable to build a Linux installation
      file. This task currently only works on Linux or other Unix platforms
      with RPM support.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/signjar.html">SignJar</a></td>
+    <td nowrap><a href="Tasks/signjar.html">SignJar</a></td>
     <td><p>Signs a jar or zip file with the <i>javasign</i>
      command-line tool.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/tar.html">Tar</a></td>
+    <td nowrap><a href="Tasks/tar.html">Tar</a></td>
     <td><p>Creates a tar archive.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/unzip.html">Unjar</a></td>
+    <td nowrap><a href="Tasks/unzip.html">Unjar</a></td>
     <td><p>Unzips a jarfile.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/untar.html">Untar</a></td>
+    <td nowrap><a href="Tasks/untar.html">Untar</a></td>
     <td><p>Untars a tarfile.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/unzip.html">Unwar</a></td>
+    <td nowrap><a href="Tasks/unzip.html">Unwar</a></td>
     <td><p>Unzips a warfile.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/unzip.html">Unzip</a></td>
+    <td nowrap><a href="Tasks/unzip.html">Unzip</a></td>
     <td><p>Unzips a zipfile.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/war.html">War</a></td>
-    <td><p>An extension of the <a href="CoreTasks/jar.html">Jar</a> task
+    <td nowrap><a href="Tasks/war.html">War</a></td>
+    <td><p>An extension of the <a href="Tasks/jar.html">Jar</a> task
      with special treatment for files that should end up in the
      <code>WEB-INF/lib</code>, <code>WEB-INF/classes</code>, or
      <code>WEB-INF</code> directories of the Web Application Archive.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/zip.html">Zip</a></td>
+    <td nowrap><a href="Tasks/zip.html">Zip</a></td>
     <td><p>Creates a zipfile.</p></td>
   </tr>
 </table>
@@ -191,7 +191,7 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/jdepend.html">JDepend</a></td>
+    <td nowrap><a href="Tasks/jdepend.html">JDepend</a></td>
     <td><p>Invokes the <a href="http://www.clarkware.com/software/JDepend.html">
      JDepend</a> parser. This parser &quot;traverses a set of Java source-file
      directories and generates design-quality metrics for each Java
@@ -217,54 +217,54 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/depend.html">Depend</a></td>
+    <td nowrap><a href="Tasks/depend.html">Depend</a></td>
     <td><p>Determines which classfiles are out-of-date with respect to their
      source, removing the classfiles of any other classes that depend on the
      out-of-date classes, forcing the re-compile of the removed classfiles.
      Typically used in conjunction with the
-     <a href="CoreTasks/javac.html">Javac</a> task.</p></td>
+     <a href="Tasks/javac.html">Javac</a> task.</p></td>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/javac.html">Javac</a></td>
+    <td nowrap><a href="Tasks/javac.html">Javac</a></td>
     <td><p>Compiles the specified source file(s) within the running
      (Ant) VM, or in another VM if the <code>fork</code> attribute is
      specified.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/apt.html">Apt</a></td>
+    <td nowrap><a href="Tasks/apt.html">Apt</a></td>
     <td><p>Runs the annotation processor tool (apt), and then optionally compiles
    the original code, and any generated source code.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/jspc.html">JspC</a></td>
+    <td nowrap><a href="Tasks/jspc.html">JspC</a></td>
     <td><p>Runs the JSP compiler. It can be used to precompile JSP pages
      for fast initial invocation of JSP pages, deployment on a server without
      the full JDK installed, or simply to syntax-check the pages without
-     deploying them. The <a href="CoreTasks/javac.html">Javac</a> task
+     deploying them. The <a href="Tasks/javac.html">Javac</a> task
      can be used to compile the generated Java source.
      (For Weblogic JSP compiles,
-     see the <a href="OptionalTasks/wljspc.html">Wljspc</a> task.)</p></td>
+     see the <a href="Tasks/wljspc.html">Wljspc</a> task.)</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/netrexxc.html">NetRexxC</a></td>
+    <td nowrap><a href="Tasks/netrexxc.html">NetRexxC</a></td>
     <td><p>Compiles a
      <a href="http://www2.hursley.ibm.com/netrexx" target="_top">NetRexx</a>
      source tree within the running (Ant) VM.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/rmic.html">Rmic</a></td>
+    <td nowrap><a href="Tasks/rmic.html">Rmic</a></td>
     <td><p>Runs the <i>rmic</i> compiler on the specified file(s).</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/wljspc.html">Wljspc</a></td>
+    <td nowrap><a href="Tasks/wljspc.html">Wljspc</a></td>
     <td><p>Compiles JSP pages using Weblogic's JSP compiler,
      <i>weblogic.jspc</i>. (For non-Weblogic JSP compiles, see the
-     <a href="OptionalTasks/jspc.html">JspC</a> task.</p></td>
+     <a href="Tasks/jspc.html">JspC</a> task.</p></td>
   </tr>
 
 </table>
@@ -286,7 +286,7 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/serverdeploy.html">ServerDeploy</a></td>
+    <td nowrap><a href="Tasks/serverdeploy.html">ServerDeploy</a></td>
     <td><p>Task to run a &quot;hot&quot; deployment tool for vendor-specific
      J2EE server.
     </p></td>
@@ -310,7 +310,7 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/javadoc.html">Javadoc/<i>Javadoc2</i></a></td>
+    <td nowrap><a href="Tasks/javadoc.html">Javadoc/<i>Javadoc2</i></a></td>
     <td><p>Generates code documentation using the <i>javadoc</i> tool.
      The Javadoc2 task is deprecated; use the Javadoc task instead.</p></td>
   </tr>
@@ -334,7 +334,7 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/ejb.html">EJB Tasks</a></td>
+    <td nowrap><a href="Tasks/ejb.html">EJB Tasks</a></td>
     <td><p>(See the documentation describing the EJB tasks.)</p></td>
   </tr>
 </table>
@@ -356,54 +356,54 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/ant.html">Ant</a></td>
+    <td nowrap><a href="Tasks/ant.html">Ant</a></td>
     <td><p>Runs Ant on a supplied buildfile, optionally
      passing properties (with possibly new values).
      This task can be used to build sub-projects.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/antcall.html">AntCall</a></td>
+    <td nowrap><a href="Tasks/antcall.html">AntCall</a></td>
     <td><p>Runs another target within the same buildfile, optionally
      passing properties (with possibly new values).</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/apply.html">Apply/<i>ExecOn</i></a></td>
+    <td nowrap><a href="Tasks/apply.html">Apply/<i>ExecOn</i></a></td>
     <td><p>Executes a system command. When the <code>os</code> attribute is
      specified, the command is only executed when Ant is run on one
      of the specified operating systems.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/dependset.html">Dependset</a></td>
+    <td nowrap><a href="Tasks/dependset.html">Dependset</a></td>
     <td><p>This task compares a set of source files with a set of target
      files.  If any of the source files is newer than any of
      the target files, all the target files are removed. </p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/exec.html">Exec</a></td>
+    <td nowrap><a href="Tasks/exec.html">Exec</a></td>
     <td><p>Executes a system command. When the <code>os</code> attribute
      is specified, the command is only executed when Ant is run on one of
      the specified operating systems.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/java.html">Java</a></td>
+    <td nowrap><a href="Tasks/java.html">Java</a></td>
     <td><p>Executes a Java class within the running (Ant) VM, or in
      another VM if the <code>fork</code> attribute is specified.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/parallel.html">Parallel</a></td>
+    <td nowrap><a href="Tasks/parallel.html">Parallel</a></td>
     <td><p>A container task that can contain other Ant tasks.
      Each nested task specified within the <code>&lt;parallel&gt;</code>
      tag will be executed in its own thread.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/sequential.html">Sequential</a></td>
+    <td nowrap><a href="Tasks/sequential.html">Sequential</a></td>
     <td><p>A container task that can contain other Ant tasks.
      The nested tasks are simply executed in sequence. Its primary use is
      to support the sequential execution of a subset of tasks within
@@ -411,22 +411,22 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/sleep.html">Sleep</a></td>
+    <td nowrap><a href="Tasks/sleep.html">Sleep</a></td>
     <td><p> A task for suspending execution for a specified period of time.
      Useful when a build or deployment process requires an interval between
      tasks.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/subant.html">Subant</a></td>
+    <td nowrap><a href="Tasks/subant.html">Subant</a></td>
     <td><p> Calls a given target for all defined sub-builds. This is an extension of ant for bulk project execution.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/waitfor.html">Waitfor</a></td>
+    <td nowrap><a href="Tasks/waitfor.html">Waitfor</a></td>
     <td><p>Blocks execution until a set of specified conditions become true.
      This task is intended to be used with the
-     <a href="CoreTasks/parallel.html">Parallel</a> task to synchronize
+     <a href="Tasks/parallel.html">Parallel</a> task to synchronize
      a set of processes.</p></td>
   </tr>
 </table>
@@ -448,27 +448,27 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/attrib.html">Attrib</a></td>
+    <td nowrap><a href="Tasks/attrib.html">Attrib</a></td>
     <td><p>Changes the permissions and/or attributes of a file or all
     files inside the specified directories. Currently, it has effect
     only under Windows.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/checksum.html">Checksum</a></td>
+    <td nowrap><a href="Tasks/checksum.html">Checksum</a></td>
     <td><p>Generates a checksum for a file or set of files. This task can
      also be used to perform checksum verifications.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/chgrp.html">Chgrp</a></td>
+    <td nowrap><a href="Tasks/chgrp.html">Chgrp</a></td>
     <td><p>Changes the group ownership of a file or all files inside
     the specified directories. Currently, it has effect only under
     Unix.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/chmod.html">Chmod</a></td>
+    <td nowrap><a href="Tasks/chmod.html">Chmod</a></td>
     <td><p>Changes the permissions of a file or all files inside the
      specified directories. Currently, it has effect only under Unix.
      The permissions are also UNIX style, like the arguments for the
@@ -476,105 +476,105 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/chown.html">Chown</a></td>
+    <td nowrap><a href="Tasks/chown.html">Chown</a></td>
     <td><p>Changes the owner of a file or all files inside the
     specified directories. Currently, it has effect only under
     Unix.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/concat.html">Concat</a></td>
+    <td nowrap><a href="Tasks/concat.html">Concat</a></td>
     <td><p>Concatenates multiple files into a single one or to Ant's
      logging system.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/copy.html">Copy</a></td>
+    <td nowrap><a href="Tasks/copy.html">Copy</a></td>
     <td><p>Copies a file or Fileset to a new file or directory.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/copydir.html"><i>Copydir</i></a></td>
+    <td nowrap><a href="Tasks/copydir.html"><i>Copydir</i></a></td>
     <td><p><i>Deprecated.</i>  Use the
-     <a href="CoreTasks/copy.html">Copy</a> task instead.</p></td>
+     <a href="Tasks/copy.html">Copy</a> task instead.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/copyfile.html"><i>Copyfile</i></a></td>
+    <td nowrap><a href="Tasks/copyfile.html"><i>Copyfile</i></a></td>
     <td><p><i>Deprecated.</i>  Use the
-     <a href="CoreTasks/copy.html">Copy</a> task instead.</p></td>
+     <a href="Tasks/copy.html">Copy</a> task instead.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/delete.html">Delete</a></td>
+    <td nowrap><a href="Tasks/delete.html">Delete</a></td>
     <td><p>Deletes either a single file, all files and sub-directories
      in a specified directory, or a set of files specified by one or more
-     <a href="CoreTypes/fileset.html">FileSet</a>s.</p></td>
+     <a href="Types/fileset.html">FileSet</a>s.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/deltree.html"><i>Deltree</i></a></td>
+    <td nowrap><a href="Tasks/deltree.html"><i>Deltree</i></a></td>
     <td><p><i>Deprecated.</i>  Use the
-     <a href="CoreTasks/delete.html">Delete</a> task instead.</p></td>
+     <a href="Tasks/delete.html">Delete</a> task instead.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/filter.html">Filter</a></td>
+    <td nowrap><a href="Tasks/filter.html">Filter</a></td>
     <td><p>Sets a token filter for this project, or reads multiple token
      filters from a specified file and sets these as filters. Token filters
      are used by all tasks that perform file-copying operations.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/fixcrlf.html">FixCRLF</a></td>
+    <td nowrap><a href="Tasks/fixcrlf.html">FixCRLF</a></td>
     <td><p>Modifies a file to add or remove tabs, carriage returns, linefeeds,
      and EOF characters.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/get.html">Get</a></td>
+    <td nowrap><a href="Tasks/get.html">Get</a></td>
     <td><p>Gets a file from a URL.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/mkdir.html">Mkdir</a></td>
+    <td nowrap><a href="Tasks/mkdir.html">Mkdir</a></td>
     <td><p>Creates a directory. Non-existent parent directories are created,
      when necessary.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/move.html">Move</a></td>
+    <td nowrap><a href="Tasks/move.html">Move</a></td>
     <td><p>Moves a file to a new file or directory, or a set(s) of file(s) to
      a new directory.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/patch.html">Patch</a></td>
+    <td nowrap><a href="Tasks/patch.html">Patch</a></td>
     <td><p>Applies a &quot;diff&quot; file to originals.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/rename.html"><i>Rename</i></a></td>
-    <td><p><i>Deprecated.</i>  Use the <a href="CoreTasks/move.html">Move</a>
+    <td nowrap><a href="Tasks/rename.html"><i>Rename</i></a></td>
+    <td><p><i>Deprecated.</i>  Use the <a href="Tasks/move.html">Move</a>
     task instead.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/renameextensions.html">
+    <td nowrap><a href="Tasks/renameextensions.html">
      <i>RenameExtensions</i></a></td>
-    <td><p><i>Deprecated</i>. Use the <a href="CoreTasks/move.html">Move</a>
-     task with a <a href="CoreTypes/mapper.html#glob-mapper">glob mapper</a>
+    <td><p><i>Deprecated</i>. Use the <a href="Tasks/move.html">Move</a>
+     task with a <a href="Types/mapper.html#glob-mapper">glob mapper</a>
      instead.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/replace.html">Replace</a></td>
+    <td nowrap><a href="Tasks/replace.html">Replace</a></td>
     <td><p>Replace is a directory-based task for replacing the occurrence
      of a given string with another string in selected file.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/replaceregexp.html">
+    <td nowrap><a href="Tasks/replaceregexp.html">
      ReplaceRegExp</a></td>
     <td><p>Directory-based task for replacing the occurrence of a given
      regular expression with a substitution pattern in a file or set of
@@ -582,18 +582,18 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/sync.html">Sync</a></td>
+    <td nowrap><a href="Tasks/sync.html">Sync</a></td>
     <td><p>Synchronize two directory trees.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/tempfile.html">Tempfile</a></td>
+    <td nowrap><a href="Tasks/tempfile.html">Tempfile</a></td>
     <td><p>Generates a name for a new temporary file and sets the specified
      property to that name.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/touch.html">Touch</a></td>
+    <td nowrap><a href="Tasks/touch.html">Touch</a></td>
     <td><p>Changes the modification time of a file and possibly creates it at
      the same time.</p></td>
   </tr>
@@ -617,7 +617,7 @@ documentation.</p>
 
   <tr valign="top">
     <td nowrap>
-    <a href="OptionalTasks/jarlib-available.html">Jarlib-available</a></td>
+    <a href="Tasks/jarlib-available.html">Jarlib-available</a></td>
     <td><p>Check whether an extension is present in a FileSet or an
       ExtensionSet. If the extension is present, the specified property is
      set.</p>
@@ -626,7 +626,7 @@ documentation.</p>
 
   <tr valign="top">
     <td nowrap>
-    <a href="OptionalTasks/jarlib-display.html">Jarlib-display</a></td>
+    <a href="Tasks/jarlib-display.html">Jarlib-display</a></td>
     <td><p>Display the &quot;Optional Package&quot; and
       &quot;Package Specification&quot; information contained within the
       specified jars.</p>
@@ -635,7 +635,7 @@ documentation.</p>
 
   <tr valign="top">
     <td nowrap>
-    <a href="OptionalTasks/jarlib-manifest.html">Jarlib-manifest</a></td>
+    <a href="Tasks/jarlib-manifest.html">Jarlib-manifest</a></td>
     <td><p>Task to generate a manifest that declares all the dependencies
       in manifest. The dependencies are determined by looking in the
       specified path and searching for Extension/&quot;Optional Package&quot;
@@ -645,7 +645,7 @@ documentation.</p>
 
   <tr valign="top">
     <td nowrap>
-    <a href="OptionalTasks/jarlib-resolve.html">Jarlib-resolve</a></td>
+    <a href="Tasks/jarlib-resolve.html">Jarlib-resolve</a></td>
     <td><p>Try to locate a jar to satisfy an extension, and place the
       location of the jar into the specified property.</p>
     </td>
@@ -670,7 +670,7 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/recorder.html">Record</a></td>
+    <td nowrap><a href="Tasks/recorder.html">Record</a></td>
     <td><p>Runs a listener that records the logging output of the
      build-process events to a file. Several recorders can exist
      at the same time. Each recorder is associated with a file.</p></td>
@@ -694,13 +694,13 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/mail.html">Mail</a></td>
+    <td nowrap><a href="Tasks/mail.html">Mail</a></td>
     <td><p>A task to send SMTP email.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/mimemail.html">MimeMail</a></td>
-    <td><p><i>Deprecated</i>. Use the <a href="CoreTasks/mail.html">Mail</a>
+    <td nowrap><a href="Tasks/mimemail.html">MimeMail</a></td>
+    <td><p><i>Deprecated</i>. Use the <a href="Tasks/mail.html">Mail</a>
      task instead.</p></td>
   </tr>
 
@@ -723,60 +723,60 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/defaultexcludes.html">Defaultexcludes</a></td>
+    <td nowrap><a href="Tasks/defaultexcludes.html">Defaultexcludes</a></td>
     <td><p>Modify the list of default exclude patterns from within
     your build file.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/echo.html">Echo</a></td>
+    <td nowrap><a href="Tasks/echo.html">Echo</a></td>
     <td><p>Echoes text to <code>System.out</code> or to a file.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/fail.html">Fail</a></td>
+    <td nowrap><a href="Tasks/fail.html">Fail</a></td>
     <td><p>Exits the current build by throwing a BuildException,
      optionally printing additional information.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/genkey.html">GenKey</a></td>
+    <td nowrap><a href="Tasks/genkey.html">GenKey</a></td>
     <td><p>Generates a key in keystore.</p></td>
   </tr>
   
   
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/hostinfo.html">HostInfo</a></td>
+    <td nowrap><a href="Tasks/hostinfo.html">HostInfo</a></td>
     <td><p>Sets properties related to the provided host, or to
     the host the process is run on.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/input.html">Input</a></td>
+    <td nowrap><a href="Tasks/input.html">Input</a></td>
     <td><p>Allows user interaction during the build process by displaying a
      message and reading a line of input from the console.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/script.html">Script</a></td>
+    <td nowrap><a href="Tasks/script.html">Script</a></td>
     <td><p>Executes a script in a
      <a href="http://jakarta.apache.org/bsf/"
       target="_top">Apache BSF</a>-supported language.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/sound.html">Sound</a></td>
+    <td nowrap><a href="Tasks/sound.html">Sound</a></td>
     <td><p>Plays a sound file at the end of the build, according to whether
      the build failed or succeeded.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/splash.html">Splash</a></td>
+    <td nowrap><a href="Tasks/splash.html">Splash</a></td>
     <td><p>Displays a splash screen.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/sql.html">Sql</a></td>
+    <td nowrap><a href="Tasks/sql.html">Sql</a></td>
     <td><p>Executes a series of SQL statements via JDBC to a database.
      Statements can either be read in from a text file using the
      <code>src</code> attribute, or from between the enclosing SQL
@@ -784,26 +784,26 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/taskdef.html">Taskdef</a></td>
+    <td nowrap><a href="Tasks/taskdef.html">Taskdef</a></td>
     <td><p>Adds a task definition to the current project, such that this
      new task can be used in the current project.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/tstamp.html">TStamp</a></td>
+    <td nowrap><a href="Tasks/tstamp.html">TStamp</a></td>
     <td><p>Sets the <code>DSTAMP</code>, <code>TSTAMP</code>, and
      <code>TODAY</code> properties in the current project, based on
      the current date and time.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/typedef.html">Typedef</a></td>
+    <td nowrap><a href="Tasks/typedef.html">Typedef</a></td>
     <td><p>Adds a data-type definition to the current project, such that this
      new type can be used in the current project.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/xmlvalidate.html">XmlValidate</a></td>
+    <td nowrap><a href="Tasks/xmlvalidate.html">XmlValidate</a></td>
     <td><p>Checks that XML files are valid (or only well-formed). This task
      uses the XML parser that is currently used by Ant by default, but any SAX1/2
      parser can be specified, if needed.</p></td>
@@ -827,42 +827,42 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/antlr.html">ANTLR</a></td>
+    <td nowrap><a href="Tasks/antlr.html">ANTLR</a></td>
     <td><p>Invokes the <a HREF="http://www.antlr.org/" target="_top">ANTLR</a>
      Translator generator on a grammar file.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/antstructure.html">AntStructure</a></td>
+    <td nowrap><a href="Tasks/antstructure.html">AntStructure</a></td>
     <td><p>Generates a DTD for Ant buildfiles that contains information
      about all tasks currently known to Ant.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/import.html">Import</a></td>
+    <td nowrap><a href="Tasks/import.html">Import</a></td>
     <td><p>Import another build file and potentially override targets
     in it with targets of your own.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/include.html">Include</a></td>
+    <td nowrap><a href="Tasks/include.html">Include</a></td>
     <td><p>Include another build file.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/javacc.html">JavaCC</a></td>
+    <td nowrap><a href="Tasks/javacc.html">JavaCC</a></td>
     <td><p>Invokes the
      <a HREF="http://javacc.dev.java.net/" target="_top">
      JavaCC</a> compiler-compiler on a grammar file.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/javah.html">Javah</a></td>
+    <td nowrap><a href="Tasks/javah.html">Javah</a></td>
     <td><p>Generates JNI headers from a Java class.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/jjdoc.html">JJDoc</a></td>
+    <td nowrap><a href="Tasks/jjdoc.html">JJDoc</a></td>
     <td><p>Invokes the <a href="http://javacc.dev.java.net/">
      JJDoc</a> documentation generator for the JavaCC compiler-compiler.
      JJDoc takes a JavaCC parser specification and produces documentation
@@ -872,7 +872,7 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/jjtree.html">JJTree</a></td>
+    <td nowrap><a href="Tasks/jjtree.html">JJTree</a></td>
     <td><p>Invokes the <a href="http://javacc.dev.java.net/">
      JJTree</a> preprocessor for the JavaCC compiler-compiler. It inserts
      parse-tree building actions at various places in the JavaCC source that
@@ -882,12 +882,12 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/macrodef.html">Macrodef</a></td>
+    <td nowrap><a href="Tasks/macrodef.html">Macrodef</a></td>
     <td><p>Define a new task as a macro built-up upon other tasks.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/native2ascii.html">
+    <td nowrap><a href="Tasks/native2ascii.html">
      Native2Ascii</a></td>
     <td><p>Converts files from native encodings to ASCII with escaped Unicode.
       A common usage is to convert source files maintained in a native
@@ -895,19 +895,19 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/presetdef.html">Presetdef</a></td>
+    <td nowrap><a href="Tasks/presetdef.html">Presetdef</a></td>
     <td><p>Define a new task by instrumenting an existing task with
     default values for attributes or child elements.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/translate.html">Translate</a></td>
+    <td nowrap><a href="Tasks/translate.html">Translate</a></td>
     <td><p>Identifies keys in files, delimited by special tokens, and
      translates them with values read from resource bundles.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/style.html">XSLT</a></td>
+    <td nowrap><a href="Tasks/style.html">XSLT</a></td>
     <td><p>Processes a set of documents via XSLT.</p></td>
   </tr>
 
@@ -930,49 +930,49 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/available.html">Available</a></td>
+    <td nowrap><a href="Tasks/available.html">Available</a></td>
     <td><p>Sets a property if a specified file, directory, class in the
      classpath, or JVM system resource is available at runtime.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/basename.html">Basename</a></td>
+    <td nowrap><a href="Tasks/basename.html">Basename</a></td>
     <td><p>Sets a property to the last element of a specified path.
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/buildnumber.html">BuildNumber</a></td>
+    <td nowrap><a href="Tasks/buildnumber.html">BuildNumber</a></td>
     <td><p>Task that can be used to track build numbers.
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/condition.html">Condition</a></td>
+    <td nowrap><a href="Tasks/condition.html">Condition</a></td>
     <td><p>Sets a property if a certain condition holds true; this is a
-     generalization of <a href="CoreTasks/available.html">Available</a> and
-     <a href="CoreTasks/uptodate.html">Uptodate</a>.</p></td>
+     generalization of <a href="Tasks/available.html">Available</a> and
+     <a href="Tasks/uptodate.html">Uptodate</a>.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/dirname.html">Dirname</a></td>
+    <td nowrap><a href="Tasks/dirname.html">Dirname</a></td>
     <td><p>Sets a property to the value of the specified file up to,
      but not including, the last path element.
   </tr>
 
   <tr valign="top">
     <td nowrap>
-    <a href="OptionalTasks/echoproperties.html">Echoproperties</a><br>
+    <a href="Tasks/echoproperties.html">Echoproperties</a><br>
 
     </td>
     <td><p>Lists the current properties.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/loadfile.html">LoadFile</a></td>
+    <td nowrap><a href="Tasks/loadfile.html">LoadFile</a></td>
     <td><p>Loads a file into a property.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/loadproperties.html">LoadProperties</a></td>
+    <td nowrap><a href="Tasks/loadproperties.html">LoadProperties</a></td>
     <td><p>Load a file's contents as Ant properties. This task is
      equivalent to using <code>&lt;property file=&quot;...&quot;/&gt;</code>
      except that it supports nested <code>&lt;filterchain&gt;</code> elements,
@@ -980,12 +980,12 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/makeurl.html">MakeURL</a></td>
+    <td nowrap><a href="Tasks/makeurl.html">MakeURL</a></td>
     <td><p>Creates a URL (list) from a file/fileset or path</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/pathconvert.html">PathConvert</a></td>
+    <td nowrap><a href="Tasks/pathconvert.html">PathConvert</a></td>
     <td><p>Converts a nested path, path reference, filelist reference, or
      fileset reference to the form usable on a specified platform and/or
      to a list of items separated by the specified separator and stores
@@ -993,13 +993,13 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/property.html">Property</a></td>
+    <td nowrap><a href="Tasks/property.html">Property</a></td>
     <td><p>Sets a property (by name and value), or set of properties
      (from a file or resource) in the project.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/propertyfile.html">
+    <td nowrap><a href="Tasks/propertyfile.html">
      PropertyFile</a></td>
     <td><p>Creates or modifies property files. Useful when wanting to make
      unattended modifications to configuration files for application
@@ -1009,18 +1009,18 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/uptodate.html">Uptodate</a></td>
+    <td nowrap><a href="Tasks/uptodate.html">Uptodate</a></td>
     <td><p>Sets a property if a given target file is newer than a set of
      source files.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/whichresource.html">Whichresource</a></td>
+    <td nowrap><a href="Tasks/whichresource.html">Whichresource</a></td>
     <td><p>Find a class or resource.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/xmlproperty.html">XmlProperty</a></td>
+    <td nowrap><a href="Tasks/xmlproperty.html">XmlProperty</a></td>
     <td><p>Loads property values from a well-formed XML file.</p></td>
   </tr>
 </table>
@@ -1042,34 +1042,34 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/ftp.html">FTP</a></td>
+    <td nowrap><a href="Tasks/ftp.html">FTP</a></td>
     <td><p>Implements a basic FTP client that can send, receive,
      list, and delete files, and create directories.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/rexec.html">Rexec</a></td>
+    <td nowrap><a href="Tasks/rexec.html">Rexec</a></td>
     <td><p>Task to automate a remote rexec session.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/scp.html">Scp</a></td>
+    <td nowrap><a href="Tasks/scp.html">Scp</a></td>
     <td><p>Copy files to or from a remote server using SSH.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/setproxy.html">setproxy</a></td>
+    <td nowrap><a href="Tasks/setproxy.html">setproxy</a></td>
     <td><p>Sets Java's web proxy properties, so that tasks and code run
  in the same JVM can have through-the-firewall access to remote web sites.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/sshexec.html">Sshexec</a></td>
+    <td nowrap><a href="Tasks/sshexec.html">Sshexec</a></td>
     <td><p>Execute a command on a remote server using SSH.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/telnet.html">Telnet</a></td>
+    <td nowrap><a href="Tasks/telnet.html">Telnet</a></td>
     <td><p>Task to automate a remote <i>telnet</i> session. This task uses
      nested <code>&lt;read&gt;</code> and <code>&lt;write&gt;</code> tags
      to indicate strings to wait for and specify text to send.</p></td>
@@ -1094,47 +1094,47 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/cvs.html">Cvs</a></td>
+    <td nowrap><a href="Tasks/cvs.html">Cvs</a></td>
     <td><p>Handles packages/modules retrieved from a
      <a href="http://www.nongnu.org/cvs/" target="_top">CVS</a>
      repository.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/changelog.html">CvsChangeLog</a></td>
+    <td nowrap><a href="Tasks/changelog.html">CvsChangeLog</a></td>
     <td><p>Generates an XML report of the changes recorded in a
      <a href="http://www.nongnu.org/cvs/" target="_top">CVS</a>
      repository.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/cvspass.html">CVSPass</a></td>
+    <td nowrap><a href="Tasks/cvspass.html">CVSPass</a></td>
     <td><p>Adds entries to a .cvspass file. Adding entries to this file
      has the same affect as a <i>cvs login</i> command.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/cvstagdiff.html">CvsTagDiff</a></td>
+    <td nowrap><a href="Tasks/cvstagdiff.html">CvsTagDiff</a></td>
     <td><p>Generates an XML-formatted report file of the changes between
     two tags or dates recorded in a <a href="http://www.nongnu.org/cvs/"
     target="_top">CVS</a> repository.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/clearcase.html">ClearCase</a></td>
+    <td nowrap><a href="Tasks/clearcase.html">ClearCase</a></td>
     <td><p>Tasks to perform the ClearCase cleartool <i>checkin</i>, <i>checkout</i>,
      <i>uncheckout</i>, <i>update</i>, <i>lock</i>, <i>unlock</i>, <i>mklbtype</i>, <i>rmtype</i>, <i>mklabel</i>, <i>mkattr</i>, <i>mkdir</i>, <i>mkelem</i>, and <i>mkbl</i> commands.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/ccm.html">Continuus/Synergy</a></td>
+    <td nowrap><a href="Tasks/ccm.html">Continuus/Synergy</a></td>
     <td><p>Tasks to perform the Continuus <i>ccmcheckin</i>,
      <i>ccmcheckout</i>, <i>ccmcheckintask</i>, <i>ccmreconfigure</i>, and
      <i>ccmcreateTask</i> commands.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/vss.html">
+    <td nowrap><a href="Tasks/vss.html">
      Microsoft Visual SourceSafe</a></td>
     <td><p>Tasks to perform the Visual SourceSafe <i>vssget</i>,
      <i>vsslabel</i>, <i>vsshistory</i>, <i>vsscheckin</i>,
@@ -1143,7 +1143,7 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/perforce.html">Perforce</a></td>
+    <td nowrap><a href="Tasks/perforce.html">Perforce</a></td>
     <td><p>Tasks to perform the Perforce <i>p4sync</i>, <i>p4change</i>,
      <i>p4edit</i>, <i>p4submit</i>, <i>p4have</i>, <i>p4label</i>,
      <i>p4counter</i>, <i>p4reopen</i>, <i>p4revert</i>, and <i>p4add</i>
@@ -1151,26 +1151,17 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/pvcstask.html">Pvcs</a></td>
+    <td nowrap><a href="Tasks/pvcstask.html">Pvcs</a></td>
     <td><p>Allows the user extract the latest edition of the source code
      from a PVCS repository.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/sos.html">SourceOffSite</a></td>
+    <td nowrap><a href="Tasks/sos.html">SourceOffSite</a></td>
     <td><p>Tasks to perform the SourceOffSite <i>sosget</i>, <i>soslabel</i>,
      <i>soscheckin</i>, and <i>soscheckout</i> commands.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="OptionalTasks/starteam.html">StarTeam</a></td>
-    <td><p>Tasks to perform the StarTeam <i>stcheckout</i>, <i>stcheckin</i>,
-     <i>stlabel</i>, and <i>stlist</i> commands. The
-     <a href="OptionalTasks/starteam.html#starteam">Starteam</a> task
-     is deprecated; use
-     <a href="OptionalTasks/starteam.html#stcheckout">STCheckout</a>
-     instead.</p></td>
-  </tr>
 </table>
 
 <p></p>
@@ -1190,16 +1181,16 @@ documentation.</p>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/junit.html">Junit</a></td>
+    <td nowrap><a href="Tasks/junit.html">Junit</a></td>
     <td><p>Runs tests from the <a href="http://www.junit.org">Junit</a>
      testing framework. This task has been tested with JUnit 3.0 up to
      JUnit 3.7; it won't work with versions prior to JUnit 3.0.</p></td>
   </tr>
 
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/junitreport.html">JunitReport</a></td>
+    <td nowrap><a href="Tasks/junitreport.html">JunitReport</a></td>
     <td><p>Merges the individual XML files generated by the
-     <a href="OptionalTasks/junit.html">Junit</a> task and applies a
+     <a href="Tasks/junit.html">Junit</a> task and applies a
      stylesheet on the resulting merged document to provide a browsable
      report of the testcases results.</p></td>
   </tr>

Modified: ant/core/branches/run-single-test-method/docs/manual/tutorial-HelloWorldWithAnt.html
URL: http://svn.apache.org/viewvc/ant/core/branches/run-single-test-method/docs/manual/tutorial-HelloWorldWithAnt.html?rev=953741&r1=953740&r2=953741&view=diff
==============================================================================
--- ant/core/branches/run-single-test-method/docs/manual/tutorial-HelloWorldWithAnt.html (original)
+++ ant/core/branches/run-single-test-method/docs/manual/tutorial-HelloWorldWithAnt.html Fri Jun 11 15:50:09 2010
@@ -408,7 +408,7 @@ public class HelloWorldTest extends juni
 }</pre>
 
 <p>Because we dont have real business logic to test, this test class is very small: just show how to start. For 
-further information see the JUnit documentation [3] and the manual of <a href="OptionalTasks/junit.html">junit</a> task.
+further information see the JUnit documentation [3] and the manual of <a href="Tasks/junit.html">junit</a> task.
 Now we add a junit instruction to our buildfile:</p>
 
 <pre class="code">



Mime
View raw message