16501485 Update Ant to 1.9.3 release s11-update
authorPetr Sumbera <petr.sumbera@oracle.com>
Mon, 23 Feb 2015 02:07:40 -0800
branchs11-update
changeset 3849 795cb0b252f8
parent 3830 d9fd82448491
child 3853 966a0e59a023
16501485 Update Ant to 1.9.3 release
components/ant/Makefile
components/ant/ant.p5m
components/ant/patches/tests.patch
--- a/components/ant/Makefile	Wed Feb 18 12:08:43 2015 -0800
+++ b/components/ant/Makefile	Mon Feb 23 02:07:40 2015 -0800
@@ -20,23 +20,23 @@
 #
 
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		ant
-COMPONENT_VERSION=	1.8.4
+COMPONENT_VERSION=	1.9.3
 COMPONENT_PROJECT_URL=	http://ant.apache.org/
 COMPONENT_SRC_NAME=	apache-ant
 COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC)-src.tar.bz2
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1
+    sha256:eb9306e8b8322bb09b78cc3d8e288398f9cb657d76ffc61ee3fb175e786e8365
 COMPONENT_ARCHIVE_URL=	http://archive.apache.org/dist/ant/source/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/ant
 
-TPNO=			6147
+TPNO=			16382
 
 include ../../make-rules/prep.mk
 include ../../make-rules/justmake.mk
@@ -69,6 +69,8 @@
 COMPONENT_TEST_TARGETS =	test
 COMPONENT_TEST_ENV +=		$(ANT_ENV)
 
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
 build:	$(BUILD_32)
 
 install: $(INSTALL_32)
--- a/components/ant/ant.p5m	Wed Feb 18 12:08:43 2015 -0800
+++ b/components/ant/ant.p5m	Mon Feb 23 02:07:40 2015 -0800
@@ -36,25 +36,17 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2002/232
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir  path=usr
-dir  path=usr/bin
 file path=usr/bin/ant
 file path=usr/bin/antRun
 file path=usr/bin/antRun.pl
 file path=usr/bin/complete-ant-cmd.pl
 file path=usr/bin/runant.pl
-dir  path=usr/sfw
-dir  path=usr/sfw/bin
 link path=usr/sfw/bin/ant target=../../bin/ant
 link path=usr/sfw/bin/antRun target=../../bin/antRun
 link path=usr/sfw/bin/antRun.pl target=../../bin/antRun.pl
 link path=usr/sfw/bin/complete-ant-cmd.pl target=../../bin/complete-ant-cmd.pl
 link path=usr/sfw/bin/runant.pl target=../../bin/runant.pl
-dir  path=usr/sfw/lib
 link path=usr/sfw/lib/ant target=../../share/lib/ant
-dir  path=usr/share
-dir  path=usr/share/doc
-dir  path=usr/share/doc/ant
 file path=usr/share/doc/ant/INSTALL
 file path=usr/share/doc/ant/KEYS
 file path=usr/share/doc/ant/LICENSE
@@ -63,14 +55,11 @@
 file path=usr/share/doc/ant/WHATSNEW
 file path=usr/share/doc/ant/fetch.xml
 file path=usr/share/doc/ant/get-m2.xml
-dir  path=usr/share/doc/ant/manual
-dir  path=usr/share/doc/ant/manual/Integration
 file path=usr/share/doc/ant/manual/Integration/anttool1.gif
 file path=usr/share/doc/ant/manual/Integration/jext-plugin.html
 file path=usr/share/doc/ant/manual/Integration/remacc.gif
 file path=usr/share/doc/ant/manual/Integration/toolmenu.gif
 file path=usr/share/doc/ant/manual/LICENSE
-dir  path=usr/share/doc/ant/manual/Tasks
 file path=usr/share/doc/ant/manual/Tasks/BorlandEJBTasks.html
 file path=usr/share/doc/ant/manual/Tasks/BorlandGenerateClient.html
 file path=usr/share/doc/ant/manual/Tasks/ant.html
@@ -170,7 +159,6 @@
 file path=usr/share/doc/ant/manual/Tasks/parallel.html
 file path=usr/share/doc/ant/manual/Tasks/patch.html
 file path=usr/share/doc/ant/manual/Tasks/pathconvert.html
-file path=usr/share/doc/ant/manual/Tasks/perforce.html
 file path=usr/share/doc/ant/manual/Tasks/presetdef.html
 file path=usr/share/doc/ant/manual/Tasks/projecthelper.html
 file path=usr/share/doc/ant/manual/Tasks/property.html
