. Update to 1.6.2. The submitter's patches were used and in addition I

  fixed the packing list and removed PORTREVISION.
. Use ${MASTER_SITE_APACHE} to simplify (and expand) the MASTER_SITE list.

PR:		69600 [1]
Submitted by:	Sean O'Connell <oconnell@soe.ucsd.edu> [1]

3 files changed, 556 insertions, 541 deletions

diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index 4f319e244f08..69a402909032 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -6,13 +6,9 @@
 #
 
 PORTNAME=	apache-ant
-PORTVERSION=	1.6.1
-PORTREVISION=	1
+PORTVERSION=	1.6.2
 CATEGORIES=	devel java
-MASTER_SITES=	http://apache.mirror.trueserver.nl/dist/ant/binaries/:bin \
-		http://apache.proserve.nl/dist/ant/binaries/:bin \
-		http://apache.cs.uu.nl/dist/ant/binaries/:bin \
-		http://dist.apache.easynet.nl/ant/binaries/:bin \
+MASTER_SITES=	${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:bin,} \
 		http://www.esil.univ-mrs.fr/~hquiroz/:man
 DISTFILES=	${ANT_DISTFILE}:bin \
 		${MANPAGE_DISTFILE}:man
diff --git a/devel/apache-ant/distinfo b/devel/apache-ant/distinfo
index b47d3f0118e1..6fbae582d408 100644
--- a/devel/apache-ant/distinfo
+++ b/devel/apache-ant/distinfo
@@ -1,4 +1,4 @@
-MD5 (apache-ant-1.6.1-bin.tar.bz2) = 703d0265d05b98afd95be0bc21b98420
-SIZE (apache-ant-1.6.1-bin.tar.bz2) = 6562339
+MD5 (apache-ant-1.6.2-bin.tar.bz2) = a568c7271c3f168771c0313926d060fa
+SIZE (apache-ant-1.6.2-bin.tar.bz2) = 6685702
 MD5 (apache-ant-manpage-20030908.tgz) = 1fe1fdab6cce4def62005d67d929a9c9
 SIZE (apache-ant-manpage-20030908.tgz) = 9735
diff --git a/devel/apache-ant/pkg-plist b/devel/apache-ant/pkg-plist
index 4adcb4ca8681..8c72ee1e11aa 100644
--- a/devel/apache-ant/pkg-plist
+++ b/devel/apache-ant/pkg-plist
@@ -1,53 +1,8 @@
-ant/bin/antRun
-ant/lib/README
-ant/lib/ant-antlr.jar
-ant/lib/ant-apache-bsf.jar
-ant/lib/ant-apache-resolver.jar
-ant/lib/ant-commons-logging.jar
-ant/lib/ant-commons-net.jar
-ant/lib/ant-icontract.jar
-ant/lib/ant-jai.jar
-ant/lib/ant-jakarta-bcel.jar
-ant/lib/ant-jakarta-log4j.jar
-ant/lib/ant-jakarta-oro.jar
-ant/lib/ant-jakarta-regexp.jar
-ant/lib/ant-javamail.jar
-ant/lib/ant-jdepend.jar
-ant/lib/ant-jmf.jar
-ant/lib/ant-jsch.jar
-ant/lib/ant-junit.jar
-ant/lib/ant-launcher.jar
-ant/lib/ant-netrexx.jar
-ant/lib/ant-nodeps.jar
-ant/lib/ant-starteam.jar
-ant/lib/ant-stylebook.jar
-ant/lib/ant-swing.jar
-ant/lib/ant-trax.jar
-ant/lib/ant-vaj.jar
-ant/lib/ant-weblogic.jar
-ant/lib/ant-xalan1.jar
-ant/lib/ant-xalan2.jar
-ant/lib/ant-xslp.jar
-ant/lib/ant.jar
-ant/lib/xercesImpl.jar
-ant/lib/xml-apis.jar
 ant/LICENSE
 ant/README
 ant/WHATSNEW
-ant/etc/checkstyle/checkstyle-frames.xsl
-ant/etc/checkstyle/checkstyle-text.xsl
-ant/etc/checkstyle/checkstyle-xdoc.xsl
-ant/etc/ant-bootstrap.jar
-ant/etc/changelog.xsl
-ant/etc/coverage-frames.xsl
-ant/etc/jdepend-frames.xsl
-ant/etc/jdepend.xsl
-ant/etc/junit-frames.xsl
-ant/etc/junit-noframes.xsl
-ant/etc/log.xsl
-ant/etc/maudit-frames.xsl
-ant/etc/mmetrics-frames.xsl
-ant/etc/tagdiff.xsl
+ant/bin/antRun
+ant/docs/LICENSE
 ant/docs/ant2/FunctionalRequirements.html
 ant/docs/ant2/VFS.txt
 ant/docs/ant2/actionlist.html
@@ -55,6 +10,17 @@ ant/docs/ant2/features.html
 ant/docs/ant2/original-specification.html
 ant/docs/ant2/requested-features.html
 ant/docs/ant2/requested-features.txt
+ant/docs/ant_in_anger.html
+ant/docs/ant_task_guidelines.html
+ant/docs/antnews.html
+ant/docs/appendix_e.pdf
+ant/docs/breadcrumbs.js
+ant/docs/bylaws.html
+ant/docs/contributors.html
+ant/docs/cvs.html
+ant/docs/external.html
+ant/docs/faq.html
+ant/docs/favicon.ico
 ant/docs/images/JDJEditorsChoiceAward.jpg
 ant/docs/images/ant_logo.ico
 ant/docs/images/ant_logo_large.gif
@@ -80,6 +46,10 @@ ant/docs/images/tab-left.gif
 ant/docs/images/tab-right.gif
 ant/docs/images/tabSel-left.gif
 ant/docs/images/tabSel-right.gif
+ant/docs/index.html
+ant/docs/legal.html
+ant/docs/license.html
+ant/docs/mail.html
 ant/docs/manual/CoreTasks/ant.html
 ant/docs/manual/CoreTasks/antcall.html
 ant/docs/manual/CoreTasks/antstructure.html
@@ -101,8 +71,8 @@ ant/docs/manual/CoreTasks/cvs.html
 ant/docs/manual/CoreTasks/cvspass.html
 ant/docs/manual/CoreTasks/cvstagdiff.html
 ant/docs/manual/CoreTasks/cvsversion.html
-ant/docs/manual/CoreTasks/delete.html
 ant/docs/manual/CoreTasks/defaultexcludes.html
+ant/docs/manual/CoreTasks/delete.html
 ant/docs/manual/CoreTasks/deltree.html
 ant/docs/manual/CoreTasks/dependset.html
 ant/docs/manual/CoreTasks/dirname.html
@@ -129,6 +99,7 @@ ant/docs/manual/CoreTasks/mail.html
 ant/docs/manual/CoreTasks/manifest.html
 ant/docs/manual/CoreTasks/mkdir.html
 ant/docs/manual/CoreTasks/move.html
+ant/docs/manual/CoreTasks/nice.html
 ant/docs/manual/CoreTasks/pack.html
 ant/docs/manual/CoreTasks/parallel.html
 ant/docs/manual/CoreTasks/patch.html
@@ -175,6 +146,7 @@ ant/docs/manual/CoreTypes/namespace.html
 ant/docs/manual/CoreTypes/patternset.html
 ant/docs/manual/CoreTypes/permissions.html
 ant/docs/manual/CoreTypes/propertyset.html
+ant/docs/manual/CoreTypes/redirector.html
 ant/docs/manual/CoreTypes/selectors-program.html
 ant/docs/manual/CoreTypes/selectors.html
 ant/docs/manual/CoreTypes/xmlcatalog.html
@@ -185,6 +157,7 @@ ant/docs/manual/Integration/anttool1.gif
 ant/docs/manual/Integration/jext-plugin.html
 ant/docs/manual/Integration/remacc.gif
 ant/docs/manual/Integration/toolmenu.gif