@@ -219,6 +207,7 @@
 file path=usr/share/doc/ant/manual/Tasks/untar.html
 file path=usr/share/doc/ant/manual/Tasks/unzip.html
 file path=usr/share/doc/ant/manual/Tasks/uptodate.html
+file path=usr/share/doc/ant/manual/Tasks/verifyjar.html
 file path=usr/share/doc/ant/manual/Tasks/vss.html
 file path=usr/share/doc/ant/manual/Tasks/waitfor.html
 file path=usr/share/doc/ant/manual/Tasks/war.html
@@ -227,7 +216,6 @@
 file path=usr/share/doc/ant/manual/Tasks/xmlproperty.html
 file path=usr/share/doc/ant/manual/Tasks/xmlvalidate.html
 file path=usr/share/doc/ant/manual/Tasks/zip.html
-dir  path=usr/share/doc/ant/manual/Types
 file path=usr/share/doc/ant/manual/Types/antlib.html
 file path=usr/share/doc/ant/manual/Types/assertions.html
 file path=usr/share/doc/ant/manual/Types/classfileset.html
@@ -255,7 +243,6 @@
 file path=usr/share/doc/ant/manual/Types/zipfileset.html
 file path=usr/share/doc/ant/manual/antexternal.html
 file path=usr/share/doc/ant/manual/anttaskslist.html
-dir  path=usr/share/doc/ant/manual/api
 file path=usr/share/doc/ant/manual/api/allclasses-frame.html
 file path=usr/share/doc/ant/manual/api/allclasses-noframe.html
 file path=usr/share/doc/ant/manual/api/constant-values.html
@@ -263,17 +250,16 @@
 file path=usr/share/doc/ant/manual/api/help-doc.html
 file path=usr/share/doc/ant/manual/api/index-all.html
 file path=usr/share/doc/ant/manual/api/index.html