+ant/docs/manual/LICENSE
 ant/docs/manual/OptionalTasks/BorlandEJBTasks.html
 ant/docs/manual/OptionalTasks/BorlandGenerateClient.html
 ant/docs/manual/OptionalTasks/antlr.html
@@ -257,11 +230,56 @@ ant/docs/manual/OptionalTasks/xmlvalidate.html
 ant/docs/manual/OptionalTypes/classfileset.html
 ant/docs/manual/OptionalTypes/extension.html
 ant/docs/manual/OptionalTypes/extensionset.html
-ant/docs/manual/api/org/apache/tools/ant/filters/util/ChainReaderHelper.html
-ant/docs/manual/api/org/apache/tools/ant/filters/util/JavaClassHelper.html
-ant/docs/manual/api/org/apache/tools/ant/filters/util/package-frame.html
-ant/docs/manual/api/org/apache/tools/ant/filters/util/package-summary.html
-ant/docs/manual/api/org/apache/tools/ant/filters/util/package-tree.html
+ant/docs/manual/antexternal.html
+ant/docs/manual/anttaskslist.html
+ant/docs/manual/api/allclasses-frame.html
+ant/docs/manual/api/allclasses-noframe.html
+ant/docs/manual/api/constant-values.html
+ant/docs/manual/api/deprecated-list.html
+ant/docs/manual/api/help-doc.html
+ant/docs/manual/api/index-all.html
+ant/docs/manual/api/index.html
+ant/docs/manual/api/org/apache/tools/ant/AntClassLoader.html
+ant/docs/manual/api/org/apache/tools/ant/AntTypeDefinition.html
+ant/docs/manual/api/org/apache/tools/ant/BuildEvent.html
+ant/docs/manual/api/org/apache/tools/ant/BuildException.html
+ant/docs/manual/api/org/apache/tools/ant/BuildListener.html
+ant/docs/manual/api/org/apache/tools/ant/BuildLogger.html
+ant/docs/manual/api/org/apache/tools/ant/ComponentHelper.html
+ant/docs/manual/api/org/apache/tools/ant/DefaultLogger.html
+ant/docs/manual/api/org/apache/tools/ant/DemuxInputStream.html
+ant/docs/manual/api/org/apache/tools/ant/DemuxOutputStream.html
+ant/docs/manual/api/org/apache/tools/ant/Diagnostics.html
+ant/docs/manual/api/org/apache/tools/ant/DirectoryScanner.html
+ant/docs/manual/api/org/apache/tools/ant/DynamicAttribute.html
+ant/docs/manual/api/org/apache/tools/ant/DynamicAttributeNS.html
+ant/docs/manual/api/org/apache/tools/ant/DynamicConfigurator.html
+ant/docs/manual/api/org/apache/tools/ant/DynamicConfiguratorNS.html
+ant/docs/manual/api/org/apache/tools/ant/DynamicElement.html
+ant/docs/manual/api/org/apache/tools/ant/DynamicElementNS.html
+ant/docs/manual/api/org/apache/tools/ant/ExitException.html
+ant/docs/manual/api/org/apache/tools/ant/ExitStatusException.html
+ant/docs/manual/api/org/apache/tools/ant/FileScanner.html
+ant/docs/manual/api/org/apache/tools/ant/IntrospectionHelper.Creator.html
+ant/docs/manual/api/org/apache/tools/ant/IntrospectionHelper.html
+ant/docs/manual/api/org/apache/tools/ant/Location.html
+ant/docs/manual/api/org/apache/tools/ant/MagicNames.html
+ant/docs/manual/api/org/apache/tools/ant/Main.html
+ant/docs/manual/api/org/apache/tools/ant/NoBannerLogger.html
+ant/docs/manual/api/org/apache/tools/ant/PathTokenizer.html
+ant/docs/manual/api/org/apache/tools/ant/Project.html
+ant/docs/manual/api/org/apache/tools/ant/ProjectComponent.html
+ant/docs/manual/api/org/apache/tools/ant/ProjectHelper.html
+ant/docs/manual/api/org/apache/tools/ant/PropertyHelper.html
+ant/docs/manual/api/org/apache/tools/ant/RuntimeConfigurable.html
+ant/docs/manual/api/org/apache/tools/ant/SubBuildListener.html
+ant/docs/manual/api/org/apache/tools/ant/Target.html
+ant/docs/manual/api/org/apache/tools/ant/Task.html
+ant/docs/manual/api/org/apache/tools/ant/TaskAdapter.html
+ant/docs/manual/api/org/apache/tools/ant/TaskContainer.html
+ant/docs/manual/api/org/apache/tools/ant/TypeAdapter.html
+ant/docs/manual/api/org/apache/tools/ant/UnknownElement.html
+ant/docs/manual/api/org/apache/tools/ant/XmlLogger.html
 ant/docs/manual/api/org/apache/tools/ant/filters/BaseFilterReader.html
 ant/docs/manual/api/org/apache/tools/ant/filters/BaseParamFilterReader.html
 ant/docs/manual/api/org/apache/tools/ant/filters/ChainableReader.html
@@ -298,6 +316,11 @@ ant/docs/manual/api/org/apache/tools/ant/filters/TokenFilter.html
 ant/docs/manual/api/org/apache/tools/ant/filters/package-frame.html
 ant/docs/manual/api/org/apache/tools/ant/filters/package-summary.html
 ant/docs/manual/api/org/apache/tools/ant/filters/package-tree.html
+ant/docs/manual/api/org/apache/tools/ant/filters/util/ChainReaderHelper.html
+ant/docs/manual/api/org/apache/tools/ant/filters/util/JavaClassHelper.html
+ant/docs/manual/api/org/apache/tools/ant/filters/util/package-frame.html
+ant/docs/manual/api/org/apache/tools/ant/filters/util/package-summary.html
+ant/docs/manual/api/org/apache/tools/ant/filters/util/package-tree.html
 ant/docs/manual/api/org/apache/tools/ant/helper/AntXMLContext.html
 ant/docs/manual/api/org/apache/tools/ant/helper/ProjectHelper2.AntHandler.html
 ant/docs/manual/api/org/apache/tools/ant/helper/ProjectHelper2.ElementHandler.html
@@ -336,6 +359,176 @@ ant/docs/manual/api/org/apache/tools/ant/loader/AntClassLoader2.html
 ant/docs/manual/api/org/apache/tools/ant/loader/package-frame.html
 ant/docs/manual/api/org/apache/tools/ant/loader/package-summary.html
 ant/docs/manual/api/org/apache/tools/ant/loader/package-tree.html