-dir  path=usr/share/doc/ant/manual/api/org
-dir  path=usr/share/doc/ant/manual/api/org/apache
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/AntClassLoader.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/AntTypeDefinition.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/ArgumentProcessor.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/ArgumentProcessorRegistry.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/BuildEvent.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/BuildException.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/BuildListener.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/BuildLogger.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/ComponentHelper.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DefaultDefinitions.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DefaultLogger.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DemuxInputStream.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DemuxOutputStream.html
@@ -285,6 +271,8 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DynamicConfiguratorNS.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DynamicElement.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DynamicElementNS.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DynamicObjectAttribute.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/Evaluable.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/Executor.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/ExitException.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/ExitStatusException.html
@@ -318,14 +306,24 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/UnsupportedAttributeException.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/UnsupportedElementException.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/XmlLogger.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/dispatch
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/attribute/AttributeNamespace.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/attribute/BaseIfAttribute.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/attribute/EnableAttribute.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/attribute/IfBlankAttribute.Unless.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/attribute/IfBlankAttribute.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/attribute/IfSetAttribute.Unless.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/attribute/IfSetAttribute.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/attribute/IfTrueAttribute.Unless.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/attribute/IfTrueAttribute.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/attribute/package-frame.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/attribute/package-summary.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/attribute/package-tree.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/dispatch/DispatchTask.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/dispatch/DispatchUtils.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/dispatch/Dispatchable.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/dispatch/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/dispatch/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/dispatch/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/BaseFilterReader.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/BaseParamFilterReader.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/ChainableReader.html
@@ -368,13 +366,11 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/util
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/util/ChainReaderHelper.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/util/JavaClassHelper.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/util/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/util/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/util/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/AntXMLContext.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/DefaultExecutor.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/IgnoreDependenciesExecutor.html
@@ -390,7 +386,6 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/input
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/input/DefaultInputHandler.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/input/GreedyInputHandler.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/input/InputHandler.html
@@ -401,7 +396,6 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/input/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/input/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/input/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/launch
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/launch/AntMain.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/launch/LaunchException.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/launch/Launcher.html
@@ -409,19 +403,18 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/launch/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/launch/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/launch/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/AnsiColorLogger.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/BigProjectLogger.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/CommonsLoggingListener.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/Log4jListener.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/MailLogger.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/ProfileLogger.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/SilentLogger.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/SimpleBigProjectLogger.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/TimestampedLogger.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/loader
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/loader/AntClassLoader2.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/loader/AntClassLoader5.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/loader/package-frame.html
@@ -430,7 +423,6 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/property
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/property/GetProperty.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/property/LocalProperties.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/property/LocalPropertyStack.html
@@ -442,7 +434,6 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/property/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/property/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/property/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/AbstractCvsTask.Module.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/AbstractCvsTask.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.html
@@ -455,6 +446,7 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/AntlibDefinition.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Apt.Option.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Apt.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/AttributeNamespaceDef.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/AugmentReference.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Available.FileDir.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Available.html
@@ -470,6 +462,7 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Chmod.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Classloader.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/CloseResources.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/CommandLauncherTask.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Componentdef.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Concat.TextElement.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Concat.html
@@ -642,12 +635,14 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTLiaison.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTLiaison2.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTLiaison3.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTLiaison4.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTLogger.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTLoggerAware.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.Factory.Attribute.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.Factory.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.OutputProperty.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.Param.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.ParamType.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.TraceConfiguration.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XmlProperty.html
@@ -655,8 +650,8 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Zip.Duplicate.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Zip.UnicodeExtraField.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Zip.WhenEmpty.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Zip.Zip64ModeAttribute.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Zip.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/AptCompilerAdapter.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/AptExternalCompilerAdapter.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/CompilerAdapter.html
@@ -674,7 +669,6 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/And.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/AntVersion.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/Condition.html
@@ -709,7 +703,6 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib/CVSEntry.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.html
@@ -720,7 +713,6 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email/EmailAddress.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email/EmailTask.Encoding.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email/EmailTask.html
@@ -731,7 +723,18 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/launcher/CommandLauncher.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/launcher/CommandLauncherProxy.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/launcher/Java13CommandLauncher.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/launcher/MacCommandLauncher.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/launcher/OS2CommandLauncher.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/launcher/PerlScriptCommandLauncher.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/launcher/ScriptCommandLauncher.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/launcher/VmsCommandLauncher.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/launcher/WinNTCommandLauncher.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/launcher/package-frame.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/launcher/package-summary.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/launcher/package-tree.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ANTLR.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/Cab.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/EchoProperties.FormatAttribute.html
@@ -760,7 +763,6 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/XSLTTraceSupport.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckin.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckinDefault.html
@@ -771,7 +773,6 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCLock.html
@@ -789,7 +790,6 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.html
@@ -797,7 +797,6 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/Depend.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ClassCPInfo.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantCPInfo.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.html
@@ -807,8 +806,12 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FloatCPInfo.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/IntegerCPInfo.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/InterfaceMethodRefCPInfo.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/InvokeDynamicCPInfo.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/LongCPInfo.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodHandleCPInfo.ReferenceKind.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodHandleCPInfo.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodRefCPInfo.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodTypeCPInfo.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/NameAndTypeCPInfo.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/StringCPInfo.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/Utf8CPInfo.html
@@ -818,7 +821,6 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.html
@@ -841,7 +843,6 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/Compatability.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/Compatibility.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/DeweyDecimal.html
@@ -860,24 +861,20 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/LocationResolver.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/i18n
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/i18n/Translate.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/i18n/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/i18n/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/i18n/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/image
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/image/Image.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/image/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/image/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/image/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee/AbstractHotDeploymentTool.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymentTool.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee/HotDeploymentTool.html
@@ -887,14 +884,12 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/Gcjh.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapter.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.html
@@ -903,27 +898,23 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.FormatAttribute.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jlink
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jlink/jlink.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jlink/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jlink/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jlink/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/JspC.WebAppParameter.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/JspC.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/JspMangler.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapter.html
@@ -934,13 +925,13 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.Format.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/Constants.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/CustomJUnit4TestAdapterCache.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.NodeFilter.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.NodeListImpl.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.html
@@ -949,6 +940,8 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.TypeAttribute.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/IgnoredTestListener.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/IgnoredTestResult.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitResultFormatter.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.ForkMode.html
@@ -969,13 +962,14 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/TearDownOnVmCrash.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/TestIgnored.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/TestListenerWrapper.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/XMLConstants.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/DefaultNative2Ascii.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapter.html
@@ -984,7 +978,6 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.Action.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.FTPDirectoryScanner.AntFTPFile.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.FTPDirectoryScanner.AntFTPRootFile.html
@@ -1022,39 +1015,11 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Delete.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Edit.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Fstat.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Handler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Have.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Integrate.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Labelsync.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4OutputHandler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4OutputStream.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Resolve.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.P4SubmitAdapter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/SimpleP4OutputHandler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs/PvcsProject.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/script
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.Attribute.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.NestedElement.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.html
@@ -1062,7 +1027,6 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/script/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/script/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/script/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sos
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sos/SOS.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckin.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckout.html
@@ -1072,19 +1036,16 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sos/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sos/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sos/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sound
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.BuildAlert.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sound/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sound/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sound/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/splash
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/splash/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/splash/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/splash/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/Directory.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/LogListener.html
@@ -1103,14 +1064,12 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/testing
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/testing/BlockFor.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/testing/BuildTimeoutException.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/testing/Funtest.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/testing/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/testing/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/testing/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/unix
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/unix/Chgrp.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/unix/Chown.html
@@ -1118,7 +1077,6 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/unix/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/unix/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/unix/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.CurrentModUpdated.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.WritableFiles.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.html
@@ -1135,7 +1093,6 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/windows
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/windows/Attrib.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/windows/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/windows/package-summary.html
@@ -1143,7 +1100,6 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/ForkingSunRmic.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.html
@@ -1155,7 +1111,6 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/AbstractFileSet.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/AntFilterReader.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/ArchiveFileSet.html
@@ -1216,26 +1171,22 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/XMLCatalog.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/ZipFileSet.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/ZipScanner.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/mappers
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/mappers/CutDirsMapper.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/mappers/FilterMapper.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/mappers/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/mappers/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/mappers/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/AbstractScriptComponent.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/ScriptCondition.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/ScriptFilter.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/ScriptMapper.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/ScriptSelector.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/depend
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/depend/ClassfileSet.ClassRoot.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/depend/ClassfileSet.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/depend/DependScanner.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/depend/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/depend/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/depend/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/Arc.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/BasicShape.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/ColorMapper.html
@@ -1258,13 +1209,11 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resolver
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resolver/ApacheCatalog.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resolver/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resolver/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resolver/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/AbstractClasspathResource.ClassLoaderWithFlag.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/AbstractClasspathResource.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/AbstractResourceCollectionWrapper.html
@@ -1308,7 +1257,6 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/URLResource.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/Union.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/ZipResource.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/Content.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/Date.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.html
@@ -1325,7 +1273,6 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/And.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/Compare.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/Date.html
@@ -1344,7 +1291,6 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/AndSelector.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/BaseExtendSelector.html
@@ -1382,7 +1328,6 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/TypeSelector.FileType.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/TypeSelector.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/WritableSelector.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/Algorithm.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/Cache.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/ChecksumAlgorithm.html
@@ -1400,13 +1345,11 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/spi
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/spi/Provider.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/spi/Service.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/spi/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/spi/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/spi/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/Base64Converter.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ChainedMapper.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ClasspathUtils.Delegate.html
@@ -1481,10 +1424,8 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/XMLFragment.Child.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/XMLFragment.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/XmlConstants.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/AbstractAnalyzer.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/DependencyAnalyzer.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/bcel
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.html
@@ -1494,18 +1435,15 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/facade
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/facade/FacadeTaskHelper.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/facade/ImplementationSpecificArgument.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/facade/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/facade/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/facade/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/java15
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/java15/ProxyDiagnostics.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/java15/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/java15/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/java15/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/optional
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/optional/JavaxScriptRunner.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/optional/NoExitSecurityManager.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/optional/ScriptRunner.html
@@ -1516,7 +1454,6 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/JakartaOroMatcher.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/JakartaOroRegexp.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.html
@@ -1531,21 +1468,19 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/bzip2
 file path=usr/share/doc/ant/manual/api/org/apache/tools/bzip2/BZip2Constants.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/bzip2/CBZip2InputStream.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/bzip2/CBZip2OutputStream.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/bzip2/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/bzip2/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/bzip2/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/mail
 file path=usr/share/doc/ant/manual/api/org/apache/tools/mail/ErrorInQuitException.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/mail/MailMessage.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/mail/SmtpResponseReader.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/mail/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/mail/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/mail/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/tar