+ant/docs/manual/api/org/apache/tools/ant/package-frame.html
+ant/docs/manual/api/org/apache/tools/ant/package-summary.html
+ant/docs/manual/api/org/apache/tools/ant/package-tree.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/AbstractCvsTask.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Ant.Reference.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Ant.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/AntStructure.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Antlib.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/AntlibDefinition.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Available.FileDir.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Available.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/BUnzip2.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/BZip2.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Basename.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/BuildNumber.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/CVSPass.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/CallTarget.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Checksum.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Chmod.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Concat.TextElement.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Concat.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/ConditionTask.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Copy.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Copydir.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Copyfile.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Cvs.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/DefBase.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/DefaultExcludes.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Definer.Format.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Definer.OnError.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Definer.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Delete.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Deltree.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/DependSet.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Dirname.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Ear.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Echo.EchoLevel.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Echo.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Exec.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/ExecTask.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Execute.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/ExecuteJava.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/ExecuteOn.FileDirBoth.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/ExecuteOn.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/ExecuteStreamHandler.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/ExecuteWatchdog.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Exit.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Expand.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Filter.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/FixCRLF.AddAsisRemove.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/FixCRLF.CrLf.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/FixCRLF.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/GUnzip.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/GZip.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/GenerateKey.DistinguishedName.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/GenerateKey.DnameParam.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/GenerateKey.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Get.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/ImportTask.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Input.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/JDBCTask.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Jar.FilesetManifestConfig.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Jar.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Java.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Javac.ImplementationSpecificArgument.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Javac.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Javadoc.AccessType.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Javadoc.DocletInfo.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Javadoc.DocletParam.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Javadoc.ExtensionInfo.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Javadoc.GroupArgument.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Javadoc.Html.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Javadoc.LinkArgument.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Javadoc.PackageName.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Javadoc.SourceFile.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Javadoc.TagArgument.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Javadoc.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Jikes.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/JikesOutputParser.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/KeySubst.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/LoadFile.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/LoadProperties.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/LogOutputStream.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/LogStreamHandler.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/MacroDef.Attribute.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/MacroDef.NestedSequential.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/MacroDef.TemplateElement.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/MacroDef.Text.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/MacroDef.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/MacroInstance.Element.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/MacroInstance.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Manifest.Attribute.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Manifest.Section.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Manifest.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/ManifestException.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/ManifestTask.Mode.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/ManifestTask.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/MatchingTask.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Mkdir.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Move.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Nice.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Pack.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Parallel.TaskList.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Parallel.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Patch.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/PathConvert.MapEntry.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/PathConvert.TargetOs.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/PathConvert.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/PreSetDef.PreSetDefinition.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/PreSetDef.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Property.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/PumpStreamHandler.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Recorder.ActionChoices.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Recorder.VerbosityLevelChoices.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Recorder.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/RecorderEntry.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Redirector.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Rename.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Replace.NestedString.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Replace.Replacefilter.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Replace.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Rmic.ImplementationSpecificArgument.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Rmic.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/SQLExec.DelimiterType.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/SQLExec.OnError.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/SQLExec.Transaction.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/SQLExec.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/SendEmail.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Sequential.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/SignJar.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Sleep.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/StreamPumper.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/SubAnt.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Sync.MyCopy.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Sync.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Tar.TarCompressionMethod.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Tar.TarFileSet.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Tar.TarLongFileMode.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Tar.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/TaskOutputStream.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Taskdef.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/TempFile.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Touch.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Transform.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Tstamp.CustomFormat.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Tstamp.Unit.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Tstamp.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Typedef.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Unpack.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Untar.UntarCompressionMethod.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Untar.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/UpToDate.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/WaitFor.Unit.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/WaitFor.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/War.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/WhichResource.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTLiaison.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTLiaison2.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTLogger.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTLoggerAware.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.Factory.Attribute.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.Factory.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.OutputProperty.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.Param.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/XmlProperty.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Zip.ArchiveState.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Zip.Duplicate.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Zip.WhenEmpty.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/Zip.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/compilers/CompilerAdapter.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.html
@@ -384,6 +577,36 @@ ant/docs/manual/api/org/apache/tools/ant/taskdefs/email/MimeMailer.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/email/package-frame.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/email/package-summary.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/email/package-tree.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ANTLR.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/Cab.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/EchoProperties.FormatAttribute.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/EchoProperties.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/IContract.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/Javah.ClassArgument.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/Javah.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/Native2Ascii.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/NetRexxC.TraceAttr.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/NetRexxC.VerboseAttr.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/NetRexxC.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/PropertyFile.Entry.Operation.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/PropertyFile.Entry.Type.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/PropertyFile.Entry.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/PropertyFile.Unit.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/PropertyFile.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/RenameExtensions.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/Rpm.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/Script.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/StyleBook.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/Test.TestletEntry.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/Test.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/TraXLiaison.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.Attribute.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.Property.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.ValidatorErrorHandler.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/XalanLiaison.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/XslpLiaison.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckin.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckinDefault.html
@@ -411,6 +634,13 @@ ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.h
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/package-frame.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/package-summary.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/package-tree.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend/Depend.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ClassCPInfo.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantCPInfo.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.html
@@ -428,13 +658,6 @@ ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/U
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/package-frame.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/package-summary.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/package-tree.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend/Depend.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend/package-frame.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend/package-summary.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend/package-tree.html
@@ -472,12 +695,12 @@ ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.EjbcException.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.html
@@ -486,12 +709,6 @@ ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeployme
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/package-frame.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/package-summary.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/package-tree.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/LocationResolver.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/package-frame.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/package-summary.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/package-tree.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/Compatability.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/Compatibility.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/DeweyDecimal.html
@@ -510,6 +727,12 @@ ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/Specificati
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/package-frame.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/package-summary.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/package-tree.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/LocationResolver.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/package-frame.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/package-summary.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/package-tree.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/i18n/Translate.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/i18n/package-frame.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/i18n/package-summary.html
@@ -560,6 +783,12 @@ ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jlink/jlink.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jlink/package-frame.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jlink/package-summary.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jlink/package-tree.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/JspC.WebAppParameter.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/JspC.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/JspMangler.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapter.html
@@ -567,12 +796,6 @@ ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspComp
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/package-frame.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/package-summary.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/package-tree.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/JspC.WebAppParameter.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/JspC.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/JspMangler.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/package-frame.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/package-summary.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/package-tree.html
@@ -588,6 +811,7 @@ ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/junit/Enumerations.ht
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.TypeAttribute.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitResultFormatter.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.ForkMode.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.SummaryAttribute.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.html
@@ -632,6 +856,9 @@ ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/net/package-frame.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/net/package-summary.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/net/package-tree.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/package-frame.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/package-summary.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/package-tree.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.html
@@ -673,18 +900,6 @@ ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/script/ScriptDefBase.
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/script/package-frame.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/script/package-summary.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/script/package-tree.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/AttributeInfo.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/package-frame.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/package-summary.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/package-tree.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassFile.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.FileLoader.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/MethodInfo.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/Utils.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/package-frame.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/package-summary.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/package-tree.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/CovBase.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.Reference.html
@@ -699,15 +914,27 @@ ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/Filters.Exclu
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/Filters.FilterElement.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/Filters.Include.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/Filters.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.Exclude.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.FilterElement.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.Include.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/Socket.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/StringUtil.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.Method.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassFile.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.FileLoader.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/MethodInfo.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/Utils.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/AttributeInfo.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/package-frame.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/package-summary.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/package-tree.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/package-frame.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/package-summary.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/package-tree.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/package-frame.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/package-summary.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/package-tree.html
@@ -779,38 +1006,9 @@ ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/windows/Attrib.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/windows/package-frame.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/windows/package-summary.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/windows/package-tree.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ANTLR.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/Cab.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/EchoProperties.FormatAttribute.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/EchoProperties.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/IContract.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/Javah.ClassArgument.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/Javah.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/Native2Ascii.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/NetRexxC.TraceAttr.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/NetRexxC.VerboseAttr.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/NetRexxC.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/PropertyFile.Entry.Operation.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/PropertyFile.Entry.Type.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/PropertyFile.Entry.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/PropertyFile.Unit.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/PropertyFile.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/RenameExtensions.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/Rpm.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/Script.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/StyleBook.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/Test.TestletEntry.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/Test.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/TraXLiaison.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.Attribute.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.ValidatorErrorHandler.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/XalanLiaison.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/XslpLiaison.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/package-frame.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/package-summary.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/package-tree.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/package-frame.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/package-summary.html
+ant/docs/manual/api/org/apache/tools/ant/taskdefs/package-tree.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.html
@@ -820,175 +1018,57 @@ ant/docs/manual/api/org/apache/tools/ant/taskdefs/rmic/WLRmic.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/rmic/package-frame.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/rmic/package-summary.html
 ant/docs/manual/api/org/apache/tools/ant/taskdefs/rmic/package-tree.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/AbstractCvsTask.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Ant.Reference.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Ant.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/AntStructure.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Antlib.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/AntlibDefinition.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Available.FileDir.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Available.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/BUnzip2.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/BZip2.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Basename.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/BuildNumber.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/CVSPass.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/CallTarget.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Chmod.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Checksum.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Concat.TextElement.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Concat.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/ConditionTask.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Copy.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Copydir.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Copyfile.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Cvs.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/DefBase.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/DefaultExcludes.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Definer.Format.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Definer.OnError.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Definer.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Delete.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Deltree.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/DependSet.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Dirname.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Ear.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Echo.EchoLevel.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Echo.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Exec.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/ExecTask.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Execute.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/ExecuteJava.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/ExecuteOn.FileDirBoth.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/ExecuteOn.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/ExecuteStreamHandler.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/ExecuteWatchdog.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Exit.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Expand.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Filter.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/FixCRLF.AddAsisRemove.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/FixCRLF.CrLf.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/FixCRLF.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/GUnzip.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/GZip.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/GenerateKey.DistinguishedName.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/GenerateKey.DnameParam.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/GenerateKey.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Get.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/ImportTask.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Input.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/JDBCTask.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Jar.FilesetManifestConfig.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Jar.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Java.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Javac.ImplementationSpecificArgument.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Javac.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Javadoc.AccessType.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Javadoc.DocletInfo.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Javadoc.DocletParam.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Javadoc.ExtensionInfo.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Javadoc.GroupArgument.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Javadoc.Html.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Javadoc.LinkArgument.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Javadoc.PackageName.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Javadoc.SourceFile.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Javadoc.TagArgument.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Javadoc.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Jikes.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/JikesOutputParser.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/KeySubst.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/LoadFile.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/LoadProperties.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/LogOutputStream.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/LogStreamHandler.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/MacroDef.Attribute.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/MacroDef.NestedSequential.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/MacroDef.TemplateElement.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/MacroDef.Text.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/MacroDef.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/MacroInstance.Element.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/MacroInstance.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Manifest.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Manifest.Attribute.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Manifest.Section.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/ManifestException.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/ManifestTask.Mode.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/ManifestTask.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/MatchingTask.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Mkdir.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Move.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Pack.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Parallel.TaskList.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Parallel.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Patch.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/PathConvert.MapEntry.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/PathConvert.TargetOs.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/PathConvert.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/PreSetDef.PreSetDefinition.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/PreSetDef.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Property.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/PumpStreamHandler.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Recorder.ActionChoices.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Recorder.VerbosityLevelChoices.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Recorder.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/RecorderEntry.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Redirector.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Rename.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Replace.NestedString.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Replace.Replacefilter.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Replace.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Rmic.ImplementationSpecificArgument.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Rmic.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/SQLExec.DelimiterType.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/SQLExec.OnError.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/SQLExec.Transaction.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/SQLExec.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/SendEmail.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Sequential.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/SignJar.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Sleep.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/StreamPumper.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/SubAnt.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Sync.MyCopy.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Sync.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Tar.TarCompressionMethod.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Tar.TarFileSet.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Tar.TarLongFileMode.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Tar.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/TaskOutputStream.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Taskdef.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/TempFile.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Touch.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Transform.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Tstamp.CustomFormat.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Tstamp.Unit.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Tstamp.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Typedef.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Unpack.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Untar.UntarCompressionMethod.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Untar.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/UpToDate.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/WaitFor.Unit.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/WaitFor.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/War.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/WhichResource.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTLiaison.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTLiaison2.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTLogger.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTLoggerAware.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.Factory.Attribute.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.Factory.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.OutputProperty.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.Param.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/XmlProperty.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Zip.ArchiveState.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Zip.Duplicate.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Zip.WhenEmpty.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/Zip.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/package-frame.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/package-summary.html