+file path=usr/share/doc/ant/manual/api/org/apache/tools/tar/TarArchiveSparseEntry.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/tar/TarBuffer.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/tar/TarConstants.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/tar/TarEntry.html
@@ -1555,18 +1490,26 @@
 file path=usr/share/doc/ant/manual/api/org/apache/tools/tar/package-frame.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/tar/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/tar/package-tree.html
-dir  path=usr/share/doc/ant/manual/api/org/apache/tools/zip
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/AbstractUnicodeExtraField.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/AsiExtraField.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/CentralDirectoryParsingZipExtraField.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/ExtraFieldUtils.UnparseableExtraField.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/ExtraFieldUtils.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/GeneralPurposeBit.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/JarMarker.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/UnicodeCommentExtraField.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/UnicodePathExtraField.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/UnixStat.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/UnparseableExtraFieldData.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/UnrecognizedExtraField.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/UnsupportedZipFeatureException.Feature.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/UnsupportedZipFeatureException.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/Zip64ExtendedInformationExtraField.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/Zip64Mode.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/Zip64RequiredException.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/ZipEightByteInteger.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/ZipEncoding.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/ZipEncodingHelper.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/ZipEntry.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/ZipExtraField.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/ZipFile.html
@@ -1582,13 +1525,13 @@
 file path=usr/share/doc/ant/manual/api/overview-summary.html
 file path=usr/share/doc/ant/manual/api/overview-tree.html
 file path=usr/share/doc/ant/manual/api/package-list
-dir  path=usr/share/doc/ant/manual/api/resources
 file path=usr/share/doc/ant/manual/api/resources/background.gif
 file path=usr/share/doc/ant/manual/api/resources/tab.gif
 file path=usr/share/doc/ant/manual/api/resources/titlebar.gif
 file path=usr/share/doc/ant/manual/api/resources/titlebar_end.gif
 file path=usr/share/doc/ant/manual/api/serialized-form.html
 file path=usr/share/doc/ant/manual/api/stylesheet.css
+file path=usr/share/doc/ant/manual/argumentprocessor.html
 file path=usr/share/doc/ant/manual/base_task_classes.html
 file path=usr/share/doc/ant/manual/clonevm.html
 file path=usr/share/doc/ant/manual/conceptstypeslist.html
@@ -1600,7 +1543,7 @@
 file path=usr/share/doc/ant/manual/favicon.ico
 file path=usr/share/doc/ant/manual/feedback.html
 file path=usr/share/doc/ant/manual/ide.html
-dir  path=usr/share/doc/ant/manual/images
+file path=usr/share/doc/ant/manual/ifunless.html
 file path=usr/share/doc/ant/manual/images/ant_logo_large.gif
 file path=usr/share/doc/ant/manual/index.html
 file path=usr/share/doc/ant/manual/inputhandler.html
@@ -1615,7 +1558,6 @@
 file path=usr/share/doc/ant/manual/proxy.html
 file path=usr/share/doc/ant/manual/running.html
 file path=usr/share/doc/ant/manual/runninglist.html
-dir  path=usr/share/doc/ant/manual/stylesheets
 file path=usr/share/doc/ant/manual/stylesheets/antmanual.css
 file path=usr/share/doc/ant/manual/stylesheets/style.css
 file path=usr/share/doc/ant/manual/sysclasspath.html
@@ -1631,8 +1573,6 @@
 file path=usr/share/doc/ant/manual/tutorials.html
 file path=usr/share/doc/ant/manual/using.html
 file path=usr/share/doc/ant/manual/usinglist.html
-dir  path=usr/share/lib
-dir  path=usr/share/lib/ant
 file path=usr/share/lib/ant/README
 file path=usr/share/lib/ant/ant-antlr.jar
 file path=usr/share/lib/ant/ant-antlr.pom
@@ -1681,7 +1621,6 @@
 file path=usr/share/lib/ant/ant.jar
 file path=usr/share/lib/ant/ant.pom
 file path=usr/share/lib/ant/changelog.xsl
-dir  path=usr/share/lib/ant/checkstyle
 file path=usr/share/lib/ant/checkstyle/checkstyle-frames.xsl
 file path=usr/share/lib/ant/checkstyle/checkstyle-text.xsl
 file path=usr/share/lib/ant/checkstyle/checkstyle-xdoc.xsl
--- a/components/ant/patches/tests.patch	Wed Feb 18 12:08:43 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-https://issues.apache.org/bugzilla/show_bug.cgi?id=50507#c10
-http://svn.apache.org/viewvc?view=revision&revision=1297113
-
---- trunk/src/tests/junit/org/apache/tools/ant/taskdefs/ExecTaskTest.java	2012/03/05 16:08:43	1297112
-+++ trunk/src/tests/junit/org/apache/tools/ant/taskdefs/ExecTaskTest.java	2012/03/05 16:09:56	1297113
[email protected]@ -103,10 +103,12 @@
-         logFile = new File(logFile.getAbsolutePath());
-         assertTrue("log file found after spawn", logFile.exists());
-     }
--    
-+
-+    /* XXX #50507 - fails at least on Linux
-     public void testOutAndErr() {
-         project.executeTarget("test-out-and-err");
-     }
-+    */
- 
-     private static class MonitoredBuild implements Runnable {
-         private Thread worker;