-ant/docs/manual/api/org/apache/tools/ant/taskdefs/package-tree.html
+ant/docs/manual/api/org/apache/tools/ant/types/AbstractFileSet.html
+ant/docs/manual/api/org/apache/tools/ant/types/AntFilterReader.html
+ant/docs/manual/api/org/apache/tools/ant/types/Assertions.BaseAssertion.html
+ant/docs/manual/api/org/apache/tools/ant/types/Assertions.DisabledAssertion.html
+ant/docs/manual/api/org/apache/tools/ant/types/Assertions.EnabledAssertion.html
+ant/docs/manual/api/org/apache/tools/ant/types/Assertions.html
+ant/docs/manual/api/org/apache/tools/ant/types/Commandline.Argument.html
+ant/docs/manual/api/org/apache/tools/ant/types/Commandline.Marker.html
+ant/docs/manual/api/org/apache/tools/ant/types/Commandline.html
+ant/docs/manual/api/org/apache/tools/ant/types/CommandlineJava.SysProperties.html
+ant/docs/manual/api/org/apache/tools/ant/types/CommandlineJava.html
+ant/docs/manual/api/org/apache/tools/ant/types/DTDLocation.html
+ant/docs/manual/api/org/apache/tools/ant/types/DataType.html
+ant/docs/manual/api/org/apache/tools/ant/types/Description.html
+ant/docs/manual/api/org/apache/tools/ant/types/DirSet.html
+ant/docs/manual/api/org/apache/tools/ant/types/EnumeratedAttribute.html
+ant/docs/manual/api/org/apache/tools/ant/types/Environment.Variable.html
+ant/docs/manual/api/org/apache/tools/ant/types/Environment.html
+ant/docs/manual/api/org/apache/tools/ant/types/FileList.FileName.html
+ant/docs/manual/api/org/apache/tools/ant/types/FileList.html
+ant/docs/manual/api/org/apache/tools/ant/types/FileSet.html
+ant/docs/manual/api/org/apache/tools/ant/types/FilterChain.html
+ant/docs/manual/api/org/apache/tools/ant/types/FilterSet.Filter.html
+ant/docs/manual/api/org/apache/tools/ant/types/FilterSet.FiltersFile.html
+ant/docs/manual/api/org/apache/tools/ant/types/FilterSet.html
+ant/docs/manual/api/org/apache/tools/ant/types/FilterSetCollection.html
+ant/docs/manual/api/org/apache/tools/ant/types/FlexInteger.html
+ant/docs/manual/api/org/apache/tools/ant/types/Mapper.MapperType.html
+ant/docs/manual/api/org/apache/tools/ant/types/Mapper.html
+ant/docs/manual/api/org/apache/tools/ant/types/Parameter.html
+ant/docs/manual/api/org/apache/tools/ant/types/Parameterizable.html
+ant/docs/manual/api/org/apache/tools/ant/types/Path.PathElement.html
+ant/docs/manual/api/org/apache/tools/ant/types/Path.html
+ant/docs/manual/api/org/apache/tools/ant/types/PatternSet.NameEntry.html
+ant/docs/manual/api/org/apache/tools/ant/types/PatternSet.html
+ant/docs/manual/api/org/apache/tools/ant/types/Permissions.Permission.html
+ant/docs/manual/api/org/apache/tools/ant/types/Permissions.html
+ant/docs/manual/api/org/apache/tools/ant/types/PropertySet.BuiltinPropertySetName.html
+ant/docs/manual/api/org/apache/tools/ant/types/PropertySet.PropertyRef.html
+ant/docs/manual/api/org/apache/tools/ant/types/PropertySet.html
+ant/docs/manual/api/org/apache/tools/ant/types/RedirectorElement.html
+ant/docs/manual/api/org/apache/tools/ant/types/Reference.html
+ant/docs/manual/api/org/apache/tools/ant/types/RegularExpression.html
+ant/docs/manual/api/org/apache/tools/ant/types/Resource.html
+ant/docs/manual/api/org/apache/tools/ant/types/ResourceFactory.html
+ant/docs/manual/api/org/apache/tools/ant/types/ResourceLocation.html
+ant/docs/manual/api/org/apache/tools/ant/types/Substitution.html
+ant/docs/manual/api/org/apache/tools/ant/types/XMLCatalog.html
+ant/docs/manual/api/org/apache/tools/ant/types/ZipFileSet.html
+ant/docs/manual/api/org/apache/tools/ant/types/ZipScanner.html
+ant/docs/manual/api/org/apache/tools/ant/types/optional/ScriptFilter.html
 ant/docs/manual/api/org/apache/tools/ant/types/optional/depend/ClassfileSet.ClassRoot.html
 ant/docs/manual/api/org/apache/tools/ant/types/optional/depend/ClassfileSet.html
 ant/docs/manual/api/org/apache/tools/ant/types/optional/depend/DependScanner.html
@@ -1011,28 +1091,17 @@ ant/docs/manual/api/org/apache/tools/ant/types/optional/image/TransformOperation
 ant/docs/manual/api/org/apache/tools/ant/types/optional/image/package-frame.html
 ant/docs/manual/api/org/apache/tools/ant/types/optional/image/package-summary.html
 ant/docs/manual/api/org/apache/tools/ant/types/optional/image/package-tree.html
-ant/docs/manual/api/org/apache/tools/ant/types/optional/ScriptFilter.html
 ant/docs/manual/api/org/apache/tools/ant/types/optional/package-frame.html
 ant/docs/manual/api/org/apache/tools/ant/types/optional/package-summary.html
 ant/docs/manual/api/org/apache/tools/ant/types/optional/package-tree.html
+ant/docs/manual/api/org/apache/tools/ant/types/package-frame.html
+ant/docs/manual/api/org/apache/tools/ant/types/package-summary.html
+ant/docs/manual/api/org/apache/tools/ant/types/package-tree.html
 ant/docs/manual/api/org/apache/tools/ant/types/resolver/ApacheCatalog.html
 ant/docs/manual/api/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.html
 ant/docs/manual/api/org/apache/tools/ant/types/resolver/package-frame.html
 ant/docs/manual/api/org/apache/tools/ant/types/resolver/package-summary.html
 ant/docs/manual/api/org/apache/tools/ant/types/resolver/package-tree.html
-ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/Algorithm.html
-ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/Cache.html
-ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.html
-ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/EqualComparator.html
-ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.html
-ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.AlgorithmName.html
-ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.CacheName.html
-ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.ComparatorName.html
-ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.html
-ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.html
-ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/package-frame.html
-ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/package-summary.html
-ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/package-tree.html
 ant/docs/manual/api/org/apache/tools/ant/types/selectors/AndSelector.html
 ant/docs/manual/api/org/apache/tools/ant/types/selectors/BaseExtendSelector.html
 ant/docs/manual/api/org/apache/tools/ant/types/selectors/BaseSelector.html
@@ -1062,101 +1131,32 @@ ant/docs/manual/api/org/apache/tools/ant/types/selectors/SelectorUtils.html
 ant/docs/manual/api/org/apache/tools/ant/types/selectors/SizeSelector.ByteUnits.html
 ant/docs/manual/api/org/apache/tools/ant/types/selectors/SizeSelector.SizeComparisons.html
 ant/docs/manual/api/org/apache/tools/ant/types/selectors/SizeSelector.html
-ant/docs/manual/api/org/apache/tools/ant/types/selectors/TypeSelector.html
 ant/docs/manual/api/org/apache/tools/ant/types/selectors/TypeSelector.FileType.html
+ant/docs/manual/api/org/apache/tools/ant/types/selectors/TypeSelector.html
+ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/Algorithm.html
+ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/Cache.html
+ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.html
+ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/EqualComparator.html
+ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.html
+ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.AlgorithmName.html
+ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.CacheName.html
+ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.ComparatorName.html
+ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.html
+ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.html
+ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/package-frame.html
+ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/package-summary.html
+ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/package-tree.html
 ant/docs/manual/api/org/apache/tools/ant/types/selectors/package-frame.html
 ant/docs/manual/api/org/apache/tools/ant/types/selectors/package-summary.html
 ant/docs/manual/api/org/apache/tools/ant/types/selectors/package-tree.html
-ant/docs/manual/api/org/apache/tools/ant/types/AbstractFileSet.html
-ant/docs/manual/api/org/apache/tools/ant/types/AntFilterReader.html
-ant/docs/manual/api/org/apache/tools/ant/types/Assertions.BaseAssertion.html
-ant/docs/manual/api/org/apache/tools/ant/types/Assertions.DisabledAssertion.html
-ant/docs/manual/api/org/apache/tools/ant/types/Assertions.EnabledAssertion.html
-ant/docs/manual/api/org/apache/tools/ant/types/Assertions.html
-ant/docs/manual/api/org/apache/tools/ant/types/Commandline.Argument.html
-ant/docs/manual/api/org/apache/tools/ant/types/Commandline.Marker.html
-ant/docs/manual/api/org/apache/tools/ant/types/Commandline.html
-ant/docs/manual/api/org/apache/tools/ant/types/CommandlineJava.SysProperties.html
-ant/docs/manual/api/org/apache/tools/ant/types/CommandlineJava.html
-ant/docs/manual/api/org/apache/tools/ant/types/DTDLocation.html
-ant/docs/manual/api/org/apache/tools/ant/types/DataType.html
-ant/docs/manual/api/org/apache/tools/ant/types/Description.html
-ant/docs/manual/api/org/apache/tools/ant/types/DirSet.html
-ant/docs/manual/api/org/apache/tools/ant/types/EnumeratedAttribute.html
-ant/docs/manual/api/org/apache/tools/ant/types/Environment.Variable.html
-ant/docs/manual/api/org/apache/tools/ant/types/Environment.html
-ant/docs/manual/api/org/apache/tools/ant/types/FileList.html
-ant/docs/manual/api/org/apache/tools/ant/types/FileSet.html
-ant/docs/manual/api/org/apache/tools/ant/types/FilterChain.html
-ant/docs/manual/api/org/apache/tools/ant/types/FilterSet.Filter.html
-ant/docs/manual/api/org/apache/tools/ant/types/FilterSet.FiltersFile.html
-ant/docs/manual/api/org/apache/tools/ant/types/FilterSet.html
-ant/docs/manual/api/org/apache/tools/ant/types/FilterSetCollection.html
-ant/docs/manual/api/org/apache/tools/ant/types/FlexInteger.html
-ant/docs/manual/api/org/apache/tools/ant/types/Mapper.MapperType.html
-ant/docs/manual/api/org/apache/tools/ant/types/Mapper.html
-ant/docs/manual/api/org/apache/tools/ant/types/Parameter.html
-ant/docs/manual/api/org/apache/tools/ant/types/Parameterizable.html
-ant/docs/manual/api/org/apache/tools/ant/types/Path.PathElement.html
-ant/docs/manual/api/org/apache/tools/ant/types/Path.html
-ant/docs/manual/api/org/apache/tools/ant/types/PatternSet.NameEntry.html
-ant/docs/manual/api/org/apache/tools/ant/types/PatternSet.html
-ant/docs/manual/api/org/apache/tools/ant/types/Permissions.Permission.html
-ant/docs/manual/api/org/apache/tools/ant/types/Permissions.html
-ant/docs/manual/api/org/apache/tools/ant/types/PropertySet.BuiltinPropertySetName.html
-ant/docs/manual/api/org/apache/tools/ant/types/PropertySet.PropertyRef.html
-ant/docs/manual/api/org/apache/tools/ant/types/PropertySet.html
-ant/docs/manual/api/org/apache/tools/ant/types/Reference.html
-ant/docs/manual/api/org/apache/tools/ant/types/RegularExpression.html
-ant/docs/manual/api/org/apache/tools/ant/types/Resource.html
-ant/docs/manual/api/org/apache/tools/ant/types/ResourceFactory.html
-ant/docs/manual/api/org/apache/tools/ant/types/ResourceLocation.html
-ant/docs/manual/api/org/apache/tools/ant/types/Substitution.html
-ant/docs/manual/api/org/apache/tools/ant/types/XMLCatalog.html
-ant/docs/manual/api/org/apache/tools/ant/types/ZipFileSet.html
-ant/docs/manual/api/org/apache/tools/ant/types/ZipScanner.html
-ant/docs/manual/api/org/apache/tools/ant/types/package-frame.html
-ant/docs/manual/api/org/apache/tools/ant/types/package-summary.html
-ant/docs/manual/api/org/apache/tools/ant/types/package-tree.html
-ant/docs/manual/api/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.html
-ant/docs/manual/api/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.html
-ant/docs/manual/api/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.html
-ant/docs/manual/api/org/apache/tools/ant/util/depend/bcel/package-frame.html
-ant/docs/manual/api/org/apache/tools/ant/util/depend/bcel/package-summary.html
-ant/docs/manual/api/org/apache/tools/ant/util/depend/bcel/package-tree.html
-ant/docs/manual/api/org/apache/tools/ant/util/depend/AbstractAnalyzer.html
-ant/docs/manual/api/org/apache/tools/ant/util/depend/DependencyAnalyzer.html
-ant/docs/manual/api/org/apache/tools/ant/util/depend/package-frame.html
-ant/docs/manual/api/org/apache/tools/ant/util/depend/package-summary.html
-ant/docs/manual/api/org/apache/tools/ant/util/depend/package-tree.html
-ant/docs/manual/api/org/apache/tools/ant/util/facade/FacadeTaskHelper.html
-ant/docs/manual/api/org/apache/tools/ant/util/facade/ImplementationSpecificArgument.html
-ant/docs/manual/api/org/apache/tools/ant/util/facade/package-frame.html
-ant/docs/manual/api/org/apache/tools/ant/util/facade/package-summary.html
-ant/docs/manual/api/org/apache/tools/ant/util/facade/package-tree.html
-ant/docs/manual/api/org/apache/tools/ant/util/optional/NoExitSecurityManager.html
-ant/docs/manual/api/org/apache/tools/ant/util/optional/WeakishReference12.html
-ant/docs/manual/api/org/apache/tools/ant/util/optional/package-frame.html
-ant/docs/manual/api/org/apache/tools/ant/util/optional/package-summary.html
-ant/docs/manual/api/org/apache/tools/ant/util/optional/package-tree.html
-ant/docs/manual/api/org/apache/tools/ant/util/regexp/JakartaOroMatcher.html
-ant/docs/manual/api/org/apache/tools/ant/util/regexp/JakartaOroRegexp.html
-ant/docs/manual/api/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.html
-ant/docs/manual/api/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.html
-ant/docs/manual/api/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.html
-ant/docs/manual/api/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.html
-ant/docs/manual/api/org/apache/tools/ant/util/regexp/Regexp.html
-ant/docs/manual/api/org/apache/tools/ant/util/regexp/RegexpFactory.html
-ant/docs/manual/api/org/apache/tools/ant/util/regexp/RegexpMatcher.html
-ant/docs/manual/api/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.html
-ant/docs/manual/api/org/apache/tools/ant/util/regexp/RegexpUtil.html
-ant/docs/manual/api/org/apache/tools/ant/util/regexp/package-frame.html
-ant/docs/manual/api/org/apache/tools/ant/util/regexp/package-summary.html
-ant/docs/manual/api/org/apache/tools/ant/util/regexp/package-tree.html
+ant/docs/manual/api/org/apache/tools/ant/util/ChainedMapper.html
 ant/docs/manual/api/org/apache/tools/ant/util/ClasspathUtils.Delegate.html
 ant/docs/manual/api/org/apache/tools/ant/util/ClasspathUtils.html
 ant/docs/manual/api/org/apache/tools/ant/util/CollectionUtils.EmptyEnumeration.html
 ant/docs/manual/api/org/apache/tools/ant/util/CollectionUtils.html
+ant/docs/manual/api/org/apache/tools/ant/util/CompositeMapper.html
+ant/docs/manual/api/org/apache/tools/ant/util/ConcatFileInputStream.html
+ant/docs/manual/api/org/apache/tools/ant/util/ContainerMapper.html
 ant/docs/manual/api/org/apache/tools/ant/util/DOMElementWriter.html
 ant/docs/manual/api/org/apache/tools/ant/util/DateUtils.html
 ant/docs/manual/api/org/apache/tools/ant/util/FileNameMapper.html
@@ -1170,10 +1170,13 @@ ant/docs/manual/api/org/apache/tools/ant/util/KeepAliveInputStream.html
 ant/docs/manual/api/org/apache/tools/ant/util/KeepAliveOutputStream.html
 ant/docs/manual/api/org/apache/tools/ant/util/LazyFileOutputStream.html
 ant/docs/manual/api/org/apache/tools/ant/util/LazyHashtable.html
+ant/docs/manual/api/org/apache/tools/ant/util/LeadPipeInputStream.html
 ant/docs/manual/api/org/apache/tools/ant/util/LineTokenizer.html
 ant/docs/manual/api/org/apache/tools/ant/util/LoaderUtils.html
 ant/docs/manual/api/org/apache/tools/ant/util/MergingMapper.html
+ant/docs/manual/api/org/apache/tools/ant/util/OutputStreamFunneler.html
 ant/docs/manual/api/org/apache/tools/ant/util/PackageNameMapper.html
+ant/docs/manual/api/org/apache/tools/ant/util/ReaderInputStream.html
 ant/docs/manual/api/org/apache/tools/ant/util/RegexpPatternMapper.html
 ant/docs/manual/api/org/apache/tools/ant/util/ResourceUtils.html
 ant/docs/manual/api/org/apache/tools/ant/util/ScriptRunner.html
@@ -1187,46 +1190,44 @@ ant/docs/manual/api/org/apache/tools/ant/util/UnPackageNameMapper.html
 ant/docs/manual/api/org/apache/tools/ant/util/Watchdog.html
 ant/docs/manual/api/org/apache/tools/ant/util/WeakishReference.HardReference.html
 ant/docs/manual/api/org/apache/tools/ant/util/WeakishReference.html
+ant/docs/manual/api/org/apache/tools/ant/util/depend/AbstractAnalyzer.html
+ant/docs/manual/api/org/apache/tools/ant/util/depend/DependencyAnalyzer.html
+ant/docs/manual/api/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.html
+ant/docs/manual/api/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.html
+ant/docs/manual/api/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.html
+ant/docs/manual/api/org/apache/tools/ant/util/depend/bcel/package-frame.html
+ant/docs/manual/api/org/apache/tools/ant/util/depend/bcel/package-summary.html
+ant/docs/manual/api/org/apache/tools/ant/util/depend/bcel/package-tree.html
+ant/docs/manual/api/org/apache/tools/ant/util/depend/package-frame.html
+ant/docs/manual/api/org/apache/tools/ant/util/depend/package-summary.html
+ant/docs/manual/api/org/apache/tools/ant/util/depend/package-tree.html
+ant/docs/manual/api/org/apache/tools/ant/util/facade/FacadeTaskHelper.html
+ant/docs/manual/api/org/apache/tools/ant/util/facade/ImplementationSpecificArgument.html
+ant/docs/manual/api/org/apache/tools/ant/util/facade/package-frame.html
+ant/docs/manual/api/org/apache/tools/ant/util/facade/package-summary.html
+ant/docs/manual/api/org/apache/tools/ant/util/facade/package-tree.html
+ant/docs/manual/api/org/apache/tools/ant/util/optional/NoExitSecurityManager.html
+ant/docs/manual/api/org/apache/tools/ant/util/optional/WeakishReference12.html
+ant/docs/manual/api/org/apache/tools/ant/util/optional/package-frame.html
+ant/docs/manual/api/org/apache/tools/ant/util/optional/package-summary.html
+ant/docs/manual/api/org/apache/tools/ant/util/optional/package-tree.html
 ant/docs/manual/api/org/apache/tools/ant/util/package-frame.html
 ant/docs/manual/api/org/apache/tools/ant/util/package-summary.html
 ant/docs/manual/api/org/apache/tools/ant/util/package-tree.html
-ant/docs/manual/api/org/apache/tools/ant/AntClassLoader.html
-ant/docs/manual/api/org/apache/tools/ant/AntTypeDefinition.html
-ant/docs/manual/api/org/apache/tools/ant/BuildEvent.html
-ant/docs/manual/api/org/apache/tools/ant/BuildException.html
-ant/docs/manual/api/org/apache/tools/ant/BuildListener.html
-ant/docs/manual/api/org/apache/tools/ant/BuildLogger.html
-ant/docs/manual/api/org/apache/tools/ant/ComponentHelper.html
-ant/docs/manual/api/org/apache/tools/ant/DefaultLogger.html
-ant/docs/manual/api/org/apache/tools/ant/DemuxInputStream.html
-ant/docs/manual/api/org/apache/tools/ant/DemuxOutputStream.html
-ant/docs/manual/api/org/apache/tools/ant/Diagnostics.html
-ant/docs/manual/api/org/apache/tools/ant/DirectoryScanner.html
-ant/docs/manual/api/org/apache/tools/ant/DynamicConfigurator.html
-ant/docs/manual/api/org/apache/tools/ant/ExitException.html
-ant/docs/manual/api/org/apache/tools/ant/FileScanner.html
-ant/docs/manual/api/org/apache/tools/ant/IntrospectionHelper.Creator.html
-ant/docs/manual/api/org/apache/tools/ant/IntrospectionHelper.html
-ant/docs/manual/api/org/apache/tools/ant/Location.html
-ant/docs/manual/api/org/apache/tools/ant/MagicNames.html
-ant/docs/manual/api/org/apache/tools/ant/Main.html
-ant/docs/manual/api/org/apache/tools/ant/NoBannerLogger.html
-ant/docs/manual/api/org/apache/tools/ant/PathTokenizer.html
-ant/docs/manual/api/org/apache/tools/ant/Project.html
-ant/docs/manual/api/org/apache/tools/ant/ProjectComponent.html
-ant/docs/manual/api/org/apache/tools/ant/ProjectHelper.html
-ant/docs/manual/api/org/apache/tools/ant/PropertyHelper.html
-ant/docs/manual/api/org/apache/tools/ant/RuntimeConfigurable.html
-ant/docs/manual/api/org/apache/tools/ant/Target.html
-ant/docs/manual/api/org/apache/tools/ant/Task.html
-ant/docs/manual/api/org/apache/tools/ant/TaskAdapter.html
-ant/docs/manual/api/org/apache/tools/ant/TaskContainer.html
-ant/docs/manual/api/org/apache/tools/ant/TypeAdapter.html
-ant/docs/manual/api/org/apache/tools/ant/UnknownElement.html
-ant/docs/manual/api/org/apache/tools/ant/XmlLogger.html
-ant/docs/manual/api/org/apache/tools/ant/package-frame.html
-ant/docs/manual/api/org/apache/tools/ant/package-summary.html
-ant/docs/manual/api/org/apache/tools/ant/package-tree.html
+ant/docs/manual/api/org/apache/tools/ant/util/regexp/JakartaOroMatcher.html
+ant/docs/manual/api/org/apache/tools/ant/util/regexp/JakartaOroRegexp.html
+ant/docs/manual/api/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.html
+ant/docs/manual/api/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.html
+ant/docs/manual/api/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.html
+ant/docs/manual/api/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.html
+ant/docs/manual/api/org/apache/tools/ant/util/regexp/Regexp.html
+ant/docs/manual/api/org/apache/tools/ant/util/regexp/RegexpFactory.html
+ant/docs/manual/api/org/apache/tools/ant/util/regexp/RegexpMatcher.html
+ant/docs/manual/api/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.html
+ant/docs/manual/api/org/apache/tools/ant/util/regexp/RegexpUtil.html
+ant/docs/manual/api/org/apache/tools/ant/util/regexp/package-frame.html
+ant/docs/manual/api/org/apache/tools/ant/util/regexp/package-summary.html
+ant/docs/manual/api/org/apache/tools/ant/util/regexp/package-tree.html
 ant/docs/manual/api/org/apache/tools/bzip2/BZip2Constants.html
 ant/docs/manual/api/org/apache/tools/bzip2/CBZip2InputStream.html
 ant/docs/manual/api/org/apache/tools/bzip2/CBZip2OutputStream.html
@@ -1261,13 +1262,6 @@ ant/docs/manual/api/org/apache/tools/zip/ZipShort.html
 ant/docs/manual/api/org/apache/tools/zip/package-frame.html
 ant/docs/manual/api/org/apache/tools/zip/package-summary.html
 ant/docs/manual/api/org/apache/tools/zip/package-tree.html
-ant/docs/manual/api/allclasses-frame.html
-ant/docs/manual/api/allclasses-noframe.html
-ant/docs/manual/api/constant-values.html
-ant/docs/manual/api/deprecated-list.html
-ant/docs/manual/api/help-doc.html
-ant/docs/manual/api/index-all.html
-ant/docs/manual/api/index.html
 ant/docs/manual/api/overview-frame.html
 ant/docs/manual/api/overview-summary.html
 ant/docs/manual/api/overview-tree.html
@@ -1275,10 +1269,6 @@ ant/docs/manual/api/package-list
 ant/docs/manual/api/packages.html
 ant/docs/manual/api/serialized-form.html
 ant/docs/manual/api/stylesheet.css
-ant/docs/manual/stylesheets/antmanual.css
-ant/docs/manual/LICENSE
-ant/docs/manual/antexternal.html
-ant/docs/manual/anttaskslist.html
 ant/docs/manual/base_task_classes.html
 ant/docs/manual/conceptstypeslist.html
 ant/docs/manual/coretasklist.html
@@ -1300,6 +1290,7 @@ ant/docs/manual/optionaltasklist.html
 ant/docs/manual/platform.html
 ant/docs/manual/running.html
 ant/docs/manual/runninglist.html
+ant/docs/manual/stylesheets/antmanual.css
 ant/docs/manual/sysclasspath.html
 ant/docs/manual/tasksoverview.html
 ant/docs/manual/toc.html
@@ -1307,8 +1298,12 @@ ant/docs/manual/tutorial-writing-tasks-src.zip
 ant/docs/manual/tutorial-writing-tasks.html
 ant/docs/manual/using.html
 ant/docs/manual/usinglist.html
-ant/docs/projects/antidote/images/screenshot.jpg
+ant/docs/mission.html
+ant/docs/page.css
+ant/docs/problems.html
+ant/docs/projects.html
 ant/docs/projects/antidote/design.html
+ant/docs/projects/antidote/images/screenshot.jpg
 ant/docs/projects/antidote/index.html
 ant/docs/projects/antidote/module.html
 ant/docs/projects/antlib/antlib_classloaders.html
@@ -1319,117 +1314,141 @@ ant/docs/projects/antlib/antlib_roadmap.html
 ant/docs/projects/antlib/index.html
 ant/docs/projects/antlib/roles.html
 ant/docs/projects/index.html
-ant/docs/LICENSE
-ant/docs/ant_in_anger.html
-ant/docs/ant_task_guidelines.html
-ant/docs/antnews.html
-ant/docs/appendix_e.pdf
-ant/docs/breadcrumbs.js
-ant/docs/bylaws.html
-ant/docs/contributors.html
-ant/docs/cvs.html
-ant/docs/external.html
-ant/docs/faq.html
-ant/docs/favicon.ico
-ant/docs/index.html
-ant/docs/legal.html
-ant/docs/license.html
-ant/docs/mail.html
-ant/docs/mission.html
-ant/docs/page.css
-ant/docs/problems.html
-ant/docs/projects.html
 ant/docs/resources.html
+ant/etc/ant-bootstrap.jar
+ant/etc/changelog.xsl
+ant/etc/checkstyle/checkstyle-frames.xsl
+ant/etc/checkstyle/checkstyle-text.xsl
+ant/etc/checkstyle/checkstyle-xdoc.xsl
+ant/etc/coverage-frames.xsl
+ant/etc/jdepend-frames.xsl
+ant/etc/jdepend.xsl
+ant/etc/junit-frames-xalan1.xsl
+ant/etc/junit-frames.xsl
+ant/etc/junit-noframes.xsl
+ant/etc/log.xsl
+ant/etc/maudit-frames.xsl
+ant/etc/mmetrics-frames.xsl
+ant/etc/tagdiff.xsl
+ant/lib/README
+ant/lib/ant-antlr.jar
+ant/lib/ant-apache-bcel.jar
+ant/lib/ant-apache-bsf.jar
+ant/lib/ant-apache-log4j.jar
+ant/lib/ant-apache-oro.jar
+ant/lib/ant-apache-regexp.jar
+ant/lib/ant-apache-resolver.jar
+ant/lib/ant-commons-logging.jar
+ant/lib/ant-commons-net.jar
+ant/lib/ant-icontract.jar
+ant/lib/ant-jai.jar
+ant/lib/ant-javamail.jar
+ant/lib/ant-jdepend.jar
+ant/lib/ant-jmf.jar
+ant/lib/ant-jsch.jar
+ant/lib/ant-junit.jar
+ant/lib/ant-launcher.jar
+ant/lib/ant-netrexx.jar
+ant/lib/ant-nodeps.jar
+ant/lib/ant-starteam.jar
+ant/lib/ant-stylebook.jar
+ant/lib/ant-swing.jar
+ant/lib/ant-trax.jar
+ant/lib/ant-vaj.jar
+ant/lib/ant-weblogic.jar
+ant/lib/ant-xalan1.jar
+ant/lib/ant-xslp.jar
+ant/lib/ant.jar
+ant/lib/xercesImpl.jar
+ant/lib/xml-apis.jar
 bin/ant
-share/nls/POSIX
-share/nls/en_US.US-ASCII
-@dirrm ant/bin
 @dirrm ant/lib
 @dirrm ant/etc/checkstyle
 @dirrm ant/etc
-@dirrm ant/docs/ant2
-@dirrm ant/docs/images
-@dirrm ant/docs/manual/CoreTasks
-@dirrm ant/docs/manual/CoreTypes
-@dirrm ant/docs/manual/Integration
-@dirrm ant/docs/manual/OptionalTasks
-@dirrm ant/docs/manual/OptionalTypes
-@dirrm ant/docs/manual/api/org/apache/tools/ant/filters/util
-@dirrm ant/docs/manual/api/org/apache/tools/ant/filters
-@dirrm ant/docs/manual/api/org/apache/tools/ant/helper
-@dirrm ant/docs/manual/api/org/apache/tools/ant/input
-@dirrm ant/docs/manual/api/org/apache/tools/ant/launch
-@dirrm ant/docs/manual/api/org/apache/tools/ant/listener
-@dirrm ant/docs/manual/api/org/apache/tools/ant/loader
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/compilers
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/condition
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/cvslib
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/email
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ccm
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ejb
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/i18n
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ide
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/image
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/javacc
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jlink
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/junit
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/metamata
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/net
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/perforce
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/scm
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/script
+@dirrm ant/docs/projects/antlib
+@dirrm ant/docs/projects/antidote/images
+@dirrm ant/docs/projects/antidote
+@dirrm ant/docs/projects
+@dirrm ant/docs/manual/stylesheets
+@dirrm ant/docs/manual/api/org/apache/tools/zip
+@dirrm ant/docs/manual/api/org/apache/tools/tar
+@dirrm ant/docs/manual/api/org/apache/tools/mail
+@dirrm ant/docs/manual/api/org/apache/tools/bzip2
+@dirrm ant/docs/manual/api/org/apache/tools/ant/util/regexp
+@dirrm ant/docs/manual/api/org/apache/tools/ant/util/optional
+@dirrm ant/docs/manual/api/org/apache/tools/ant/util/facade
+@dirrm ant/docs/manual/api/org/apache/tools/ant/util/depend/bcel
+@dirrm ant/docs/manual/api/org/apache/tools/ant/util/depend
+@dirrm ant/docs/manual/api/org/apache/tools/ant/util
+@dirrm ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector
+@dirrm ant/docs/manual/api/org/apache/tools/ant/types/selectors
+@dirrm ant/docs/manual/api/org/apache/tools/ant/types/resolver
+@dirrm ant/docs/manual/api/org/apache/tools/ant/types/optional/image
+@dirrm ant/docs/manual/api/org/apache/tools/ant/types/optional/depend
+@dirrm ant/docs/manual/api/org/apache/tools/ant/types/optional
+@dirrm ant/docs/manual/api/org/apache/tools/ant/types
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/rmic
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/windows
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/vss
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/unix
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/starteam
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ssh
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/splash
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sound
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sos
 @dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes
 @dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode
 @dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sitraka
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sos
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/sound
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/splash
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ssh
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/starteam
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/unix
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/vss
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/windows
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/script
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/scm
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/perforce
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/net
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/metamata
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/junit
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jsp
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jlink
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/javacc
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/image
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ide
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/i18n
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/extension
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ejb
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/depend
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional/ccm
 @dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/optional
-@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/rmic
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/email
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/cvslib
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/condition
+@dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs/compilers
 @dirrm ant/docs/manual/api/org/apache/tools/ant/taskdefs
-@dirrm ant/docs/manual/api/org/apache/tools/ant/types/optional/depend
-@dirrm ant/docs/manual/api/org/apache/tools/ant/types/optional/image
-@dirrm ant/docs/manual/api/org/apache/tools/ant/types/optional
-@dirrm ant/docs/manual/api/org/apache/tools/ant/types/resolver
-@dirrm ant/docs/manual/api/org/apache/tools/ant/types/selectors/modifiedselector
-@dirrm ant/docs/manual/api/org/apache/tools/ant/types/selectors
-@dirrm ant/docs/manual/api/org/apache/tools/ant/types
-@dirrm ant/docs/manual/api/org/apache/tools/ant/util/depend/bcel
-@dirrm ant/docs/manual/api/org/apache/tools/ant/util/depend
-@dirrm ant/docs/manual/api/org/apache/tools/ant/util/facade
-@dirrm ant/docs/manual/api/org/apache/tools/ant/util/optional
-@dirrm ant/docs/manual/api/org/apache/tools/ant/util/regexp
-@dirrm ant/docs/manual/api/org/apache/tools/ant/util
+@dirrm ant/docs/manual/api/org/apache/tools/ant/loader
+@dirrm ant/docs/manual/api/org/apache/tools/ant/listener
+@dirrm ant/docs/manual/api/org/apache/tools/ant/launch
+@dirrm ant/docs/manual/api/org/apache/tools/ant/input
+@dirrm ant/docs/manual/api/org/apache/tools/ant/helper
+@dirrm ant/docs/manual/api/org/apache/tools/ant/filters/util
+@dirrm ant/docs/manual/api/org/apache/tools/ant/filters
 @dirrm ant/docs/manual/api/org/apache/tools/ant
-@dirrm ant/docs/manual/api/org/apache/tools/bzip2
-@dirrm ant/docs/manual/api/org/apache/tools/mail
-@dirrm ant/docs/manual/api/org/apache/tools/tar
-@dirrm ant/docs/manual/api/org/apache/tools/zip
 @dirrm ant/docs/manual/api/org/apache/tools
 @dirrm ant/docs/manual/api/org/apache
 @dirrm ant/docs/manual/api/org
 @dirrm ant/docs/manual/api
-@dirrm ant/docs/manual/stylesheets
+@dirrm ant/docs/manual/OptionalTypes
+@dirrm ant/docs/manual/OptionalTasks
+@dirrm ant/docs/manual/Integration
+@dirrm ant/docs/manual/CoreTypes
+@dirrm ant/docs/manual/CoreTasks
 @dirrm ant/docs/manual
-@dirrm ant/docs/projects/antidote/images
-@dirrm ant/docs/projects/antidote
-@dirrm ant/docs/projects/antlib
-@dirrm ant/docs/projects
+@dirrm ant/docs/images
+@dirrm ant/docs/ant2
 @dirrm ant/docs
+@dirrm ant/bin
 @dirrm ant