diff --git a/WHATSNEW b/WHATSNEW
index dbd8d174d..e0ecaafc2 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -15,14 +15,124 @@ Changes from Ant 1.4.1 to Ant 1.5
 Changes that could break older environments:
 --------------------------------------------
 
-* Important: Single $ signs are no longer silently stripped! 
+* Properties will now be expanded in mail message bodies.  This means
+that one $ sign will be stripped if your mail message contains the text
+$$.
+
+* org.apache.tools.ant.taskdefs.Expand no longer extends MatchingTask.
+
+* Available#setFile now again uses a File argument as it did in 1.4,
+this may break environments that have been adapted to the String
+argument version present in 1.5beta1.
+
+Fixed bugs:
+-----------
+* When <move> attempts a rename, it deletes the destination file, if it
+  exists, before renaming the source file.  However, <move> was not
+  checking if the destination file was actually a directory before
+  trying to delete it.
+
+* Make CVS Tasks to work under Cygwin.
+
+* Fix LineContains to handle huge files elegantly without causing
+Stack Overflows.
+
+* if you ask for the "classic" compiler on Java1.4, you get upgraded to
+"modern" because there is no classic compiler any more.
+
+* the <http> condition was viewing 404 'not found' exceptions as success. Now
+it defaults to viewing any response >=400 as an error, and has an errorsBeginAt
+attribute you can use if you want a higher or lower value.
+
+* <get> throws a build exception on an http authorization error, unless you
+have set ignoreerrors to true.
+
+* <wsdltodotnet> was spelt in Wintel case: <WsdlToDotnet>. It is now lower
+case, though the old spelling is retained for anyone who used it.
+
+* Merging of Manifests in jar now works as documented.
+
+* paths that have been separated by colons would be incorrectly parsed
+on NetWare.
+
+* runant.pl now supports NetWare.
+
+* <tempfile> and <setproxy> tasks were in beta1, but not defined by
+default; They now are. <tempfile> fills a property with the name of a
+temporary file; <setproxy> lets you set the JVM's http, ftp and socks proxy
+settings.
+
+* <available classname="foo" ignoresystemclasses="true"> failed for
+JDK 1.1 and 1.2, even if the class could be found on the
+user-specified classpath.
+
+* <property environment=... /> now works on z/OS.
+
+* forked <javac> failed for the wrong reason on JDK 1.1 - Ant would
+use a temporary file to hold the names of the files to compile under
+some conditons, but 1.1 doesn't support this feature.  Ant will no
+longer try this, but you may run into problems with the length of the
+command line now.
+
+* the refid attribute for <property>s nested into <ant> or <param>s
+nested into <antcall> didn't work.
+
+* <replaceregexp> didn't work for nested <fileset>s.
+
+* <javadoc> dropped sourcepath entries if no "interesting" .java
+source files  could be found below them.  This has been backwards
+incompatible and caused problems with custom doclets like xdoclet.
+
+* Using the doclet, docletpath or docletpathref attributes of
+<javadoc> may have caused NullPointerExceptions.
+
+* nested <filesets> of <javadoc> would include too much.
+
+* <dependset> will no longer choke on <targetfileset>s that point to
+non-existing directories.
+
+* <patch> didn't work at all.
+
+* <replace> and <replaceregexp> now fail if the file they are working
+on is locked.
+
+* <javadoc> would pick up the wrong executable in the combination JDK
+1.2  and AIX.
+
+Other changes:
+--------------
+
+* z/OS now gets detected by the os condition.
+
+* <fileset> and <dirset> now have an optional followsymlink attribute
+that can prevent Ant from following symbolic links on some platforms.
+
+* BeanShell is now supported in the <script> task.
+
+* <ejbjar> under Weblogic attempts to use the ejbc20 compiler for 2.0 beans
+  based on the deployment descriptor's DTD reference. Under weblogic 7.00 Beta
+  this ejbc class has been deprecated. To avoid the deprecation warning use
+  ejbcclass="weblogic.ejbc".
+
+* <ejbjar> will add a manifest to the generated jar based on the naming
+  convention in use. This overrides the manifest specified in the
+  <ejbjar> attribute
+
+
+Changes from Ant 1.4.1 to 1.5beta1
+==================================
+
+Changes that could break older environments:
+--------------------------------------------
+
+* Important: Single $ signs are no longer silently stripped!
   Before you panic that we have broken all your build files, we have kept
   the old "$$" -> "$" behaviour. So only build files which accidentally had
   a $ sign in a string that was being silently stripped may break.
-  We added this fix to stop newbie confusion; if you want to write a 
-  build file which works on ant versions 1.4.1 or earlier, stay with 
-  the double $$ sign rule. 
-    
+  We added this fix to stop newbie confusion; if you want to write a
+  build file which works on ant versions 1.4.1 or earlier, stay with
+  the double $$ sign rule.
+
 * Shipped XML parser is now Xerces 2.0.1 along with the XML Parser APIs.
   XML Parser APIs is a separate jar that contains the necessary
   JAXP/DOM/SAX classes.
@@ -30,7 +140,7 @@ Changes that could break older environments:
 * <telnet> was fixed to expand properties inside nested <read> and
   <write> elements; before this only happened when you assigned the text
   to the string attribute. If you had $ signs in the string, they may
-  need escaping. 
+  need escaping.
 
 * the RegexpMatcher interface has been extended to support case
   insensitive matches and other options - custom implementations of
@@ -48,18 +158,18 @@ Changes that could break older environments:
   <condition>, <exec>, <pathconvert>, or <tstamp>. In some exceptional
   cases it will generate a warning if you attempt to overwrite an
   existing property.
-  
+
 * Taskwriters please note: Whenever tasks had any overloaded set* methods,
   Ant's introspection mechanism would select the last overloaded method
-  provided to it by the Java Runtime.  A modification has now been made such 
-  that when the Java Runtime provides a method with a String as its argument, 
+  provided to it by the Java Runtime.  A modification has now been made such
+  that when the Java Runtime provides a method with a String as its argument,
   a check is made to see if there is another overloaded method that takes in
-  some other type of argument.  If there is one such method, then the method 
+  some other type of argument.  If there is one such method, then the method
   that takes in String as an argument is not selected by the Introspector.
-  
-* The pattern definition **/._* has been included into the Default 
+
+* The pattern definition **/._* has been included into the Default
   Excludes list.
-  
+
 * <propertyfile>'s <entry> element was modified to remove "never" as a value
   as its behavior was undocumented and flakey.
 
@@ -78,7 +188,7 @@ Changes that could break older environments:
 
 Fixed bugs:
 -----------
-* A bug existed that prevented generated log files from being deleted as 
+* A bug existed that prevented generated log files from being deleted as
   part of the build process itself.  This has now been fixed.
 
 * Fixed bug where <move> ignored <filterset>s.
@@ -97,7 +207,7 @@ Fixed bugs:
 
 * <propertyfile> would not close the original property file.
 
-* <ant> will no longer override a subbuild's basedir with inheritall="true". 
+* <ant> will no longer override a subbuild's basedir with inheritall="true".
 
 * Fixed problem with the built-in <junit> formatters which assumed
   that only one test could be running at the same time - this is not
@@ -120,7 +230,7 @@ Fixed bugs:
 
 Other changes:
 --------------
-* Selector Elements now provide a way to create filesets based on 
+* Selector Elements now provide a way to create filesets based on
   sophisticated selection criteria.
 
 * Gzip and Bzip2 files can now be constructed in the fly when using
@@ -131,54 +241,54 @@ Other changes:
 * New optional type, <classfileset> added.
 
 * <ejbjar> now allows control over which additional classes and interfaces
-  are added to the generated EJB jars. A new attribute "dependency" can be 
-  defines which classes are added. The addition of classes now uses 
+  are added to the generated EJB jars. A new attribute "dependency" can be
+  defines which classes are added. The addition of classes now uses
   the Jakarta-BCEL library rather than reflection, meaning bean classes are
-  no longer loaded into Ant's JVM. 
+  no longer loaded into Ant's JVM.
 
 * <available> has a new attribute named ignoreSystemClasses.
 
 * New task <cvschangelog/> generates an XML report of changes that occur
   on CVS repository.
 
-* New filter readers: ClassConstants, ExpandProperties, HeadFilter, 
-  LineContains, LineContainsRegExp, PrefixLines, ReplaceTokens, 
-  StripJavaComments, StripLineBreaks, StripLineComments, TabsToSpaces, 
+* New filter readers: ClassConstants, ExpandProperties, HeadFilter,
+  LineContains, LineContainsRegExp, PrefixLines, ReplaceTokens,
+  StripJavaComments, StripLineBreaks, StripLineComments, TabsToSpaces,
   TailFilter.
 
-* <copy>, <loadfile>, <loadproperties>, <move> support FilterChains 
+* <copy>, <loadfile>, <loadproperties>, <move> support FilterChains
   of FilterReaders.
-  
+
 * New task <loadproperties> to load contents of file as Ant properties,
   with nested <filterchain> elements.
-  
+
 * New task <loadfile> to load a whole file into a property.
 
 * New task <echoproperties> to list your current properties to the screen
-  or a file. 
+  or a file.
 
-* New tasks <bzip2> and <bunzip2> to pack and unpack files using the 
+* New tasks <bzip2> and <bunzip2> to pack and unpack files using the
   BZip2 alogrithm.
 
-* New tasks <replaceregexp>, <checksum>, <translate>, <waitfor>, 
+* New tasks <replaceregexp>, <checksum>, <translate>, <waitfor>,
   <manifest>, <vsscp>, <vssadd>, <vsscreate>, <splash>, <basename>, <dirname>,
   <concat>.
 
 * A new combined <mail> task, which replaces the old <mail> and
-  <mimemail> tasks, has been added.  The <mimemail> task, and 
+  <mimemail> tasks, has been added.  The <mimemail> task, and
   old SendEmail and MimeMail classes have been deprecated.
 
 * Mail task allows specification of port number.
 
-* Users can control what <zip> and <jar> must do when duplicate files 
-  are found.  A new element <zipgroupfileset> allows for multiple zip 
-  files to be merged into the archive.  In addition, <jar> also has 
+* Users can control what <zip> and <jar> must do when duplicate files
+  are found.  A new element <zipgroupfileset> allows for multiple zip
+  files to be merged into the archive.  In addition, <jar> also has
   another new attribute: filesetmanifest.  The existing manifest
-  attribute of <jar> now also accepts the name of a jar added through 
+  attribute of <jar> now also accepts the name of a jar added through
   a fileset.
 
 * gzip now checks that the zipfile is older than the source file
-  before rebuilding the zipfile. 
+  before rebuilding the zipfile.
 
 * TarFileset takes in three new attributes - fullpath, prefix
   and preserveLeadingSlashes.
@@ -191,24 +301,24 @@ Other changes:
 
 * Exec task has extra attribute "resultproperty" to get the return code
   into a property.
-  
-* Exec task prints a message when a timed-out process is killed.  
-  
+
+* Exec task prints a message when a timed-out process is killed.
+
 * Added optional attributes - name, arch and version to the <os> task.
 
-* Unjar, Untar, Unwar and Unzip now support patternsets to 
-  select files from an archive for extraction.  Filesets may be 
+* Unjar, Untar, Unwar and Unzip now support patternsets to
+  select files from an archive for extraction.  Filesets may be
   used to select archived files for unarchival.
 
 * Javac task allows debug levels to be specified.  Debug levels
-  will have an effect only when the modern compiler or the 
+  will have an effect only when the modern compiler or the
   classic compiler (version 1.2 and higher) is used and debugging
   is enabled.
 
 * Added support for specifying CVS_RSH in the <cvs/> task
 
-* The attributes zipfile, jarfile, warfile and earfile (from the Zip, 
-  Jar, War and Ear tasks) have been deprecated and superseded by a 
+* The attributes zipfile, jarfile, warfile and earfile (from the Zip,
+  Jar, War and Ear tasks) have been deprecated and superseded by a
   new attribute "destfile".
 
 * Added new conditions <isset>, <checksum>, <http>, <socket>, <contains>,
@@ -235,17 +345,17 @@ Other changes:
 * <fail> now supports builds to fail based on conditions via if and
   unless attributes.
 
-* Ant now comes with two new BuildLogger implementations - one that 
+* Ant now comes with two new BuildLogger implementations - one that
   can send emails containing a log of the build process (MailLogger),
   and one that colorizes the output based on message levels, using
   ANSI color code escape sequences (AnsiColorLogger).
 
 * A "package" mapper type has been added to allow package directory
   names replaced with the dotted form.
-  
-* You can now specify environment variables in the <java> and <junit> tasks 
+
+* You can now specify environment variables in the <java> and <junit> tasks
   if the fork attribute has been set to true.
-  
+
 * -propertyfile command-line option has been added to load an entire
   property file just as -D properties are declared (as user properties).
   -D properties take precedence over -propertyfile specified ones.
@@ -253,7 +363,7 @@ Other changes:
 * You can now set an ANT_ARGS environment variable to hold arguments you
   always want passed to the 'ant' command -- for example, if you always
   want to use a different logger or the -find flag.
-  
+
 * <tstamp> now supports a new "prefix" attribute to prefix properties set.
 
 * You can now specify the -sourcepath for <javac> explicitly.
@@ -264,7 +374,7 @@ Other changes:
 * The compiler implementation for <javac> can now be chosen on a task by
   task basis.  The new "compiler" attribute of <javac> can be used to override
   the value of the build.compiler property, if set.
-  
+
 * <javac> has a new nested element, <compilerarg>, which allows you
   to specify additional args for the specific compiler you're using.
 
@@ -272,7 +382,7 @@ Other changes:
 
 * <propertyfile>'s <entry> now has a 'unit' attribute to specify the
   increment/decrement unit on date operations.
-  
+
 * <property> now supports a 'prefix' attribute when loading from a file
   or resource.
 
@@ -293,7 +403,7 @@ Other changes:
 * <ftp> can now chmod files on a remote server that supports
   "site chmod", as well as set the umask before transferring files, if
   the server supports "site umask".
-  
+
 * New <serverdeploy> "optional" task.
 
 * <patternset> now supports nested patternsets.
@@ -315,13 +425,13 @@ Other changes:
 * <copy> task now has a 'failonerror' attribute to allow keep-going
   behaviour when the file to be copied is not found (defaults to "true").
 
-* <uptodate> now has a 'srcfile' attribute to allow specifying a 
+* <uptodate> now has a 'srcfile' attribute to allow specifying a
   full-path filename.
 
 * <exec>, <sql> and <java> now support append attributes to allow
   appending the output to an existing file.
 
-* <java> now supports a timeout attribute analog to <exec> - it is 
+* <java> now supports a timeout attribute analog to <exec> - it is
   highly recommended to only use it together with fork="true".
 
 * <javadoc> now supports a source attribute to enable javadoc to
@@ -330,16 +440,16 @@ Other changes:
 * <replace> supports a new replacefilterfile attribute that
   automatically turns all properties of a given file into
   replacefilters.
-  
+
 * An alias of <xslt> has been added to refer to the <style> task.
 
 * The compiler implementation for <rmic> can now be chosen on a task by
   task basis.  The new "compiler" attribute of <rmic> can be used to override
   the value of the build.rmic property, if set.
-  
+
 * <rmic> has a new nested element, <compilerarg>, which allows you
   to specify additional args for the specific compiler you're using.
-  
+
 * org.apache.tools.ant.XmlLogger now is a BuildLogger, rather than just
   a BuildListener. It can operate in either mode successfully.
 
@@ -369,21 +479,21 @@ Fixed bugs:
 
 * <ant>'s antfile attribute will now also be considered an absolute path on
   Windows systems, if it starts with a \ and no drive specifier.
- 
+
 * The fullpath attribute of <zipfileset> has been ignored if you used
   the src attribute at the same time.
 
 * The manifest file is now always placed as the second entry (after /META-INF)
   in generated jars. This allows the manifest to be read by JarInputStreams
-  
+
 * Fixed bug in depend task which would fail with a NullPointerException if no
   dependency cache was specified.
-  
+
 * sql task now handles REM statements correctly so that lines starying with rem
   but which are not comments are actually processed.
-  
+
 * XMLLogger now uses the task's name rather than the classname
-  
+
 * <mapper>s will now work as expected if the to pattern expands to an
   absolute pathname.
 
@@ -447,33 +557,33 @@ Changes that could break older environments:
 
 * <fixcrlf> will not remove trailing whitespace at the end of lines anymore.
 
-* The Classloader usage has been changed for the taskdef, property, available 
-  and sql tasks so that it delegates to the parent classloader. This may cause 
+* The Classloader usage has been changed for the taskdef, property, available
+  and sql tasks so that it delegates to the parent classloader. This may cause
   ClassNotFoundExceptions to be thrown if a system class attempts to load a
   class in the taskdef's classpath (typically factory objects).
 
 * Ant now allows multithreading of tasks and the containment of tasks within
   other tasks. This can break customer listeners which do not expect messages
-  from a task before the previous task has finished. 
-  
+  from a task before the previous task has finished.
+
 * Ant now installs its own ouput stream into System.out to route output to the
-  task currently executing on the current thread. This also means that all 
-  output is now routed as Ant message events. Customer listeners and loggers 
-  should not call System.out at any time. This has always been true but such 
+  task currently executing on the current thread. This also means that all
+  output is now routed as Ant message events. Customer listeners and loggers
+  should not call System.out at any time. This has always been true but such
   usage now will cause problems due to possible recursion.
 
 * Invalid manifest files will now cause build failures in the <jar> task.
 
 * Ant Introspection now looks for methods with method names starting with
-  addConfigured. When called these methods are passed an argument after it has 
-  been configured from the build file. Custom tasks supporting nested elements 
-  starting with the name configured will no longer function.  
+  addConfigured. When called these methods are passed an argument after it has
+  been configured from the build file. Custom tasks supporting nested elements
+  starting with the name configured will no longer function.
 
 * The environment variable JAVACMD that can be used to specify the
   java executable to Ant's wrapper scripts must not contain additional
   command line parameters any longer - please use the environment
   variable ANT_OPTS for such parameters now.
-  
+
 * Ant's wrapper scripts now quote the CLASSPATH environment variable, thus
   supporting classpaths which refer to directories containing spaces. This means
   that the CLASSPATH environment variable cannot have quotes. Any quotes should
@@ -486,12 +596,12 @@ Changes that could break older environments:
   </delete>
   will now remove "somedir" as well, unless there are still files left
   in it (matched by the default excludes).
-  
-* The copy task will now fail if the file to be copied is not found. 
 
-* Ant properties defined in properties files now behave the same way as 
+* The copy task will now fail if the file to be copied is not found.
+
+* Ant properties defined in properties files now behave the same way as
   properties defined in the build file. In particular the $ character needs
-  to be escaped in property values by doubling it to $$. So, to define a 
+  to be escaped in property values by doubling it to $$. So, to define a
   property with the value $hello, you need to define it in a properties file
   as
     test.prop=$$hello
@@ -539,9 +649,9 @@ Other changes:
 * <ejbjar> changes
   * Add support for Borland Application Server to the <ejbjar> task using
     a <borland> nested element.
-  * Add support for iPlanet Application Server to the <ejbjar> task. Also 
+  * Add support for iPlanet Application Server to the <ejbjar> task. Also
     includes some iPlanet utility tasks
-  * Add support for JBoss Application Server to the <ejbjar> task. 
+  * Add support for JBoss Application Server to the <ejbjar> task.
   * Add a naming attribute to control the naming scheme that
     ejbjar uses to name the generated EJB jars.
   * Weblogic element now sets the compiler class for EJB 2.0 beans
@@ -551,11 +661,11 @@ Other changes:
   * Allow the manifest to be specified for the generated jars
   * The weblogic element now supprts an attribte noEJBC to skip the processing
     of the jar by ejbc. The ejbc step will then occur at deployment
-  * weblogic will tell ejbc to use Jikes compiler if build.compiler is set to 
-    jikes. It can be restored to the default, javac, operation if desired.  
-  
+  * weblogic will tell ejbc to use Jikes compiler if build.compiler is set to
+    jikes. It can be restored to the default, javac, operation if desired.
+
 * Allow the <sql> Delimiter to be set in the so that Oracle stored procs may be
-  entered  
+  entered
 
 * <execon> and <apply> can now optionally skip empty filesets.
 
@@ -574,8 +684,8 @@ Other changes:
 
 * added vmlauncher attribute to exec tasks. This defaults to true. If
   it is set to false, the VM's ability to launch commands in bypassed
-  and the OS shell, either directly or through the auxillary antRun 
-  scripts is used. 
+  and the OS shell, either directly or through the auxillary antRun
+  scripts is used.
 
 * regexp mapper now supports the java.util.regex package of JDK 1.4.
 
@@ -594,7 +704,7 @@ Other changes:
 
 * <junit> can now optionally set a property on test failure.
 
-* <taskdef> can now define several tasks at once, reading the 
+* <taskdef> can now define several tasks at once, reading the
   name/classname pairs from a property file or resource.
 
 * <unzip/unjar/unwar> and <untar> now have an overwrite attribute that
@@ -603,10 +713,10 @@ Other changes:
 
 * <patternset> and <fileset> now support nested <in/excludesfile>
   elements - using these you can have more than one in/excludes file
-  per <patternset>. 
+  per <patternset>.
 
 * Three new supported compilers for javac: kjc for kopi, gcj for the
-  gcc frontend and sj for Symantec's compiler. 
+  gcc frontend and sj for Symantec's compiler.
   In addition extJavac or the new fork attribute can be
   used to run the JDK's javac in a JVM separate from Ant.
 
@@ -617,44 +727,44 @@ Other changes:
 
 * <move> will now try to rename() files before copying them byte by
   byte - only if filtering is of, of course.
-  
+
 * <ant> and <antcall> tasks now support a new attribute inheritAll. When set to
   false, only user properties are passed through to the target Ant instance.
   This includes properties set on the command line and properties explicitly
   passed
-  
+
 * <javadoc> now skips off line links if the package list cannot be found.
 
 * <wlrun> now allows the security policy file to exist outside the weblogic
   directory.
-  
+
 * <java> task will set the Thread contextClassLoader under JDKs 1.2+ to the
   classloader for the class being executed.
-  
+
 * Introduce the concept of a TaskContainer - a task or element which can contain
-  Ant Tasks. 
-  
+  Ant Tasks.
+
 * Add new tasks implementing the TaskContainer interface <parallel> and
   <sequential> which allow parallel execution of tasks to be specified.
 
 * <depend> task will now take into account dependencies on jar files and class
   files from a given classpath.
-  
-* <jar> manifest entries may now be specified in the build file either 
+
+* <jar> manifest entries may now be specified in the build file either
   completely or to be merged with a manifest file.
 
-* <tstamp> task custom formats now support locales. 
+* <tstamp> task custom formats now support locales.
 
-* Added a listner which will forward events to Log4J. The log4j configuration 
+* Added a listner which will forward events to Log4J. The log4j configuration
   file should be in the directory from which Ant is run or passed as a system
   property using a JVM argument.
 
-* Introduced the concept of <filtersets> to allow for more control in which 
-  filters get applied in a <copy> or <move> operation.       
+* Introduced the concept of <filtersets> to allow for more control in which
+  filters get applied in a <copy> or <move> operation.
 
 * Added nowarn attribute to javac and deprecated the Jikes-magic property
   build.compiler.warnings.
-  
+
 * The <depend> task cache format has changed and all dependency information is
   now stored in a single file.
 
@@ -671,7 +781,7 @@ Fixed bugs:
 * <javah>'s outputfile attribute will be resolved as relative to the
   projects basedir.
 
-* <antstructure> should create a valid DTD for propertyfile.operation.entry 
+* <antstructure> should create a valid DTD for propertyfile.operation.entry
   and omit tasks it fails to load.
 
 * won't try to pass a -bootclasspath flag to javac 1.1 anymore
@@ -690,25 +800,25 @@ Fixed bugs:
 
 * Output written by testcases will now be captured by the <junit> task
   and passed to the formatters.
-  
+
 * Quote the -group parameter to Javadoc as per the specification
 
 * Initialise classes when loaded through the AntClassLoader - that is, run
   static initializers
-  
+
 * Implement getResource() and getResources() in AntClassLoader
 
 * Create the <ejbjar> weblogic command line as a set of arguments rather than
   as a single line. Avoids problems with paths which contain spaces.
-  
+
 * <ejbjar> now fails when the weblogic ejbc compiler reports an error.
-  
+
 * Make the AntClassLoader load resources in the same order as it currently
-  loads classes. 
-  
+  loads classes.
+
 * Handle classpaths with spaces
 
-* Make sure XSLT processors close their output files in <style>.  
+* Make sure XSLT processors close their output files in <style>.
 
 * perform proper uptodate check in <rmic> when compiling for IIOP.
 
@@ -739,23 +849,23 @@ Fixed bugs:
 
 * Ant classloader will now ignore paths which are invalid relative to the
   project base
-  
+
 * <ejbjar> weblogic elements check for jar file changes has been fixed.
   Previously some changes would not be included.
 
 * properties loaded from properties files are now resolved internally. This
   removes the spurious warnings about usage of properties which have not been
   set.
-  
+
 * <jar> task and friends now process the JAR manifest to ensure it is valid.
 
 * The task finished event now includes any exception thrown by the task.
 
 * <java> task now supports a jvmVersion attribute so that if another JVM is
-  being used, Ant can determine which options to use for features such as the 
-  VM memory limits 
+  being used, Ant can determine which options to use for features such as the
+  VM memory limits
+
 
-  
 Changes from Ant 1.2 to Ant 1.3
 ===========================================
 
@@ -788,14 +898,14 @@ Other changes:
 
 * Added nested zipfileset element to <zip>
 
-* Changed <sql> so that printing is at the task level rather than 
+* Changed <sql> so that printing is at the task level rather than
   the statement level.
-  
+
 * javadoc task will pass -d flag to any doclet if the destDir attribute is
   given. If the doclet does not accept the -d flag then omit the destdir
   attribute.
 
-* <cab> can work on non-Windows platforms with the help of libcabinet. 
+* <cab> can work on non-Windows platforms with the help of libcabinet.
   See http://trill.cis.fordham.edu/~barbacha/cabinet_library/.
 
 * <ftp> now supports passive mode.
@@ -809,20 +919,20 @@ Other changes:
   command.
 
 * Style tasks will now support TraX compliant XSL processors if one is present
-  in your classpath.  
+  in your classpath.
 
-* Added a failonerror to the javac task. If set to false, the build will 
+* Added a failonerror to the javac task. If set to false, the build will
   continue even if there are compilation errors.
-  
-* Added nested format elements to the tstamp task allowing additional time 
-  formats to be defined for arbitrary properties.   
+
+* Added nested format elements to the tstamp task allowing additional time
+  formats to be defined for arbitrary properties.
 
 * Added classpath attribute and nested classpath element to <property>
   to make the resource attribute more powerful.
 
 * ${} property expansion will now be performed on the patterns read
   from files specified as includesfile or excludesfile attributes.
-  
+
 * The <tar> and <untar> tasks now support GNU format for handling paths
   which are greater than 100 characters in length. In addition the <tar>
   task now supports nested filesets through which the file permissions
@@ -849,16 +959,16 @@ Fixed bugs:
 
 * Changes to ddcreator and ejbc helper to respect the descriptor hierarchy
   keppgenerated in ejbc can now be turned off
-  
+
 * ejbjar now correctly ignores <ejb-ref> elements in the deployment descriptor.
-  CMP files are included by parsing the weblogic deployment descriptor rather 
+  CMP files are included by parsing the weblogic deployment descriptor rather
   than relying on the naming convention used in ant 1.2
-  
-* ejbjar includes super classes and super interfaces into the generated ejb 
-  jar files. The <support> nested element allows support classes to be 
+
+* ejbjar includes super classes and super interfaces into the generated ejb
+  jar files. The <support> nested element allows support classes to be
   included in the EJB jar. The toplink element should now correctly locate
   the toplink descriptor.
-  
+
 * <vssget> now correctly deals with spaces in arguments
 
 * <jar> fails early if a given manifest file doesn't exist
@@ -867,7 +977,7 @@ Fixed bugs:
   set to 1.2.
 
 * <rmic> uses the the same classpath to verify a class can be rmic'd
-  as it passes to the compiler. 
+  as it passes to the compiler.
 
 * org.apache.tools.mail.MailMessage (and therefore <mail>) can now
   handle SMTP servers sending multi line responses.
@@ -878,13 +988,13 @@ Fixed bugs:
 * <property> and <available> will search for the resource "foo" instead
   of "/org/apache/tools/ant/taskdefs/foo" when given a relative resource
   name foo.
-  
+
 * Handle build files in directories whose name contained a "#" character
 
-* <junit> can now log to files whose name contains a comma as well. 
+* <junit> can now log to files whose name contains a comma as well.
 
-* The AntClassLoader now refers to the loader which loaded it, any 
-  requests it does not handle itself. Previously these went to the 
+* The AntClassLoader now refers to the loader which loaded it, any
+  requests it does not handle itself. Previously these went to the
   primordial loader.
 
 Changes from Ant 1.1 to Ant 1.2
@@ -930,7 +1040,7 @@ behavior has been dropped.
 
 * <ejbjar> task syntax has been changed significantly
 
-* <exec> is no longer implemented by org.apache.tool.ant.taskdefs.Exec. 
+* <exec> is no longer implemented by org.apache.tool.ant.taskdefs.Exec.
 Custom tasks that rely on Project.createTask("exec") to return an
 instance of this class are going to fail.
 
@@ -967,7 +1077,7 @@ level and later be referenced by their id attribute.
 * <get> can check whether a remote file is actually newer than a local
 copy before it starts a download (HTTP only).
 
-* Added a -logger option to allow the class which performs logging to be 
+* Added a -logger option to allow the class which performs logging to be
 specified on the command line.
 
 * Added a -emacs option to tell the logger to leave out taskname adornments
@@ -1007,5 +1117,5 @@ cases.
 * many more fixes we've forgotten to document here ...
 
 * The packagelistloc attribute of <javadoc>'s <link> child will be
-  resolved as a file (i.e. it is either absolute or relative to 
+  resolved as a file (i.e. it is either absolute or relative to
   basedir).
diff --git a/bootstrap.bat b/bootstrap.bat
index faae3ed4e..74ed740d9 100755
--- a/bootstrap.bat
+++ b/bootstrap.bat
@@ -26,7 +26,7 @@ if not "%OS%" == "Windows_NT" if exist bootstrap\nul deltree/y bootstrap
 if     "%OS%" == "Windows_NT" if exist build\nul rmdir/s/q build
 if not "%OS%" == "Windows_NT" if exist build\nul deltree/y build
 
-SET LOCALCLASSPATH=lib\xercesImpl.jar;lib\xmlParserAPIs.jar
+SET LOCALCLASSPATH=lib\xercesImpl.jar;lib\xml-apis.jar
 for %%i in (lib\optional\*.jar) do call src\script\lcp.bat %%i
 if exist "%JAVA_HOME%\lib\tools.jar" call src\script\lcp.bat %JAVA_HOME%\lib\tools.jar
 if exist "%JAVA_HOME%\lib\classes.zip" call src\script\lcp.bat %JAVA_HOME%\lib\classes.zip
@@ -50,7 +50,7 @@ if not exist build\classes\nul mkdir build\classes
 echo.
 echo ... Compiling Ant Classes
 
-"%JAVAC%" -d %CLASSDIR% %TOOLS%\bzip2\*.java %TOOLS%\tar\*.java %TOOLS%\zip\*.java %TOOLS%\ant\*.java %TOOLS%\ant\types\*.java %TOOLS%\ant\taskdefs\*.java %TOOLS%\ant\util\*.java %TOOLS%\ant\util\regexp\RegexpMatcher.java %TOOLS%\ant\util\regexp\RegexpMatcherFactory.java %TOOLS%\ant\taskdefs\condition\*.java %TOOLS%\ant\taskdefs\compilers\*.java 
+"%JAVAC%" %BOOTJAVAC_OPTS% -d %CLASSDIR% %TOOLS%\bzip2\*.java %TOOLS%\tar\*.java %TOOLS%\zip\*.java %TOOLS%\ant\*.java %TOOLS%\ant\types\*.java %TOOLS%\ant\taskdefs\*.java %TOOLS%\ant\util\*.java %TOOLS%\ant\util\regexp\RegexpMatcher.java %TOOLS%\ant\util\regexp\RegexpMatcherFactory.java %TOOLS%\ant\taskdefs\condition\*.java %TOOLS%\ant\taskdefs\compilers\*.java 
 
 echo.
 echo ... Copying Required Files
diff --git a/bootstrap.sh b/bootstrap.sh
index c8036fb75..b0deffeef 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -79,7 +79,7 @@ if [ -d "build" ] ; then
   rm -r build
 fi
 
-CLASSPATH=lib/xercesImpl.jar:lib/xmlParserAPIs.jar:${CLASSPATH}
+CLASSPATH=lib/xercesImpl.jar:lib/xml-apis.jar:${CLASSPATH}
 
 DIRLIBS=lib/optional/*.jar
 for i in ${DIRLIBS}
diff --git a/build.bat b/build.bat
index 5aade183c..297478a76 100755
--- a/build.bat
+++ b/build.bat
@@ -13,7 +13,7 @@ echo Bootstrap FAILED
 goto cleanup
 
 :runAnt
-set LOCALCLASSPATH=lib\xercesImpl.jar;lib\xmlParserAPIs.jar;bootstrap\lib\ant.jar
+set LOCALCLASSPATH=lib\xercesImpl.jar;lib\xml-apis.jar;bootstrap\lib\ant.jar
 for %%i in (lib\optional\*.jar) do call bootstrap\bin\lcp.bat %%i
 set CLASSPATH=lib\optional\xalanj1compat.jar;%LOCALCLASSPATH%;%CLASSPATH%
 set LOCALCLASSPATH=
diff --git a/build.sh b/build.sh
index 2bddf05b2..d4c93108f 100755
--- a/build.sh
+++ b/build.sh
@@ -21,7 +21,7 @@ if test ! -f bootstrap/lib/ant.jar -o  ! -x bootstrap/bin/ant -o ! -x bootstrap/
   exit
 fi
 
-LOCALCLASSPATH=lib/xercesImpl.jar:lib/xmlParserAPIs.jar
+LOCALCLASSPATH=lib/xercesImpl.jar:lib/xml-apis.jar:bootstrap/lib/ant.jar
 # add in the dependency .jar files
 DIRLIBS=lib/optional/*.jar
 for i in ${DIRLIBS}
diff --git a/build.xml b/build.xml
index 31e99c1a8..b2152b1c9 100644
--- a/build.xml
+++ b/build.xml
@@ -52,6 +52,8 @@
   <property name="regexp.package" value="${util.package}/regexp"/>
 
   <property name="manifest" value="src/etc/manifest"/>
+  
+  <property name="unfiltered.files" value="**/*.gif,**/*.jpg,**/*.ico"/>
 
 
   <!--
@@ -65,6 +67,7 @@
   <property name="build.lib" value="${build.dir}/lib"/>
   <property name="build.javadocs" value="${build.dir}/javadocs"/>
   <property name="build.tests" value="${build.dir}/testcases"/>
+  <property name="build.tests.javadocs" value="${build.dir}/javadocs.test/"/>
 
   <path id="classpath">
   </path>
@@ -118,6 +121,8 @@
   -->
   <!-- depends on JDK version -->
   <patternset id="needs.jdk1.2+">
+    <exclude name="${optional.package}/extension/**/*.java"
+             unless="jdk1.2+" />
     <exclude name="${util.package}/optional/NoExitSecurityManager.java"
              unless="jdk1.2+" />
     <exclude name="${optional.package}/Javah.java"
@@ -136,6 +141,10 @@
     <!-- use various 1.2 methods -->
     <exclude name="${optional.package}/sitraka/**/*.java"
              unless="jdk1.2+" />
+    <exclude name="${optional.package}/ide/VAJ*.java"
+             unless="jdk1.2+" />
+    <exclude name="${optional.package}/starteam/*.java"
+             unless="jdk1.2+" />
   </patternset>
   <patternset id="needs.jdk1.3+">
     <exclude name="${ant.package}/taskdefs/TestProcess.java"
@@ -294,6 +303,20 @@
   </patternset>
   <patternset id="teststhatfail">
   </patternset>
+  
+  <!--
+       ===================================================================
+         Set up a patternsets that matches the parts of our JUnit testsuite
+         that may be useful for task developers.
+       ===================================================================
+  -->
+  <patternset id="useful.tests">
+    <include name="${ant.package}/BuildFileTest*" />
+    <include name="${regexp.package}/RegexpMatcherTest*" />
+    <include name="${regexp.package}/RegexpTest*" />
+    <include name="${optional.package}/AbstractXSLTLiaisonTest*" />
+    <include name="${ant.package}/types/AbstractFileSetTest*" />
+  </patternset>
 
   <!--
        ===================================================================
@@ -317,6 +340,16 @@
     <available property="trax.present"
                classname="javax.xml.transform.Transformer"
                classpathref="classpath" />
+    <condition property="trax.impl.present">
+      <or>
+        <and>
+          <isset property="javax.xml.transform.TransformerFactory"/>
+          <available classname="${javax.xml.transform.TransformerFactory}"
+                     classpathref="classpath" />
+        </and>
+        <available resource="META-INF/services/javax.xml.transform.TransformerFactory"/>
+      </or>
+    </condition>
     <available property="xslp.present"
                classname="com.kvisco.xsl.XSLProcessor"
                classpathref="classpath" />
@@ -378,10 +411,6 @@
     <available property="commons.logging.present"
                classname="org.apache.commons.logging.LogFactory"
                classpathref="classpath"/>
-    <!-- this is just a way to check for a TraX implementation -->
-    <available property="trax.impl.present"
-               resource="META-INF/services/javax.xml.transform.TransformerFactory"
-               classpathref="classpath"/>
     <available property="xalan.envcheck"
                classname="org.apache.xalan.xslt.EnvironmentCheck"
                classpathref="classpath" />
@@ -459,9 +488,13 @@
       </and>
     </condition>
 
-    <available property="swing.present"
-               classname="javax.swing.ImageIcon"
-               classpathref="classpath"/>
+    <condition property="swing.present">
+      <or>
+        <isset property="jdk1.2+" />
+        <available classname="javax.swing.ImageIcon"
+                   classpathref="classpath"/>
+      </or>
+    </condition>
 
    <condition property="wsdl.found">
       <or>
@@ -681,6 +714,17 @@
 
   </target>
 
+  <!--   Creates jar of test utility classes -->
+  <target name="test-jar"
+          depends="compile-tests"
+          description="--> creates the Apache Ant Test Utilties jar">
+
+    <jar destfile="${build.lib}/${name}-testutil.jar"
+         basedir="${build.tests}">
+      <patternset refid="useful.tests" />
+    </jar>
+  </target>
+
   <!--
        ===================================================================
          Create the essential distribution that can run Apache Ant
@@ -757,16 +801,12 @@
     <copy todir="${dist.lib}" file="${lib.dir}/README"/>
 
     <copy todir="${dist.docs}">
-      <fileset dir="${docs.dir}">
-        <exclude name="**/images/**"/>
-      </fileset>
+      <fileset dir="${docs.dir}" excludes="${unfiltered.files}"/>
       <filterchain refid="ant.filters"/>
     </copy>
 
     <copy todir="${dist.docs}" filtering="false">
-      <fileset dir="${docs.dir}">
-        <include name="**/images/**"/>
-      </fileset>
+      <fileset dir="${docs.dir}" includes="${unfiltered.files}"/>
     </copy>
 
     <copy todir="${dist.dir}">
@@ -1037,6 +1077,12 @@
               targetfile="${build.javadocs}/packages.html" >
         <srcfiles dir= "${java.dir}" includes="**/*.java"/>
     </uptodate>
+    <uptodate property="tests.javadoc.notrequired"
+              targetfile="${build.tests.javadocs}/packages.html" >
+      <srcfiles dir= "${tests.dir}">
+        <patternset refid="useful.tests" />
+      </srcfiles>
+    </uptodate>
   </target>
 
   <target name="javadocs" depends="prepare, javadoc_check"
@@ -1067,6 +1113,26 @@
     </javadoc>
   </target>
 
+  <target name="test-javadocs" depends="prepare, javadoc_check"
+          unless="tests.javadoc.notrequired"
+          description="--> creates the API documentation for test utilities">
+    <mkdir dir="${build.tests.javadocs}"/>
+    <javadoc useexternalfile="yes"
+             destdir="${build.tests.javadocs}"
+             author="true"
+             version="true"
+             locale="en"
+             windowtitle="${Name} Test Utilities"
+             doctitle="${Name}">
+
+      <fileset dir="${tests.dir}">
+        <patternset refid="useful.tests" />
+      </fileset>
+
+      <bottom>Copyright &#169; 2000-${year} Apache Software Foundation. All Rights Reserved.</bottom>
+    </javadoc>
+  </target>
+
   <!--
        ===================================================================
          Compile testcases
@@ -1171,6 +1237,7 @@
           <exclude name="${regexp.package}/RegexpTest.java" />
           <exclude name="${optional.package}/AbstractXSLTLiaisonTest.java" />
           <exclude name="${ant.package}/types/AbstractFileSetTest.java" />
+          <exclude name="${ant.package}/types/selectors/BaseSelectorTest.java" />
 
           <!-- helper classes, not testcases -->
           <exclude name="org/example/**" />
@@ -1217,9 +1284,11 @@
           <!-- these tests need to be localised before being ran???? -->
           <exclude name="${optional.package}/PvcsTest.java" />
 
-          <!-- ehm, this is not really a TraX test but rather a xalan2 test..-->
+          <!-- These tests need a TraX implementation like xalan2 or saxon -->
           <exclude name="${optional.package}/TraXLiaisonTest.java"
-                   unless="xalan2.present"/>
+                   unless="trax.impl.present"/>
+          <exclude name="${optional.package}/XsltTest.java"
+                   unless="trax.impl.present"/>
 
           <!-- needs BSF to work -->
           <exclude name="${optional.package}/XalanLiaisonTest.java"
diff --git a/docs/ant_task_guidelines.html b/docs/ant_task_guidelines.html
index 8e4f72382..a9523f25b 100644
--- a/docs/ant_task_guidelines.html
+++ b/docs/ant_task_guidelines.html
@@ -12,6 +12,18 @@ writing tasks for personal use as the issues it addresses are still
 there in such a case.
 
 
+<h2>Don't break existing builds</h2>
+
+Even if you find some really hideous problem with ant, one that is easy
+to fix, if your fix breaks an existing build file then we have problems.
+Making sure that every build file out there still works, is one of the
+goals of all changes. As an example of this, Ant1.5 passes the single
+dollar sign "$" through in strings; Ant1.4 and before would strip it. To
+get this fix in we first had to write the test suite to expose current
+behaviour, then change something so that singe $ was passed through, but
+double "$$" got mapped to "$" for backwards compatibility.
+
+
 <h2>Use built in helper classes</h2>
 
 Ant includes helper tasks to simplify mauch of your work. Be warned that
@@ -33,9 +45,10 @@ When deriving tasks from this, it often benefits users to permit the
 classpath to be specified, and for forking to be an optional attribute.
 
 
-<h4>Project</h4>
+<h4>Project and related classes</h4>
 
-Project has some helper functions to touch a file, to
+Project, FileUtils, JavaEnvUtils all have helper functions
+to do things like touch a file, to
 copy a file and the like. Use these instead of trying to code them
 yourself -or trying to use tasks which may be less stable and fiddlier
 to use.
@@ -67,13 +80,21 @@ which may be important.
 One important rule is 'no tabs'. Use four spaces instead. Not two,
 not eight, four. Even if your editor is configured to have a tab of four
 spaces, lots of others aren't -spaces have more consistency across
-editors and platforms.
+editors and platforms. Some IDEs (JEdit) can highlight tabs, to stop you
+accidentally inserting them
 
-<h2>Recommended Names for attributes and elements</h2>
+<h2>Attributes and elements</h2>
 
+Use the Ant introspection based mapping of attributes into Java datatypes,
+rather than implementing all your attributes as setFoo(String) and doing
+the mapping to Int, bool or file yourself. This saves work on your part,
+lets Java callers use you in a typesafe manner, and will let the Xdocs 
+documentation generator work out what the parameters are.   
+ 
+<p>
 The ant1.x tasks are very inconsistent regarding naming of attributes
--some tasks use source, others src. Here is a list of preferred attribute
-names. 
+-some tasks use <tt>source<tt>, others <tt>src</tt>tt>. 
+Here is a list of preferred attribute names. 
 
 <table>
 <tr>
@@ -95,10 +116,41 @@ names.
     destination directory for output
 </td>
 </tr>
+<td>
+    destfile
+</td>
+<td>
+    destination file for output
+</td>
+</tr>
+<tr>
+<td>
+    srcdir
+</td>
+<td>
+    source directory
+</td>
+</tr>
+<tr>
+<td>
+    srcfile
+</td>
+<td>
+    source file
+</td>
+</tr>
 </table>
 Yes, this is a very short list. Try and be vaguely consistent with the core
 tasks, at the very least.
 
+<h2>Support classpaths</h2>
+
+Try and make it possible for people to supply a classpath to your task,
+if you need external libraries, rather than make them add everything to
+the ANT_HOME\lib directory. This lets people keep the external libraries
+in their ant-based project, rather than force all users to make changes
+to their ant system configuration.
+
 <h2>Design for controlled re-use</h2>
 
 Keep member variables private. If read access by subclasses is required.
@@ -149,7 +201,7 @@ Java 1.4 adds a new optional change to the language itself, the
 <tt>assert</tt> keyword, which is only enabled if the compiler is told
 to compile 1.4 version source. Clearly with the 1.1 compatibility requirement,
 Ant tasks can not use this keyword. They also need to move away from
-using the JUnit <tt>assert()</tt> method and start calling <tt>assertTrue()</tt>
+using the JUnit <tt>assert()</tt> method and call <tt>assertTrue()</tt>
 instead.    
 
 
@@ -188,23 +240,30 @@ and to fix it.
 <p>
 
 The test cases are a great way of testing your task during development.
-A simple call to 'ant run-test' in the ant source tree will run all ant
+A simple call to 'build run-test' in the ant source tree will run all ant
 tests, to verify that your changes don't break anything.
 To test a single task, use the one shot <code>ant run-single-test
--Dtestcase=${testname}</code> where ${testname} is the name of your test class.
+-Dtestcase=${testname}</code> where <code>${testname}</code> is the name of your test class.
 
 
 <p>
 
 The test cases are also used by the committers to verify that changes
 and patches do what they say. If you've got test cases it increases your
-credibility significantly. 
+credibility significantly. To be precise, we hate submissions without
+test cases, as it means we have to write them ourselves. This is
+something that only gets done if we need the task or it is perceived as
+utterly essential to many users. 
 
 <p>
 
 Remember also that Ant 1.x is designed to compile and run on Java1.1, so
 you should test on Java 1.1 as well as any later version which you use.
 You can download an old SDK from Sun for this purpose.
+<p>
+Finally, run a full <code>build test</code> before and after you start
+developing your project, to make sure you havent broken anything else by
+accident.
 
 <h2>Document</h2>
 
@@ -214,6 +273,11 @@ style to that of existing tasks. It should include a list of attributes
 and elements, and at least one working example of the task. Many users
 cut and paste the examples into their build files as a starting point,
 so make the examples practical and test them too.
+<p>
+You can use the xdocs stuff in proposal/xdocs to autogenerate your
+documentation page from the javadocs of the source; this makes life
+easier and will make the transition to a full xdoclet generated
+documentation build process trivial.
 
 <h2>Licensing and Copyright</h2>
 
@@ -229,11 +293,9 @@ This is important.
 
 The fairly laissez-faire license of Apache is not compabitible with
 either the GPL or the Lesser GPL of the Free Software Foundation -the
-Gnu project. Their license requires all changes to the source to be made
-public, and give the licensee of any software the right to distribute
-copies. It also requires derivative works to be made available under the
-same license terms. None of these requirements are in the Apache Software
-Foundation license, which permits people and organisations to build
+Gnu project. These licenses have stricter terms, "copyleft", which are
+not in the Apache Software Foundation license.
+This permits people and organisations to build
 commercial and closed source applications atop the Apache libraries and
 source -but not use the Apache, Ant or Jakarta Project names without
 permission.
@@ -249,10 +311,25 @@ will be politely and firmly rejected.
 <p>
 
 Once ant-2 adds better dynamic task incorporation, it may be possible to
-provide a framework for supporting [L]GPL code, but still no tasks
-direcely subject to the Gnu licenses will ever be included in the Ant
+provide a framework for indirectly supporting [L]GPL code, but still no tasks
+directly subject to the Gnu licenses can be included in the Ant
 CVS tree.
 
+<p>
+If you link to a GPL or LGPL library, by <code>import</code> or
+reflection, your task must be licensed under the same terms. So tasks
+linking to (L)GPL code can't go into the Apache managed codebase.
+Tasks calling such code can use the 'exec' or 'java' tasks to run the
+programs, as you are just executing them at this point, not linking to
+them.
+<p>
+Even if we cannot include your task into the Apache codebase, we can 
+still point to where you host it -just submit a diff to
+xdocs/external.html pointing to your task.
+
+If your task links directly to proprietary code, we have a differnt
+problem: it is really hard to build the tasks. Please use reflection.
+
 <h3>Dont re-invent the wheel</h3>
 
 We've all done it: written and submitted a task only to discover it
@@ -302,6 +379,13 @@ zipped up. If your submission is bigger than that, why not break it up
 into separate tasks. 
 <p>
 
+We also like submissions to be added to 
+<a href="http://nagoya.apache.org/bugzilla/">bugzilla</a>, so that they
+dont get lost. Please submit them by first filing the report with a
+meaningful name, then adding files as attachments. Use CVS diff files
+please!
+<p>
+
 If you hear nothing after a couple of weeks, remind the mailing list. 
 Sometimes really good submissions get lost in the noise of other issues.
 This is particularly the case just prior to a new point release of 
@@ -333,7 +417,7 @@ cases, while documentation helps sell the reason for a task.
 <li>Message to ant-dev contains [PATCH], task name and patch reason in
 subject.
 <li>Message body contains a rationale for the patch.
-<li>Message attachment contains the patch file(s).
+<li>Message attachment contains the patch file(s). 
 </ul>
 
 <h3>Checklist before submitting a new task</h3>
@@ -356,10 +440,10 @@ optionaltasklist.html to link to the new task page
 <li>Message to ant-dev contains [SUBMIT] and task name in subject
 <li>Message body contains a rationale for the task
 <li>Message attachments contain the required files -source, documentation,
-test and patches
+test and patches zipped up to escape the HTML filter.
 </ul>
 <hr>
-<p align="center">Copyright &copy; 2001 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body></html>
diff --git a/docs/antnews.html b/docs/antnews.html
index 5a76e67ee..f64189ee8 100644
--- a/docs/antnews.html
+++ b/docs/antnews.html
@@ -98,6 +98,23 @@
             </td>
           <td align="left" valign="top">
         <table border="0" cellspacing="0" cellpadding="2" width="100%">
+    <tr><td bgcolor="#525D76">
+      <font color="#ffffff" face="arial,helvetica,sanserif">
+        <a name="Ant 1.5Beta2"><strong>Ant 1.5Beta2</strong></a>
+      </font>
+    </td></tr>
+    <tr><td>
+      <blockquote>
+                        <h3>June 1, 2002 - Ant 1.5 Beta2 Available!</h3>
+                                <p>The second beta version of Ant 1.5 is now available for 
+     <a href="http://jakarta.apache.org/builds/jakarta-ant/release/v1.5Beta2/">
+     download</a>. If you have any feedback on the beta feel free to join the 
+     discussion on the ant-dev and ant-user mailing lists.
+     </p>
+                    </blockquote>
+    </td></tr>
+  </table>
+        <table border="0" cellspacing="0" cellpadding="2" width="100%">
     <tr><td bgcolor="#525D76">
       <font color="#ffffff" face="arial,helvetica,sanserif">
         <a name="Ant 1.5Beta1"><strong>Ant 1.5Beta1</strong></a>
diff --git a/docs/external.html b/docs/external.html
index a814a167e..cce69b7a3 100644
--- a/docs/external.html
+++ b/docs/external.html
@@ -2359,6 +2359,62 @@
         </table>
                     </blockquote>
     </td></tr>
+  </table>
+                                  <table border="0" cellspacing="0" cellpadding="2" width="100%">
+    <tr><td bgcolor="#828DA6">
+      <font color="#ffffff" face="arial,helvetica,sanserif">
+        <a name="WebSphere Studio Application Developer"><strong>WebSphere Studio Application Developer</strong></a>
+      </font>
+    </td></tr>
+    <tr><td>
+      <blockquote>
+                        <p>WSAD features Ant integrate by virtue of being built on the Eclipse tools platform.</p>
+                                  <table>
+              <tr>
+                  <td bgcolor="#039acc" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          Compatibility:
+        </font>
+  </td>
+                      <td bgcolor="#a0ddf0" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          bundles Ant 1.4.1
+        </font>
+  </td>
+      </tr>
+                  <tr>
+                  <td bgcolor="#039acc" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          Article:
+        </font>
+  </td>
+                      <td bgcolor="#a0ddf0" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          <a href="http://www7b.software.ibm.com/wsdd/library/techarticles/0203_searle/searle1.html">Ant Integration Part1</a>
+        </font>
+  </td>
+      </tr>
+                  <tr>
+                  <td bgcolor="#039acc" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          License:
+        </font>
+  </td>
+                      <td bgcolor="#a0ddf0" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          Commercial
+        </font>
+  </td>
+      </tr>
+        </table>
+                    </blockquote>
+    </td></tr>
   </table>
                     </blockquote>
     </td></tr>
diff --git a/docs/index.html b/docs/index.html
index 8812b857f..241018087 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -100,14 +100,14 @@
         <table border="0" cellspacing="0" cellpadding="2" width="100%">
     <tr><td bgcolor="#525D76">
       <font color="#ffffff" face="arial,helvetica,sanserif">
-        <a name="Ant 1.5Beta1"><strong>Ant 1.5Beta1</strong></a>
+        <a name="Ant 1.5Beta2"><strong>Ant 1.5Beta2</strong></a>
       </font>
     </td></tr>
     <tr><td>
       <blockquote>
-                        <h3>Apache Ant 1.5Beta1 Available !</h3>
-                                <p>Version 1.5Beta1 of Ant has been released. It is available for download 
-      <a href="http://jakarta.apache.org/builds/jakarta-ant/release/v1.5Beta1/">
+                        <h3>Apache Ant 1.5Beta2 Available !</h3>
+                                <p>Version 1.5Beta2 of Ant has been released. It is available for download 
+      <a href="http://jakarta.apache.org/builds/jakarta-ant/release/v1.5Beta2/">
       here</a>.
     </p>
                                 <p><a href="./antnews.html">Read more news about Ant</a></p>
diff --git a/docs/manual/CoreTasks/ant.html b/docs/manual/CoreTasks/ant.html
index 4e84cc577..d5827840d 100644
--- a/docs/manual/CoreTasks/ant.html
+++ b/docs/manual/CoreTasks/ant.html
@@ -87,9 +87,10 @@ project.</p>
   </tr>
 </table>
 
-<h3>Parameters specified as nested elements</h3>
-<h4>property</h4>
-<p>See the description of the <a href="property.html">property task</a>.</p>
+<h3>Parameters specified as nested elements</h3> <h4>property</h4>
+<p>See the description of the <a href="property.html">property
+task</a>.  Note that the <code>refid</code> attribute points to a
+reference in the calling project, not in the new one.</p>
 
 <h4><a name="reference">reference</a></h4>
 <p>Used to chose references that shall be copied into the new project,
@@ -221,7 +222,7 @@ a <code>&lt;path&gt;</code> with the id <code>path1</code>, but
 new project using the id <code>path2</code>.</p>
 
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/antcall.html b/docs/manual/CoreTasks/antcall.html
index 80bb93d46..b251537cb 100644
--- a/docs/manual/CoreTasks/antcall.html
+++ b/docs/manual/CoreTasks/antcall.html
@@ -83,7 +83,7 @@ optionally changing their id.</p>
     <td valign="top" align="center">Yes</td>
   </tr>
   <tr>
-    <td valign="top">toid</td>
+    <td valign="top">torefid</td>
     <td valign="top">The id of the reference in the new project.</td>
     <td valign="top" align="center">No, defaults to the value of refid.</td>
   </tr>
@@ -112,7 +112,7 @@ optionally changing their id.</p>
 <p>will copy the parent's definition of <code>path1</code> into the
 new project using the id <code>path2</code>.</p>
 
-<hr><p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<hr><p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/antstructure.html b/docs/manual/CoreTasks/antstructure.html
index 257dc117e..28937272b 100644
--- a/docs/manual/CoreTasks/antstructure.html
+++ b/docs/manual/CoreTasks/antstructure.html
@@ -36,7 +36,7 @@ listed as <code>#IMPLIED</code>.</p>
 <blockquote><pre>
 &lt;antstructure output=&quot;project.dtd&quot;/&gt;
 </pre></blockquote>
-<hr><p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<hr><p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/apply.html b/docs/manual/CoreTasks/apply.html
index f6ff1be6e..4412d3962 100644
--- a/docs/manual/CoreTasks/apply.html
+++ b/docs/manual/CoreTasks/apply.html
@@ -196,7 +196,7 @@ of all files separated by spaces.</p>
 <code>.o</code>, replacing TARGETFILE with the absolute filename of
 the <code>.o</code> and SOURCEFILE with the absolute name of the
 <code>.c</code> file.</p>
-<hr><p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<hr><p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/available.html b/docs/manual/CoreTasks/available.html
index 55f858ed9..f492f58f4 100644
--- a/docs/manual/CoreTasks/available.html
+++ b/docs/manual/CoreTasks/available.html
@@ -120,7 +120,7 @@ if the class <code>javax.xml.transform.Transformer</code> is found in the classp
 <p>sets the <code>have.extras</code> property to the value &quot;true&quot;
 if the resource-file <code>extratasks.properties</code> is found.
 </p>
-<hr><p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<hr><p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/chmod.html b/docs/manual/CoreTasks/chmod.html
index ea4581349..769e66053 100644
--- a/docs/manual/CoreTasks/chmod.html
+++ b/docs/manual/CoreTasks/chmod.html
@@ -102,7 +102,7 @@ below any directory named trial) writable for members of the same
 group on a UNIX system. In addition all files belonging to a FileSet
 with <code>id</code> <code>other.shared.sources</code> get the same
 permissions.</p>
-<hr><p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<hr><p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/conditions.html b/docs/manual/CoreTasks/conditions.html
index ff6f4f366..40fa052c6 100644
--- a/docs/manual/CoreTasks/conditions.html
+++ b/docs/manual/CoreTasks/conditions.html
@@ -93,6 +93,7 @@ the tests succeed.
   <li>netware (for Novell NetWare)</li>
   <li>os/2 (for OS/2)</li>
   <li>win9x for Microsoft Windows 95 and 98</li>
+  <li>z/os for z/OS and OS/390</li>
 </ul>
 
 <h4>equals</h4>
@@ -150,7 +151,8 @@ ignored.</p>
 
 <h4>http</h4>
 <p>The <code>http</code> condition checks for a valid response from a
-web server of the specified url.</p>
+web server of the specified url. By default, HTTP responses errors
+of 400 or greater are viewed as invalid.</p>
 <table border="1" cellpadding="2" cellspacing="0">
   <tr>
     <td width="12%" valign="top"><b>Attribute</b></td>
@@ -160,8 +162,13 @@ web server of the specified url.</p>
   <tr>
     <td valign="top">url</td>
     <td valign="top">The full URL of the page to request. The web server must
-      return a status code of &lt;500..</td>
+      return a status code of &lt;<tt>errorsBeginAt</tt></td>
     <td align="center">Yes.</td>
+    <td valign="top">errorsBeginAt</td>
+    <td valign="top">The lowest HTTP response code that signals an error;
+    by default '400'; server errors, not-authorized, not-found and the like 
+    are detected</td>
+    <td align="center">No</td>
   </tr>
 </table>
 
diff --git a/docs/manual/CoreTasks/copy.html b/docs/manual/CoreTasks/copy.html
index e7d9e34d7..231c17a21 100644
--- a/docs/manual/CoreTasks/copy.html
+++ b/docs/manual/CoreTasks/copy.html
@@ -11,10 +11,10 @@
 <h3>Description</h3>
 <p>Copies a file or FileSet to a new file or directory.  By default, files are
 only copied if the source file is newer than the destination file,
-or when the destination file does not exist.  However, you can explicitly 
+or when the destination file does not exist.  However, you can explicitly
 overwrite files with the <code>overwrite</code> attribute.</p>
 <p><a href="../CoreTypes/fileset.html">FileSet</a>s are used to select a
-set of files to copy.  
+set of files to copy.
 To use a <code>&lt;fileset&gt;</code>, the <code>todir</code> attribute
 must be set.</p>
 <h3>Parameters</h3>
@@ -27,7 +27,7 @@ must be set.</p>
   <tr>
     <td valign="top">file</td>
     <td valign="top">The file to copy.</td>
-    <td valign="top" align="center">Yes, unless a nested 
+    <td valign="top" align="center">Yes, unless a nested
     <code>&lt;fileset&gt;</code> element is used.</td>
   </tr>
   <tr>
@@ -89,26 +89,34 @@ must be set.</p>
      </td>
      <td valign="top" align="center">No; defaults to true.</td>
   </tr>
+  <tr>
+    <td valign="top">verbose</td>
+     <td valign="top">Log the files that are being copied.</td>
+     <td valign="top" align="center">No; defaults to false.</td>
+  </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
- 
+
 <h4>fileset</h4>
  <p><a href="../CoreTypes/fileset.html">FileSet</a>s are used to select
-sets of files to copy.  
+sets of files to copy.
  To use a fileset, the <code>todir</code> attribute must be set.</p>
- 
+
 <h4>mapper</h4>
  <p>You can define filename transformations by using a nested <a
  href="../CoreTypes/mapper.html">mapper</a> element. The default mapper used by
  <code>&lt;copy&gt;</code> is the <a
  href="../CoreTypes/mapper.html#identity-mapper">identity mapper</a>.</p>
- 
+
 <h4>filterset</h4>
  <p><a href="../CoreTypes/filterset.html">FilterSet</a>s are used to replace
-tokens in files that are copied.  
+tokens in files that are copied.
  To use a FilterSet, use the nested <code>&lt;filterset&gt;</code> element.</p>
- 
-  
+
+<h4>filterchain</h4>
+<p>The Copy task supports nested <a href="../CoreTypes/filterchain.html">
+FilterChain</a>s.</p>
+
 <h3>Examples</h3>
 <p><b>Copy a single file</b></p>
 <pre>
@@ -162,7 +170,7 @@ are copied; they end up with the default <code>UMASK</code> permissions
 instead. This
 is caused by the lack of any means to query or set file permissions in the
 current Java runtimes. If you need a permission-preserving copy function,
-use <code>&lt;exec executable="cp" ... &gt;</code> instead. 
+use <code>&lt;exec executable="cp" ... &gt;</code> instead.
 </p>
 
 <p><strong>Windows Note:</strong> If you copy a file to a directory
@@ -172,7 +180,7 @@ the copied file takes on the case of the original. The workaround is to
 the file in the destination directory before you copy it.
 </p>
 
-<hr><p align="center">Copyright &copy; 2001-2002 Apache Software Foundation.
+<hr><p align="center">Copyright &copy; 2000-2002 Apache Software Foundation.
 All rights Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/copydir.html b/docs/manual/CoreTasks/copydir.html
index fd3a0f195..09072ac6e 100644
--- a/docs/manual/CoreTasks/copydir.html
+++ b/docs/manual/CoreTasks/copydir.html
@@ -112,7 +112,7 @@ recursively. All java files are copied, except for files with the name <code>Tes
 <p>copies the directory <code>${src}/resources</code> to <code>${dist}</code>
 recursively. All java files are copied, except for the files under the <code>mypackage/test</code>
 directory.</p>
-<hr><p align="center">Copyright &copy; 2001 Apache Software Foundation. All rights
+<hr><p align="center">Copyright &copy; 2000-2001 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/copyfile.html b/docs/manual/CoreTasks/copyfile.html
index e0ba8f3c8..855f95af2 100644
--- a/docs/manual/CoreTasks/copyfile.html
+++ b/docs/manual/CoreTasks/copyfile.html
@@ -51,7 +51,7 @@ does not exist.</p>
   <p><code>&lt;copyfile src=&quot;${src}/index.html&quot; dest=&quot;${dist}/help/index.html&quot;
   /&gt;</code></p>
 </blockquote>
-<hr><p align="center">Copyright &copy; 2001 Apache Software Foundation. All rights
+<hr><p align="center">Copyright &copy; 2000-2001 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/cvs.html b/docs/manual/CoreTasks/cvs.html
index db9bceb9a..289377da4 100644
--- a/docs/manual/CoreTasks/cvs.html
+++ b/docs/manual/CoreTasks/cvs.html
@@ -159,7 +159,7 @@ before the command, and any command options should appear after the command as i
 above. See <a href="http://www.cvshome.org/docs/manual/index.html" target="_top">the cvs manual</a> for details,
 specifically the <a href="http://www.cvshome.org/docs/manual/cvs_16.html" target="_top">Guide to CVS commands</a></p>
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software
+<p align="center">Copyright &copy; 2000-2002 Apache Software
 Foundation.  All rights Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/delete.html b/docs/manual/CoreTasks/delete.html
index f6d8d563e..2d090c9dd 100644
--- a/docs/manual/CoreTasks/delete.html
+++ b/docs/manual/CoreTasks/delete.html
@@ -149,7 +149,7 @@ and any subdirectories.</p>
 </pre>
 <p>deletes all files and subdirectories of <code>build</code>, including
 <code>build</code> itself.</p>
-<hr><p align="center">Copyright &copy; 2001-2002 Apache Software Foundation.
+<hr><p align="center">Copyright &copy; 2000-2002 Apache Software Foundation.
 All rights Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/deltree.html b/docs/manual/CoreTasks/deltree.html
index 1df22d937..08dd2b991 100644
--- a/docs/manual/CoreTasks/deltree.html
+++ b/docs/manual/CoreTasks/deltree.html
@@ -32,7 +32,7 @@ subdirectories.</p>
 <pre>  &lt;deltree dir=&quot;${dist}&quot;/&gt;</pre>
 <p>deletes the directory <code>${dist}</code>, including its files and
 subdirectories.</p>
-<hr><p align="center">Copyright &copy; 2001 Apache Software Foundation. All rights
+<hr><p align="center">Copyright &copy; 2000-2001 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/echo.html b/docs/manual/CoreTasks/echo.html
index 7c85d429c..d23acd333 100644
--- a/docs/manual/CoreTasks/echo.html
+++ b/docs/manual/CoreTasks/echo.html
@@ -83,7 +83,7 @@ Note the use of a double $ symbol to stop Ant
 filtering out the single $ during variable expansion   
 <hr>
 
-<p align="center">Copyright &copy; 2001 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2001 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/exec.html b/docs/manual/CoreTasks/exec.html
index 715d7ab6c..d728eac99 100644
--- a/docs/manual/CoreTasks/exec.html
+++ b/docs/manual/CoreTasks/exec.html
@@ -193,7 +193,7 @@ sub process is killed and a message printed to the log. The return
 value of the execution will be "-1", which will halt the build if
 <tt>failonerror=true</tt>, but be ignored otherwise.
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/fail.html b/docs/manual/CoreTasks/fail.html
index 656314ce8..d679539a2 100644
--- a/docs/manual/CoreTasks/fail.html
+++ b/docs/manual/CoreTasks/fail.html
@@ -59,7 +59,7 @@ build.xml:4: Something wrong here.
 <p>will give the same result as above.</p>
 
 <hr>
-<p align="center">Copyright &copy; 2001 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2001 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/filter.html b/docs/manual/CoreTasks/filter.html
index befe4971f..e579ac4a8 100644
--- a/docs/manual/CoreTasks/filter.html
+++ b/docs/manual/CoreTasks/filter.html
@@ -55,7 +55,7 @@ will read all property entries from the <i>deploy_env.properties</i> file
 and set these as filters.
 
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/fixcrlf.html b/docs/manual/CoreTasks/fixcrlf.html
index e305aa01a..a281c978f 100644
--- a/docs/manual/CoreTasks/fixcrlf.html
+++ b/docs/manual/CoreTasks/fixcrlf.html
@@ -267,7 +267,7 @@ EOF characters are left alone if run on
 DOS systems, and are removed if run on Unix systems.
 You never know what editor a user will use to browse README's.</p>
 <hr>
-<p align="center">Copyright &copy; 2001 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2001 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/genkey.html b/docs/manual/CoreTasks/genkey.html
index 27be18c95..709dc5518 100644
--- a/docs/manual/CoreTasks/genkey.html
+++ b/docs/manual/CoreTasks/genkey.html
@@ -96,7 +96,7 @@
 &lt;/genkey&gt;</code></pre>
 </blockquote>
 <hr>
-<p align="center">Copyright &copy; 2001 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2001 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/get.html b/docs/manual/CoreTasks/get.html
index 1b1b8980c..9233787c1 100644
--- a/docs/manual/CoreTasks/get.html
+++ b/docs/manual/CoreTasks/get.html
@@ -98,7 +98,7 @@ for progress information.
 Fetches some file from a server with access control. Because https is being used the
 fact that basic auth sends passwords in plaintext is moot.
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/jar.html b/docs/manual/CoreTasks/jar.html
index 51ab567c6..6fb8109e2 100644
--- a/docs/manual/CoreTasks/jar.html
+++ b/docs/manual/CoreTasks/jar.html
@@ -39,15 +39,15 @@ JAR file already exists. When set to <code>yes</code>, the JAR file is
 updated with the files specified. When set to <code>no</code> (the
 default) the JAR file is overwritten. An example use of this is
 provided in the <a href="zip.html">Zip task documentation</a>.</p>
-<p>(The Jar task is a shortcut for specifying the manifest file of a JAR file. 
+<p>(The Jar task is a shortcut for specifying the manifest file of a JAR file.
 The same thing can be accomplished by using the <i>fullpath</i>
 attribute of a zipfileset in a Zip task. The one difference is that if the
-<i>manifest</i> attribute is not specified, the Jar task will 
+<i>manifest</i> attribute is not specified, the Jar task will
 include an empty one for you.)</p>
 
-<p>Manifests are processed by the Jar task according to the 
+<p>Manifests are processed by the Jar task according to the
 <a href="http://java.sun.com/j2se/1.3/docs/guide/jar/jar.html">Jar file specification.</a>
-Note in particular that this may result in manifest lines greater than 72 bytes 
+Note in particular that this may result in manifest lines greater than 72 bytes
 being wrapped and continued on the next line.
 </p>
 
@@ -123,7 +123,14 @@ being wrapped and continued on the next line.
   </tr>
   <tr>
     <td valign="top">filesetmanifest</td>
-    <td valign="top">behavior when a Manifest is found in a zipfileset or zipgroupfileset file is found.  Valid values are &quot;skip&quot;, &quot;merge&quot;, and &quot;mergewithoutmain&quot;.  &quot;merge&quot; will merge all of manifests together, and merge this into any other specified manifests.  &quot;mergewithoutmain&quot; merges everything but the Main section of the manifests.  Default value is &quot;skip&quot;.
+    <td valign="top">behavior when a Manifest is found in a zipfileset or
+    zipgroupfileset file is found.  Valid values are &quot;skip&quot;,
+    &quot;merge&quot;, and &quot;mergewithoutmain&quot;.  &quot;merge&quot;
+    will merge all of manifests together, and merge this into any other
+    specified manifests.  &quot;mergewithoutmain&quot; merges everything
+    but the Main section of the manifests.  Default value is &quot;skip&quot;.
+    <b>Note:</b> if this attribute's value is not &quot;skip&quot;, the
+    created jar will not be readable by using java.util.jar.JarInputStream
     </td>
     <td valign="top" align="center">No</td>
   </tr>
@@ -158,25 +165,25 @@ end up in the <code>META-INF</code> directory of the jar file. If this
 fileset includes a file named <code>MANIFEST.MF</code>, the file is
 ignored and you will get a warning.</p>
 
-<h4>Manifest</h4>
+<h4>manifest</h4>
 <p>The manifest nested element allows the manifest for the Jar file to
 be provided inline in the build file rather than in an external
-file. This element is identical to the 
+file. This element is identical to the
 <a href="manifest.html">manifest</a> task, but its file and mode
 attributes will be ignored.</p>
 <p>
 If both an inline manifest and an external file are both specified, the
-manifests are merged. 
+manifests are merged.
 </p>
 
 <p>When using inline manifests, the Jar task will check whether the build
 file is more recent that the Jar file when deciding whether to rebuild the
-Jar. This will not take into account property file changes which may affect 
+Jar. This will not take into account property file changes which may affect
 the resulting Jar.
 </p>
 
 <h3>Examples</h3>
-<pre>  &lt;jar file=&quot;${dist}/lib/app.jar&quot; basedir=&quot;${build}/classes&quot;/&gt;</pre>
+<pre>  &lt;jar destfile=&quot;${dist}/lib/app.jar&quot; basedir=&quot;${build}/classes&quot;/&gt;</pre>
 <p>jars all files in the <code>${build}/classes</code> directory into a file
 called <code>app.jar</code> in the <code>${dist}/lib</code> directory.</p>
 <pre>  &lt;jar destfile=&quot;${dist}/lib/app.jar&quot;
@@ -221,7 +228,7 @@ by Java).</p>
   &lt;/jar&gt;</pre>
 <p>
 This is an example of an inline manifest specification. Note that the Built-By
-attribute will take the value of the Ant property ${user.name}. The manifest 
+attribute will take the value of the Ant property ${user.name}. The manifest
 produced by the above would look like this:
 </p>
 <pre><code>Manifest-Version: 1.0
@@ -232,7 +239,7 @@ Name: common/class1.class
 Sealed: false</code></pre>
 
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/java.html b/docs/manual/CoreTasks/java.html
index d153c3b28..7b8823ab4 100644
--- a/docs/manual/CoreTasks/java.html
+++ b/docs/manual/CoreTasks/java.html
@@ -118,8 +118,8 @@ JVM.
 <h3>Parameters specified as nested elements</h3>
 <h4>arg and jvmarg</h4>
 <p>Use nested <code>&lt;arg&gt;</code> and <code>&lt;jvmarg&gt;</code>
-elements to specify arguments for the or the forked VM. See <a
-href="../using.html#arg">Command line arguments</a>.</p>
+elements to specify arguments for the Java class and the forked VM respectively. 
+See <a href="../using.html#arg">Command line arguments</a>.</p>
 <h4>sysproperty</h4>
 <p>Use nested <code>&lt;sysproperty&gt;</code>
 elements to specify system properties required by the class. 
@@ -175,7 +175,7 @@ and with a maximum memory of 128MB. Any non zero return code breaks the build.
 JVM, as it takes different parameters for other JVMs,
 That JVM can be started from &lt;exec&gt; if required.
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/javac.html b/docs/manual/CoreTasks/javac.html
index 598dd1aa9..a9ac23004 100644
--- a/docs/manual/CoreTasks/javac.html
+++ b/docs/manual/CoreTasks/javac.html
@@ -229,8 +229,13 @@ invoking the compiler.</p>
   </tr>
   <tr>
     <td valign="top">target</td>
-    <td valign="top">Generate class files for specific VM version (e.g.,
-	 <code>1.1</code> or <code>1.2</code>).</td>
+    <td valign="top">Generate class files for specific VM version
+    (e.g., <code>1.1</code> or <code>1.2</code>). <b>Note that the
+    default value depends on the JVM that is running Ant.  In
+    particular, if you use JDK 1.4 the generated classes will not be
+    usable for a 1.1 Java VM unless you explicitly set this attribute
+    to the value 1.1 (which is the default value for JDK 1.1 to
+    1.3).</b></td>
     <td align="center" valign="top">No</td>
   </tr>
   <tr>
@@ -456,6 +461,20 @@ the property <code>src2</code>. This can also be represented using nested
     &lt;exclude name=&quot;mypackage/p1/testpackage/**&quot;/&gt;
   &lt;/javac&gt;</pre>
 
+<p>If you want to run the javac compiler of a different JDK, you
+should tell Ant, where to find the compiler and which version of JDK
+you will be using so it can choose the correct command line switches.
+The following example executes a JDK 1.1 javac in a new process and
+uses the correct command line switches even when Ant is running in a
+Java VM of a different version:</p>
+
+<pre>  &lt;javac srcdir=&quot;${src}&quot;
+         destdir=&quot;${build}&quot;
+         fork=&quot;yes&quot;
+         executable=&quot;/opt/java/jdk1.1/bin/javac&quot;
+         compiler=&quot;javac1.1&quot;
+  /&gt;</pre>
+
 <p><a name="srcdirnote"><b>Note:</b></a>
 If you wish to compile only source files located in certain packages below a
 common root, use the <code>include</code>/<code>exclude</code> attributes
@@ -543,7 +562,7 @@ while all others are <code>false</code>.</p>
 </p>
 
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation.
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation.
 All rights Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/javadoc.html b/docs/manual/CoreTasks/javadoc.html
index cf698f6d6..925cc3dca 100644
--- a/docs/manual/CoreTasks/javadoc.html
+++ b/docs/manual/CoreTasks/javadoc.html
@@ -724,7 +724,7 @@ respectively.</p>
   &lt/javadoc&gt;</pre>
 
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/loadfile.html b/docs/manual/CoreTasks/loadfile.html
index 7603b6e17..99d372f53 100644
--- a/docs/manual/CoreTasks/loadfile.html
+++ b/docs/manual/CoreTasks/loadfile.html
@@ -71,7 +71,7 @@ Load a file, don't fail if it is missing (a message is printed, though)
       srcFile="recipientlist.txt"&gt;
       &lt;filterchain&gt;
         &lt;<a href="../CoreTypes/filterchain.html#striplinebreaks">striplinebreaks</a>/&gt;
-      &lt;/filterchaint&gt;
+      &lt;/filterchain&gt;
     &lt;/loadfile&gt;
 </pre>
 Load a property which can be used as a parameter for another task (in this case mail),
diff --git a/docs/manual/CoreTasks/mail.html b/docs/manual/CoreTasks/mail.html
index 69484eb7c..b489d9fa4 100644
--- a/docs/manual/CoreTasks/mail.html
+++ b/docs/manual/CoreTasks/mail.html
@@ -179,7 +179,7 @@ inside the <code>&lt;message&gt;</code> element.</p>
 task will attempt to use JavaMail and fall back to UU encoding or no encoding in
 that order depending on what support classes are available.</p>
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/mkdir.html b/docs/manual/CoreTasks/mkdir.html
index 059c118eb..125389dd2 100644
--- a/docs/manual/CoreTasks/mkdir.html
+++ b/docs/manual/CoreTasks/mkdir.html
@@ -30,7 +30,7 @@ necessary.</p>
 <pre>&lt;mkdir dir=&quot;${dist}/lib&quot;/&gt;</pre>
 <p>creates a directory <code>${dist}/lib</code>.</p>
 <hr>
-<p align="center">Copyright &copy; 2001 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2001 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/move.html b/docs/manual/CoreTasks/move.html
index 252c13352..0f2f88b86 100644
--- a/docs/manual/CoreTasks/move.html
+++ b/docs/manual/CoreTasks/move.html
@@ -26,13 +26,13 @@ to move to the <var>todir</var> directory.</p>
   <tr>
     <td valign="top">file</td>
     <td valign="top">the file to move</td>
-    <td valign="top" align="center">One of <var>file</var> or 
+    <td valign="top" align="center">One of <var>file</var> or
      at least one nested fileset element</td>
   </tr>
   <tr>
     <td valign="top">tofile</td>
     <td valign="top">the file to move to</td>
-    <td valign="top" align="center" rowspan="2">With the <var>file</var> attribute, 
+    <td valign="top" align="center" rowspan="2">With the <var>file</var> attribute,
     either <var>tofile</var> or <var>todir</var> can be used.  With nested filesets,
     if the fileset size is greater than 1 or if the only entry in the fileset is a
     directory or if the <var>file</var> attribute is already specified, only
@@ -59,7 +59,7 @@ to move to the <var>todir</var> directory.</p>
     <td valign="top">flatten</td>
     <td valign="top">ignore directory structure of source directory,
       copy all files into a single directory, specified by the <var>todir</var>
-      attribute (default is &quot;false&quot;).Note that you can achieve the 
+      attribute (default is &quot;false&quot;).Note that you can achieve the
       same effect by using a <a href="../CoreTypes/mapper.html#flatten-mapper">flatten mapper</a></td>
     <td valign="top" align="center">No</td>
   </tr>
@@ -76,6 +76,9 @@ to move to the <var>todir</var> directory.</p>
 href="../CoreTypes/mapper.html">mapper</a> element. The default mapper used by
 <code>&lt;copy&gt;</code> is the <a
 href="../CoreTypes/mapper.html#identity-mapper">identity</a>.</p>
+<h4>filterchain</h4>
+<p>The Move task supports nested <a href="../CoreTypes/filterchain.html">
+FilterChain</a>s.</p>
 <h3>Examples</h3>
 <p><b>Move a single file (rename a file)</b></p>
 <pre>
@@ -111,7 +114,7 @@ in a directory.</b></p>
   &lt;/move&gt;
 </pre>
 <hr>
-<p align="center">Copyright &copy; 2001 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/pack.html b/docs/manual/CoreTasks/pack.html
index b1243e9e5..cb5d82180 100644
--- a/docs/manual/CoreTasks/pack.html
+++ b/docs/manual/CoreTasks/pack.html
@@ -40,7 +40,7 @@ file is newer.</p>
   /&gt;</code></p>
 </blockquote>
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/patch.html b/docs/manual/CoreTasks/patch.html
index 12083a6b9..abab0c672 100644
--- a/docs/manual/CoreTasks/patch.html
+++ b/docs/manual/CoreTasks/patch.html
@@ -74,7 +74,7 @@ the diff output looked like</p>
 </pre> 
 the leading <i>a/</i> will be stripped.
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/property.html b/docs/manual/CoreTasks/property.html
index 3552315ff..be39b0249 100644
--- a/docs/manual/CoreTasks/property.html
+++ b/docs/manual/CoreTasks/property.html
@@ -147,7 +147,7 @@ Two of the values are shown being echoed.
 </p> 
 
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 </body>
 </html>
diff --git a/docs/manual/CoreTasks/rename.html b/docs/manual/CoreTasks/rename.html
index 555a2afd2..ccf0e26f1 100644
--- a/docs/manual/CoreTasks/rename.html
+++ b/docs/manual/CoreTasks/rename.html
@@ -41,7 +41,7 @@
  and <code>version</code> being predefined properties). If a file named <code>${name}-${version}.jar</code>
  already exists, it will be removed prior to renaming <code>foo.jar</code>.</p>
 <hr>
-<p align="center">Copyright &copy; 2001 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2001 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/replace.html b/docs/manual/CoreTasks/replace.html
index f89b08c8d..131745625 100644
--- a/docs/manual/CoreTasks/replace.html
+++ b/docs/manual/CoreTasks/replace.html
@@ -177,7 +177,7 @@ token]]>&lt;/replacevalue&gt;
 <p><b>Note:</b> It is possible to use either the <i>token</i>/<code>&lt;replacetoken&gt;</code> and <i>value</i>/<code>&lt;replacevalue&gt;</code> attributes/elements, the nested replacefilter elements, or both in the same operation.
 </p>
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/rmic.html b/docs/manual/CoreTasks/rmic.html
index e6ec07412..6857a7ab7 100644
--- a/docs/manual/CoreTasks/rmic.html
+++ b/docs/manual/CoreTasks/rmic.html
@@ -234,7 +234,7 @@ files below <code>${build}/classes</code> whose classname starts with
 <code>${build}/classes</code>.</p>
 
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/signjar.html b/docs/manual/CoreTasks/signjar.html
index 86c69ca6e..bfa52afa9 100644
--- a/docs/manual/CoreTasks/signjar.html
+++ b/docs/manual/CoreTasks/signjar.html
@@ -108,7 +108,7 @@ alias=&quot;apache-group&quot; storepass=&quot;secret&quot;/&gt;</code></p>
 <p>signs the ant.jar with alias &quot;apache-group&quot; accessing the
 keystore and private key via &quot;secret&quot; password.</p>
 <hr>
-<p align="center">Copyright &copy; 2001 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2001 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/sql.html b/docs/manual/CoreTasks/sql.html
index 9ce04e80b..7c8ce35c1 100644
--- a/docs/manual/CoreTasks/sql.html
+++ b/docs/manual/CoreTasks/sql.html
@@ -282,7 +282,7 @@ truncate table some_other_table;
 </pre></blockquote>
 
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 </body>
 </html>
diff --git a/docs/manual/CoreTasks/style.html b/docs/manual/CoreTasks/style.html
index 6b3bfb04a..ea9471303 100644
--- a/docs/manual/CoreTasks/style.html
+++ b/docs/manual/CoreTasks/style.html
@@ -27,8 +27,10 @@ inclusion/exclusion of files works, and how to write patterns.</p>
   attributes of <code>&lt;fileset&gt;</code> (<code>dir</code> becomes <code>basedir</code>) 
   as well as the nested <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code> 
   and <code>&lt;patternset&gt;</code> elements.</p>
-<p>Style supports the use of a &lt;param&gt; element which is used to pass values 
+<p>This task supports the use of a nested &lt;param&gt; element which is used to pass values 
   to an &lt;xsl:param&gt; declaration.</p>
+<p>This task supports the use of a nested <a href="../CoreTypes/xmlcatalog.html">xmlcatalog</a> 
+element which is used to perform Entity and URI resolution</p>
 <p><i>&lt;style&gt; and &lt;xslt&gt; refer to the same Ant task and can be used interchangeably.</i></p>
 <p>If you want to use Xalan-J 1 or XSL:P, you also need Ant's optional.jar</p>
 <h3>Parameters</h3>
@@ -161,6 +163,9 @@ inclusion/exclusion of files works, and how to write patterns.</p>
 <p>The classpath to load the processor from can be specified via a
 nested <code>&lt;classpath&gt;</code>, as well - that is, a 
 <a href="../using.html#path">path</a>-like structure.</p>
+<h4>xmlcatalog</h4>
+<p>The <a href="../CoreTypes/xmlcatalog.html">xmlcatalog</a> 
+element is used to perform Entity and URI resolution.</p>
 <h4>param</h4>
 <p>Param is used to pass a parameter to the XSL stylesheet.</p>
 <h4>Parameters</h4>
@@ -187,9 +192,23 @@ nested <code>&lt;classpath&gt;</code>, as well - that is, a
   <pre>
 &lt;style basedir=&quot;doc&quot; destdir=&quot;build/doc&quot;
        extension=&quot;.html&quot; style=&quot;style/apache.xsl&quot;/&gt;</pre>
-  <h4>Using XSL parameters</h4>
+  <h4>Using an xmlcatalog</h4>
   <pre>&lt;xslt basedir=&quot;doc&quot; destdir=&quot;build/doc&quot;
       extension=&quot;.html&quot; style=&quot;style/apache.xsl&quot;&gt;
+  &lt;xmlcatalog refid=&quot;mycatalog&quot;/&gt;
+&lt;/xslt&gt;
+
+&lt;xslt basedir=&quot;doc&quot; destdir=&quot;build/doc&quot;
+   extension=&quot;.html&quot; style=&quot;style/apache.xsl&quot;&gt;
+   &lt;xmlcatalog&gt;
+       &lt;dtd 
+         publicId=&quot;-//ArielPartners//DTD XML Article V1.0//EN&quot;
+         location=&quot;com/arielpartners/knowledgebase/dtd/article.dtd&quot;/&gt;
+   &lt;/xmlcatalog&gt;
+&lt;/xslt&gt;</pre>
+  <h4>Using XSL parameters</h4>
+<pre>&lt;xslt basedir=&quot;doc&quot; destdir=&quot;build/doc&quot;
+      extension=&quot;.html&quot; style=&quot;style/apache.xsl&quot;&gt;
   &lt;param name=&quot;date&quot; expression=&quot;07-01-2000&quot;/&gt;
 &lt;/xslt&gt;</pre>
 
@@ -199,7 +218,7 @@ nested <code>&lt;classpath&gt;</code>, as well - that is, a
   </p>
  </blockquote>
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/tar.html b/docs/manual/CoreTasks/tar.html
index 60511f10a..db3790d63 100644
--- a/docs/manual/CoreTasks/tar.html
+++ b/docs/manual/CoreTasks/tar.html
@@ -228,7 +228,7 @@ of a directory, so <code>${dist.name}</code> is a valid path relative
 to <code>${dist.name}/..</code>.</p>
 
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/taskdef.html b/docs/manual/CoreTasks/taskdef.html
index 1071e9341..64c97fb52 100644
--- a/docs/manual/CoreTasks/taskdef.html
+++ b/docs/manual/CoreTasks/taskdef.html
@@ -59,6 +59,13 @@ href="../develop.html#writingowntask">Writing your own task</a>&quot;.</p>
     <code>resource</code>.</td>
     <td align="center" valign="top">No</td>
   </tr>
+  <tr>
+    <td valign="top">loaderRef</td> <td valign="top">the name of the loader that is
+    used to load the class, constructed from the specified classpath. Use this to
+    allow multiple tasks/types to be loaded with the same loader, so they can call
+    each other. ( introduced in ant1.5 )</td>
+    <td align="center" valign="top">No</td>
+  </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 <h4>classpath</h4>
@@ -70,7 +77,7 @@ href="../using.html#path">PATH like structure</a> and can also be set via a nest
 <p>makes a task called <code>myjavadoc</code> available to Ant. The class <code>com.mydomain.JavadocTask</code>
 implements the task.</p>
 <hr>
-<p align="center">Copyright &copy; 2001 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/tempfile.html b/docs/manual/CoreTasks/tempfile.html
new file mode 100644
index 000000000..f234b0f37
--- /dev/null
+++ b/docs/manual/CoreTasks/tempfile.html
@@ -0,0 +1,195 @@
+    
+<html>
+<head>
+  <meta http-equiv="Content-Language" content="en-us">
+  <title>Tempfile
+ Task</title>
+</head>
+
+<body bgcolor="#ffffff" text="#000000" link="#525D76"
+      alink="#525D76" vlink="#525D76">
+
+<table border="0" width="100%" cellspacing="4">
+
+  <!-- PAGE HEADER -->
+  <tr>
+    <td>
+      <table border="0" width="100%"><tr>
+          <td valign="bottom">
+            <font size="+3" face="arial,helvetica,sanserif"><strong>Tempfile
+ Task</strong></font>
+            <br><font face="arial,helvetica,sanserif">This task sets a property to  the name of a temporary file.</font>
+          </td>
+          <td>
+            <!-- PROJECT LOGO -->
+            <a href="http://jakarta.apache.org/ant/">
+              <img src="../../images/ant_logo_large.gif" align="right" alt="Apache Ant" border="0"/>
+            </a>
+          </td>
+      </tr></table>
+    </td>
+  </tr>
+
+  <!-- START RIGHT SIDE MAIN BODY -->
+  <tr>
+    <td  valign="top" align="left">
+
+          <!-- Applying task/long-description -->
+    <!-- Start Description -->
+    <table border="0" cellspacing="0" cellpadding="2" width="100%">
+      <tr><td>&nbsp;</td></tr>
+
+      <tr><td bgcolor="#525D76">
+        <font color="#ffffff" face="arial,helvetica.sanserif">
+          <a name="description">
+          <strong>Description</strong></a></font>
+      </td></tr>
+
+      <tr><td><blockquote>
+        This task sets a property to  the name of a temporary file. 
+  Unlike the Java1.2 method to create a temporary file, this task
+  does work on Java1.1. Also, it does not actually create the
+  temporary file, but it does guarantee that the file did not
+  exist when the task was executed. 
+ <p>  
+ Examples
+ <pre>&lt;tempfile property="temp.file" /&gt;</pre>
+ create a temporary file
+ <pre>&lt;tempfile property="temp.file" suffix=".xml" /&gt;</pre>
+ create a temporary file with the .xml suffix.
+ <pre>&lt;tempfile property="temp.file" destDir="build"/&gt;</pre>
+ create a temp file in the build subdir
+      </blockquote></td></tr>
+
+    </table>
+    <!-- End Description -->
+
+    <!-- Start Attributes -->
+    <table border="0" cellspacing="0" cellpadding="2" width="100%">
+      <tr><td>&nbsp;</td></tr>
+
+      <tr><td bgcolor="#525D76">
+        <font color="#ffffff" face="arial,helvetica.sanserif">
+          <a name="attributes">
+          <strong>Parameters</strong></a></font>
+      </td></tr>
+
+      <tr><td><blockquote>
+        <table>
+          <tr>
+        <td bgcolor="#cccccc" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif"><b>Attribute</b></font>
+        </td>
+        <td bgcolor="#cccccc" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif"><b>Description</b></font>
+        </td>
+        <td bgcolor="#cccccc" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif"><b>Type</b></font>
+        </td>
+          </tr>
+    <!-- Attribute -->
+    <tr>
+        <td bgcolor="#eeeeee" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">destDir</font>
+        </td>
+        <td bgcolor="#eeeeee" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          destination directory. If null, 
+the parent directory is used instead
+        </font>
+        </td>
+        <td bgcolor="#eeeeee" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">File</font>
+        </td>
+    </tr>
+    <!-- Attribute -->
+    <tr>
+        <td bgcolor="#eeeeee" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">prefix</font>
+        </td>
+        <td bgcolor="#eeeeee" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          optional prefix string
+        </font>
+        </td>
+        <td bgcolor="#eeeeee" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">String</font>
+        </td>
+    </tr>
+    <!-- Attribute -->
+    <tr>
+        <td bgcolor="#eeeeee" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">property</font>
+        </td>
+        <td bgcolor="#eeeeee" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          The property you wish to assign the temporary file to
+        </font>
+        </td>
+        <td bgcolor="#eeeeee" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">String</font>
+        </td>
+    </tr>
+    <!-- Attribute -->
+    <tr>
+        <td bgcolor="#eeeeee" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">suffix</font>
+        </td>
+        <td bgcolor="#eeeeee" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          Suffix string for the temp file (optional)
+        </font>
+        </td>
+        <td bgcolor="#eeeeee" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">String</font>
+        </td>
+    </tr>
+
+        </table>
+      </blockquote></td></tr>
+
+    </table>
+    <!-- End Attributes -->
+
+    <!-- Start Elements -->
+    <table border="0" cellspacing="0" cellpadding="2" width="100%">
+      <tr><td>&nbsp;</td></tr>
+
+      <tr><td bgcolor="#525D76">
+        <font color="#ffffff" face="arial,helvetica.sanserif">
+          <a name="elements">
+          <strong>Parameters as nested elements</strong></a></font>
+      </td></tr>
+
+      <tr><td><blockquote>
+
+      </blockquote></td></tr>
+
+    </table>
+    <!-- End Elements -->
+
+
+    </td>
+  </tr>
+  <!-- END RIGHT SIDE MAIN BODY -->
+
+  <!-- FOOTER SEPARATOR -->
+  <tr>
+    <td>
+      <hr noshade="" size="1"/>
+    </td>
+  </tr>
+
+  <!-- PAGE FOOTER -->
+  <tr>
+    <td>
+      <div align="center"><font color="#525D76" size="-1"><em>
+        Copyright &#169; 2000-2002, Apache Software Foundation
+      </em></font></div>
+    </td>
+  </tr>
+
+</table>
+
+</body>
+</html>
diff --git a/docs/manual/CoreTasks/touch.html b/docs/manual/CoreTasks/touch.html
index 89ae477f8..e3044a0ba 100644
--- a/docs/manual/CoreTasks/touch.html
+++ b/docs/manual/CoreTasks/touch.html
@@ -57,7 +57,7 @@ hour times).</p>
 <p>changes the modification time to Oct, 09 1974 4:30 pm of all files and directories 
   found in <code>src_dir</code>. </p>
 <hr>
-<p align="center">Copyright &copy; 2001 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2001 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/tstamp.html b/docs/manual/CoreTasks/tstamp.html
index 29745423e..39a2bc73f 100644
--- a/docs/manual/CoreTasks/tstamp.html
+++ b/docs/manual/CoreTasks/tstamp.html
@@ -12,7 +12,7 @@
 <h3>Description</h3>
 <p>Sets the <code>DSTAMP</code>, <code>TSTAMP</code>, and <code>TODAY</code>
 properties in the current project. The <code>DSTAMP</code> property is in the
-format &quot;yyyymmdd&quot;, <code>TSTAMP</code> is in the
+format &quot;yyyyMMdd&quot;, <code>TSTAMP</code> is in the
 format &quot;hhmm&quot;, and <code>TODAY</code> is in the
 format &quot;month day year&quot;.</p>
 
@@ -137,7 +137,7 @@ Sets three properties with the standard formats, prefixed with "start.":
 
 
 <hr>
-<p align="center">Copyright &copy; 2002 Apache Software Foundation. All rights Reserved.</p>
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights Reserved.</p>
 
 </body>
 </html>
diff --git a/docs/manual/CoreTasks/typedef.html b/docs/manual/CoreTasks/typedef.html
index 932765330..c7e1153db 100644
--- a/docs/manual/CoreTasks/typedef.html
+++ b/docs/manual/CoreTasks/typedef.html
@@ -62,6 +62,13 @@ the project level and referenced via their ID attribute.</p>
       use when looking up <code>classname</code>.</td> <td
     align="center" valign="top">No</td>
   </tr>
+  <tr>
+    <td valign="top">loaderRef</td> <td valign="top">the name of the loader that is
+    used to load the class, constructed from the specified classpath. Use this to
+    allow multiple tasks/types to be loaded with the same loader, so they can call
+    each other. ( introduced in ant1.5 )</td>
+    <td align="center" valign="top">No</td>
+  </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 <h4>classpath</h4>
@@ -73,7 +80,7 @@ via a nested <i>classpath</i> element.</p>
 <p>makes a data type called <code>urlset</code> available to Ant. The
 class <code>com.mydomain.URLSet</code> implements this type.</p>
 <hr>
-<p align="center">Copyright &copy; 2001 Apache Software
+<p align="center">Copyright &copy; 2001-2002 Apache Software
 Foundation. All rights Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/unpack.html b/docs/manual/CoreTasks/unpack.html
index f58937f4e..2ebc4782e 100644
--- a/docs/manual/CoreTasks/unpack.html
+++ b/docs/manual/CoreTasks/unpack.html
@@ -56,7 +56,7 @@ does not exist.</p>
 subdir is a directory).</p>
 
 <hr>
-<p align="center">Copyright &copy; 2001 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2001 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/unzip.html b/docs/manual/CoreTasks/unzip.html
index fb8bb6bbb..94d6a1e02 100644
--- a/docs/manual/CoreTasks/unzip.html
+++ b/docs/manual/CoreTasks/unzip.html
@@ -71,8 +71,8 @@ to perform unarchival upon.
     &lt;patternset&gt;
         &lt;include name=&quot;**/*.java&quot;/&gt;
         &lt;exclude name=&quot;**/Test*.java&quot;/&gt;
-    &lt;patternset/&gt;
-&lt;unzip/&gt;
+    &lt;/patternset&gt;
+&lt;/unzip&gt;
 </pre></p>
 </blockquote>
 <blockquote>
@@ -81,16 +81,16 @@ to perform unarchival upon.
     &lt;patternset&gt;
         &lt;include name=&quot;**/*.java&quot;/&gt;
         &lt;exclude name=&quot;**/Test*.java&quot;/&gt;
-    &lt;patternset/&gt;
+    &lt;/patternset&gt;
     &lt;fileset dir=&quot;.&quot;&gt;
         &lt;include name=&quot;**/*.zip&quot;/&gt;
         &lt;exclude name=&quot;**/tmp*.zip&quot;/&gt;
-    &lt;fileset/&gt;
-&lt;unzip/&gt;
+    &lt;/fileset&gt;
+&lt;/unzip&gt;
 </pre></p>
 </blockquote>
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/uptodate.html b/docs/manual/CoreTasks/uptodate.html
index efb74890d..70bb68d66 100644
--- a/docs/manual/CoreTasks/uptodate.html
+++ b/docs/manual/CoreTasks/uptodate.html
@@ -89,7 +89,7 @@ The <code>xmlBuild.notRequired</code> property can then be used in a
 <code>&lt;target&gt;</code> tag's <code>unless</code> attribute to
 conditionally run that target. For example, running the following target:</p>
 <pre>
-&lt;target name=&quot;xmlBuild&quot; depends="chkXmlBuild" unless="xmlBuild.notRequired&quot;&gt;
+&lt;target name=&quot;xmlBuild&quot; depends=&quot;chkXmlBuild&quot; unless=&quot;xmlBuild.notRequired&quot;&gt;
   ...
 &lt;/target&gt;
 </pre>
@@ -113,7 +113,7 @@ if <code>/usr/local/bin/testit</code> is newer than
 </p>
 
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation.
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation.
 All rights Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/war.html b/docs/manual/CoreTasks/war.html
index 0c231d8a5..578a9db86 100644
--- a/docs/manual/CoreTasks/war.html
+++ b/docs/manual/CoreTasks/war.html
@@ -161,7 +161,7 @@ using Ant's default manifest file. The content of
 <code>WEB-INF/web.xml</code> is identical to
 <code>src/metadata/myapp.xml</code>.
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/zip.html b/docs/manual/CoreTasks/zip.html
index 71a84f149..5daf3b87c 100644
--- a/docs/manual/CoreTasks/zip.html
+++ b/docs/manual/CoreTasks/zip.html
@@ -212,7 +212,7 @@ The code
 <p>
 <p>zips all files in the <code>htdocs/manual</code> directory into the <code>docs/user-guide</code> directory in the archive and includes all the files in any file that maches <code>examples*.zip</code>, such as all files within <code>examples1.zip</code> or <code>examples_for_brian.zip</code>.
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTypes/dirset.html b/docs/manual/CoreTypes/dirset.html
index 061adef08..a1645de9d 100644
--- a/docs/manual/CoreTypes/dirset.html
+++ b/docs/manual/CoreTypes/dirset.html
@@ -63,6 +63,12 @@ elements of <code>&lt;patternset&gt;</code> directly, as well as
      <code>false</code>|<code>no</code>|<code>off</code>).</td>
     <td valign="top" align="center">No; defaults to true.</td>
   </tr>
+  <tr>
+    <td valign="top">followsymlinks</td>
+    <td valign="top">Shall symbolic links be followed? Defaults to
+      true. See <a href="fileset.html#symlink">fileset's documentation</a>.</td>
+    <td valign="top" align="center">No</td>
+  </tr>
 </table>
 
 <h4>Examples</h4>
diff --git a/docs/manual/CoreTypes/fileset.html b/docs/manual/CoreTypes/fileset.html
index b5b523473..f7ce1307e 100644
--- a/docs/manual/CoreTypes/fileset.html
+++ b/docs/manual/CoreTypes/fileset.html
@@ -68,8 +68,20 @@ attributes.</p>
         Defaults to true.</td>
     <td valign="top" align="center">No</td>
   </tr>
+  <tr>
+    <td valign="top">followsymlinks</td>
+    <td valign="top">Shall symbolic links be followed? Defaults to
+      true. See <a href="symlink">below</a>.</td>
+    <td valign="top" align="center">No</td>
+  </tr>
 </table>
 
+<p><a name="symlink"><b>Note</b></a>: All files/directories for which
+the canonical path is different from its path are considered symbolic
+links.  On Unix systems this usually means the file really is a
+symbolic links but it may lead to false results on other
+platforms.</p>
+
 <h4>Examples</h4>
 <blockquote><pre>
 &lt;fileset dir=&quot;${server.src}&quot; casesensitive=&quot;yes&quot; &gt;
@@ -100,7 +112,7 @@ a PatternSet that can be referenced in other
 same patterns as the above example.</p>
 
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation.
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation.
 All rights Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTypes/filterchain.html b/docs/manual/CoreTypes/filterchain.html
index 6bf995fcc..15d46acdd 100644
--- a/docs/manual/CoreTypes/filterchain.html
+++ b/docs/manual/CoreTypes/filterchain.html
@@ -239,6 +239,108 @@ Convenience method:
 &lt;/loadfile&gt;
 </PRE></BLOCKQUOTE>
 
+<H3><a name="linecontains">LineContains</a></H3>
+
+This filter includes only those lines that contain all the user-specified
+strings.
+
+<TABLE cellSpacing=0 cellPadding=2 border=1>
+  <TR>
+    <TD vAlign=top><B>Parameter Type</B></TD>
+    <TD vAlign=top><B>Parameter Value</B></TD>
+    <TD vAlign=top align="center"><B>Required</B></TD>
+  </TR>
+  <TR>
+    <TD vAlign=top>contains</TD>
+    <TD vAlign=top align="center">Substring to be searched for.</TD>
+    <TD vAlign=top align="center">Yes</TD>
+  </TR>
+</TABLE>
+<P>
+<H4>Example:</H4>
+
+This will include only those lines that contain <code>foo</code> and
+<code>bar</code>.
+<BLOCKQUOTE><PRE>
+&lt;filterreader classname=&quot;org.apache.tools.ant.filters.LineContains&quot;&gt;
+  &lt;param type=&quot;contains&quot; value=&quot;foo&quot;/&gt;
+  &lt;param type=&quot;contains&quot; value=&quot;bar&quot;/&gt;
+&lt;/filterreader&gt;
+</PRE></BLOCKQUOTE>
+
+Convenience method:
+<BLOCKQUOTE><PRE>
+&lt;linecontains&gt;
+  &lt;contains value=&quot;foo&quot;&gt;
+  &lt;contains value=&quot;bar&quot;&gt;
+&lt;/linecontains&gt;
+</PRE></BLOCKQUOTE>
+
+<H3><a name="linecontainsregexp">LineContainsRegExp</a></H3>
+
+Filter which includes only those lines that contain the user-specified
+regular expression matching strings.
+
+<TABLE cellSpacing=0 cellPadding=2 border=1>
+  <TR>
+    <TD vAlign=top><B>Parameter Type</B></TD>
+    <TD vAlign=top><B>Parameter Value</B></TD>
+    <TD vAlign=top align="center"><B>Required</B></TD>
+  </TR>
+  <TR>
+    <TD vAlign=top>regexp</TD>
+    <TD vAlign=top align="center">Pattern of the substring to be searched for.</TD>
+    <TD vAlign=top align="center">Yes</TD>
+  </TR>
+</TABLE>
+<P>
+<H4>Example:</H4>
+
+This will fetch all those lines that contain the pattern <code>foo</code>
+<BLOCKQUOTE><PRE>
+&lt;filterreader classname=&quot;org.apache.tools.ant.filters.LineContainsRegExp&quot;&gt;
+  &lt;param type=&quot;regexp&quot; value=&quot;foo*&quot;/&gt;
+&lt;/filterreader&gt;
+</PRE></BLOCKQUOTE>
+
+Convenience method:
+<BLOCKQUOTE><PRE>
+&lt;linecontainsregexp&gt;
+  &lt;regexp pattern=&quot;foo*&quot;&gt;
+&lt;/linecontainsregexp&gt;
+</PRE></BLOCKQUOTE>
+
+<H3><a name="prefixlines">PrefixLines</a></H3>
+
+Attaches a prefix to every line.
+
+<TABLE cellSpacing=0 cellPadding=2 border=1>
+  <TR>
+    <TD vAlign=top><B>Parameter Name</B></TD>
+    <TD vAlign=top><B>Parameter Value</B></TD>
+    <TD vAlign=top align="center"><B>Required</B></TD>
+  </TR>
+  <TR>
+    <TD vAlign=top>prefix</TD>
+    <TD vAlign=top align="center">Prefix to be attached to lines.</TD>
+    <TD vAlign=top align="center">Yes</TD>
+  </TR>
+</TABLE>
+<P>
+<H4>Example:</H4>
+
+This will attach the prefix <code>Foo</code> to all lines.
+<BLOCKQUOTE><PRE>
+&lt;filterreader classname=&quot;org.apache.tools.ant.filters.PrefixLines&quot;&gt;
+  &lt;param name=&quot;prefix&quot; value=&quot;Foo&quot;/&gt;
+&lt;/filterreader&gt;
+</PRE></BLOCKQUOTE>
+
+Convenience method:
+<BLOCKQUOTE><PRE>
+&lt;prefixlines prefix=&quot;Foo&quot;/&gt;
+</PRE></BLOCKQUOTE>
+
 <H3><a name="replacetokens">ReplaceTokens</a></H3>
 
 This filter reader replaces all strings that are
@@ -378,6 +480,49 @@ strips them.
 &lt;/loadfile&gt;
 </PRE></BLOCKQUOTE>
 
+<H3><a name="striplinecomments">StripLineComments</a></H3>
+
+This filter removes all those lines that begin with strings
+that represent comments as specified by the user.
+
+<TABLE cellSpacing=0 cellPadding=2 border=1>
+  <TR>
+    <TD vAlign=top><B>Parameter Type</B></TD>
+    <TD vAlign=top><B>Parameter Value</B></TD>
+    <TD vAlign=top align="center"><B>Required</B></TD>
+  </TR>
+  <TR>
+    <TD vAlign=top>comment</TD>
+    <TD vAlign=top align="center">Strings that identify a line as a comment
+    when they appear at the start of the line.</TD>
+    <TD vAlign=top align="center">Yes</TD>
+  </TR>
+</TABLE>
+<P>
+<H4>Examples:</H4>
+
+This removes all lines that begin with #, --, REM, rem and //
+<BLOCKQUOTE><PRE>
+&lt;filterreader classname=&quot;org.apache.tools.ant.filters.StripLineComments&quot;&gt;
+  &lt;param type=&quot;comment&quot; value="#&quot;/&gt;
+  &lt;param type=&quot;comment&quot; value=&quot;--&quot;/&gt;
+  &lt;param type=&quot;comment&quot; value=&quot;REM &quot;/&gt;
+  &lt;param type=&quot;comment&quot; value=&quot;rem &quot;/&gt;
+  &lt;param type=&quot;comment&quot; value=&quot;//&quot;/&gt;
+&lt;/filterreader&gt;
+</PRE></BLOCKQUOTE>
+
+Convenience method:
+<BLOCKQUOTE><PRE>
+&lt;striplinecomments&gt;
+  &lt;comment value=&quot;#&quot;/&gt;
+  &lt;comment value=&quot;--&quot;/&gt;
+  &lt;comment value=&quot;REM &quot;/&gt;
+  &lt;comment value=&quot;rem &quot;/&gt;
+  &lt;comment value=&quot;//&quot;/&gt;
+&lt;/striplinecomments&gt;
+</PRE></BLOCKQUOTE>
+
 <H3><a name="tabstospaces">TabsToSpaces</a></H3>
 
 This filter replaces tabs with spaces
@@ -476,8 +621,8 @@ Convenience method:
 <BLOCKQUOTE><PRE>
 &lt;loadfile srcfile=&quot;${src.file}&quot; property=&quot;${src.file.mid}&quot;&gt;
   &lt;filterchain&gt;
-    &lt;HeadFilter lines=&quot;15&quot;/&gt;
-    &lt;TailFilter lines=&quot;5&quot;/&gt;
+    &lt;headfilter lines=&quot;15&quot;/&gt;
+    &lt;tailfilter lines=&quot;5&quot;/&gt;
   &lt;/filterchain&gt;
 &lt;/loadfile&gt;
 </PRE></BLOCKQUOTE>
diff --git a/docs/manual/CoreTypes/mapper.html b/docs/manual/CoreTypes/mapper.html
index 56a9676a9..ab077ef69 100644
--- a/docs/manual/CoreTypes/mapper.html
+++ b/docs/manual/CoreTypes/mapper.html
@@ -367,7 +367,7 @@ with <code>&lt;uptodate&gt;</code> and <code>&lt;junit&gt;</code> output.</p>
 </table>
 
 <hr>
-<p align="center">Copyright &copy; 2001 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2001 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTypes/patternset.html b/docs/manual/CoreTypes/patternset.html
index 67845b0a7..fbca587e0 100644
--- a/docs/manual/CoreTypes/patternset.html
+++ b/docs/manual/CoreTypes/patternset.html
@@ -163,7 +163,7 @@ that it should be used only if a property is not set.</p>
 <code>some-other-file</code> points to, if a property of that name has
 been defined.</p>
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTypes/selectors-program.html b/docs/manual/CoreTypes/selectors-program.html
new file mode 100755
index 000000000..c4a12745e
--- /dev/null
+++ b/docs/manual/CoreTypes/selectors-program.html
@@ -0,0 +1,124 @@
+<html>
+  <head>
+    <meta http-equiv="Content-Language" content="en-us">
+    <title>Programming Selectors in Ant</title>
+  </head>
+
+  <body>
+    <h2>Programming your own Selectors</h2>
+
+    <h3>Selector Programming API</h3>
+
+    <p>Want to define your own selectors? It's easy!</p>
+
+    <p>First, pick the type of selector that you want to define. There
+    are three types, and a recipe for each one follows. Chances are
+    you'll want to work with the first one, Custom Selectors.</p>
+
+    <ol>
+      <li>Custom Selectors
+
+        <p>This is the category that Ant provides specifically for you
+to
+        define your own Selectors. Anywhere you want to use your selector
+        you use the <code>&lt;custom&gt;</code> element and specify
+        the class name of your selector within it. See the
+        <a href="selectors.html#customselect">Custom Selectors</a>
+        section of the Selector page for details. The
+        <code>&lt;custom&gt;</code> element can be used anywhere
+        the core selectors can be used. It can be contained within
+        <a href="selectors.html#selectcontainers">Selector Containers</a>,
+        for example.</p>
+
+        <p>To create a new Custom Selector, you have to create a class that
+        implements
+        <code>org.apache.tools.ant.types.selectors.ExtendFileSelector</code>.
+        The easiest way to do that is through the convenience base class
+        <code>org.apache.tools.ant.types.selectors.BaseExtendSelector</code>,
+        which provides all of the methods for supporting
+        <code>&lt;param&gt;</code> tags. First, override the
+        <code>isSelected()</code> method, and optionally the
+        <code>verifySettings()</code> method. If your custom
+        selector requires parameters to be set, you can also override
+        the <code>setParameters()</code> method and interpret the
+        parameters that are passed in any way you like. Several of the
+        core selectors demonstrate how to do that because they can
+        also be used as custom selectors.</p>
+
+      <li>Core Selectors
+
+        <p>These are the selectors used by Ant itself. To implement one of
+        these, you will have to alter some of the classes contained within
+        Ant.</p>
+
+        <ul>
+          <li><p>First, create a class that implements
+            <code>org.apache.tools.ant.types.selectors.FileSelector</code>.
+            You can either choose to implement all methods yourself from
+            scratch, or you can extend
+            <code>org.apache.tools.ant.types.selectors.BaseSelector</code>
+            instead, a convenience class that provides reasonable default
+            behaviour for many methods.</p>
+
+            <p>There is only one method required.
+            <code>public boolean isSelected(File basedir, String filename,
+              File file)</code>
+              is the real purpose of the whole exercise. It returns true
+              or false depending on whether the given file should be
+              selected from the list or not.</p>
+
+            <p>If you are using
+            <code>org.apache.tools.ant.types.selectors.BaseSelector</code>
+            there are also some predefined behaviours you can take advantage
+            of. Any time you encounter a problem when setting attributes or
+            adding tags, you can call setError(String errmsg) and the class
+            will know that there is a problem. Then, at the top of your
+            <code>isSelected()</code> method call <code>validate()</code> and
+            a BuildException will be thrown with the contents of your error
+            message. The <code>validate()</code> method also gives you a
+            last change to check your settings for consistency because it
+            calls <code>verifySettings()</code>. Override this method and
+            call <code>setError()</code> within it if you detect any
+            problems in how your selector is set up.</p>
+
+            <p>You may also want to override <code>toString()</code>.</p>
+
+          <li><p>Put an <code>add</code> method for your selector in
+            <code>org.apache.tools.ant.types.selectors.SelectorContainer</code>.
+            This is an interface, so you will also have to add an implementation
+            for the method in the classes which implement it, namely
+            <code>org.apache.tools.ant.types.AbstractFileSet</code> and
+            <code>org.apache.tools.ant.types.selectors.BaseSelectorContainer</code>.
+            Once it is in there, it will be available everywhere that core
+            selectors are appropriate.</p>
+        </ul>
+
+      <li>Selector Containers
+        <p>Got an idea for a new Selector Container? Creating a new one is
+        no problem:</p>
+        <ul>
+          <li><p>Create a new class that implements
+            <code>org.apache.tools.ant.types.selectors.SelectorContainer</code>.
+            This will ensure that your new
+            Container can access any new selectors that come along. Again, there
+            is a convenience class available for you called
+            <code>org.apache.tools.ant.types.selectors.BaseSelectorContainer</code>.
+            </p>
+          <li><p>Implement the
+            <code>public boolean isSelected(String filename, File file)</code>
+            method to do the right thing. Chances are you'll want to iterate
+            over the selectors under you, so use
+            <code>selectorElements()</code> to get an iterator that will do
+            that.</p>
+          <li><p>Again, put an <code>add</code> method for your container in
+            <code>org.apache.tools.ant.types.selectors.SelectorContainer</code>
+            and its implementations
+            <code>org.apache.tools.ant.types.AbstractFileSet</code> and
+            <code>org.apache.tools.ant.types.selectors.BaseSelectorContainer</code>.
+            </p>
+        </ul>
+    </ol>
+
+  </body>
+
+</html>
diff --git a/docs/manual/CoreTypes/selectors.html b/docs/manual/CoreTypes/selectors.html
new file mode 100755
index 000000000..245add78e
--- /dev/null
+++ b/docs/manual/CoreTypes/selectors.html
@@ -0,0 +1,760 @@
+<html>
+  <head>
+    <meta http-equiv="Content-Language" content="en-us">
+    <title>Selectors in Ant</title>
+  </head>
+
+  <body>
+    <h2>Selectors</h2>
+
+    <p>Selectors are a mechanism whereby the files that make up a fileset
+    can be selected based on criteria other than filename as provided
+    by the <code>&lt;include&gt;</code> and <code>&lt;exclude&gt;</code>
+    tags.</p>
+
+    <h3>How to use a Selector</h3>
+
+    <p>A selector is an element of FileSet, and appears within it. It can 
+    also be defined outside of any target by using the &lt;selector&gt; tag
+    and then using it as a reference.
+    </p>
+
+    <p>Different selectors have different attributes. Some selectors can
+    contain other selectors, and these are called 
+    <a href="#selectcontainers"><code>Selector Containers</code></a>. 
+    There is also a category of selectors that allow
+    user-defined extensions, called 
+    <a href="#customselect"><code>Custom Selectors</code></a>.
+    The ones built in to Ant are called 
+    <a href="#coreselect"><code>Core Selectors</code></a>.
+    </p>
+    
+    <a name="coreselect"></a>
+    <h3>Core Selectors</h3>
+
+    <p>Core selectors are the ones that come standard
+    with Ant. They can be used within a fileset and can be contained
+    within Selector Containers.</p>
+    
+    <p>The core selectors are:</p>
+    
+    <ul>
+      <li><a href="#containsselect">&lt;contains&gt;</a> - Select
+        files that contain a particular text string
+      <li><a href="#dateselect">&lt;date&gt;</a> - Select files
+        that have been modified either before or after a particular date
+        and time
+      <li><a href="#dependselect">&lt;depend&gt;</a> - Select files
+        that have been modified more recently than equivalent files
+        elsewhere
+      <li><a href="#depthselect">&lt;depth&gt;</a> - Select files
+        that appear so many directories down in a directory tree
+      <li><a href="#filenameselect">&lt;filename&gt;</a> - Select
+        files whose name matches a particular pattern. Equivalent to
+        the include and exclude elements of a patternset.
+      <li><a href="#presentselect">&lt;present&gt;</a> - Select
+        files that either do or do not exist in some other location
+      <li><a href="#sizeselect">&lt;size&gt;</a> - Select files
+        that are larger or smaller than a particular number of bytes.
+    </ul>
+
+
+    <a name="containsselect"></a>
+    <h4>Contains Selector</h4>
+
+    <p>The <code>&lt;contains&gt;</code> tag in a FileSet limits
+    the files defined by that fileset to only those which contain the
+    string specified by the <code>text</code> attribute.
+    .</p>
+
+    <table border="1" cellpadding="2" cellspacing="0">
+      <tr>
+        <td valign="top"><b>Attribute</b></td>
+        <td valign="top"><b>Description</b></td>
+        <td align="center" valign="top"><b>Required</b></td>
+      </tr>
+      <tr>
+        <td valign="top">text</td>
+        <td valign="top">Specifies the text that every file must contain
+        </td>
+        <td valign="top" align="center">Yes</td>
+      </tr>
+      <tr>
+        <td valign="top">casesensitive</td>
+        <td valign="top">Whether to pay attention to case when looking
+          for the string in the <code>text</code> attribute. Default is
+          true.
+        </td>
+        <td valign="top" align="center">No</td>
+      </tr>
+    </table>
+
+    <p>Here is an example of how to use the Contains Selector:</p>
+
+    <blockquote><pre>
+&lt;fileset dir=&quot;${doc.path}&quot; includes=&quot;**/*.html&quot;&gt;
+    &lt;contains text=&quot;script&quot; casesensitive=&quot;no&quot;/&gt;
+&lt;/fileset&gt;
+</pre></blockquote>
+
+    <p>Selects all the HTML files that contain the string
+    <code>script</code>.</p>
+
+
+    <a name="dateselect"></a>
+    <h4>Date Selector</h4>
+
+    <p>The <code>&lt;date&gt;</code> tag in a FileSet will put
+    a limit on the files specified by the include tag, so that tags
+    whose last modified date does not meet the date limits specified
+    by the selector will not end up being selected.</p>
+
+    <table border="1" cellpadding="2" cellspacing="0">
+      <tr>
+        <td valign="top"><b>Attribute</b></td>
+        <td valign="top"><b>Description</b></td>
+        <td align="center" valign="top"><b>Required</b></td>
+      </tr>
+      <tr>
+        <td valign="top">datetime</td>
+        <td valign="top">Specifies the date and time to test for using
+          a string of the format MM/DD/YYYY HH:MM AM_or_PM.
+        </td>
+        <td valign="top" align="center" rowspan="2">At least one of the two.</td>
+      </tr>
+      <tr>
+        <td valign="top">millis</td>
+        <td valign="top">The number of milliseconds since 1970 that should
+          be tested for. It is usually much easier to use the datetime
+          attribute.
+        </td>
+      </tr>
+      <tr>
+        <td valign="top">when</td>
+        <td valign="top">Indicates how to interpret the date, whether
+          the files to be selected are those whose last modified times should
+          be before, after, or equal to the specified value. Acceptable
+          values for this attribute are:
+          <ul>
+            <li>before - select files whose last modified date is before the indicated date
+            <li>after - select files whose last modified date is after the indicated date
+            <li>equal - select files  whose last modified date is this exact date
+          </ul>
+          The default is before.
+        <td valign="top" align="center">No</td>
+      </tr>
+    </table>
+
+    <p>Here is an example of how to use the Date Selector:</p>
+
+    <blockquote><pre>
+&lt;fileset dir=&quot;${jar.path}&quot; includes=&quot;**/*.jar&quot;&gt;
+    &lt;date datetime=&quot;01/01/2001 12:00 AM&quot; when=&quot;before&quot;/&gt;
+&lt;/fileset&gt;
+</pre></blockquote>
+
+    <p>Selects all JAR files which were last modified before midnight
+    January 1, 2001.</p>
+
+
+    <a name="dependselect"></a>
+    <h4>Depend Selector</h4>
+
+    <p>The <code>&lt;depend&gt;</code> tag selects files
+    whose last modified date is later than another, equivalent file in 
+    another location.</p>
+    
+    <p>The <code>&lt;depend&gt;</code> tag supports the use of a
+    contained <a href="mapper.html"><code>&lt;mapper&gt;</code></a> element 
+    to define the location of the file to be compared against. If no 
+    <code>&lt;mapper&gt;</code> element is specified, the 
+    <code>identity</code> type mapper is used.</p>
+
+    <table border="1" cellpadding="2" cellspacing="0">
+      <tr>
+        <td valign="top"><b>Attribute</b></td>
+        <td valign="top"><b>Description</b></td>
+        <td align="center" valign="top"><b>Required</b></td>
+      </tr>
+      <tr>
+        <td valign="top">targetdir</td>
+        <td valign="top">The base directory to look for the files to compare
+          against. The precise location depends on a combination of this
+          attribute and the <code>&lt;mapper&gt;</code> element, if any.
+        </td>
+        <td valign="top" align="center">Yes</td>
+      </tr>
+      <tr>
+        <td valign="top">granularity</td>
+        <td valign="top">The number of milliseconds leeway to give before
+          deciding a file is out of date. This is needed because not every
+          file system supports tracking the last modified time to the
+          millisecond level. Default is 0 milliseconds.
+        </td>
+        <td valign="top" align="center">No</td>
+      </tr>
+    </table>
+
+    <p>Here is an example of how to use the Depend Selector:</p>
+
+    <blockquote><pre>
+&lt;fileset dir=&quot;${ant.1.5}/src/main&quot; includes=&quot;**/*.java&quot;&gt;
+    &lt;depend targetdir=&quot;${ant.1.4.1}/src/main&quot;/&gt;
+&lt;/fileset&gt;
+</pre></blockquote>
+
+    <p>Selects all the Java source files which were modified in the 
+      1.5 release.
+    </p>
+
+
+    <a name="depthselect"></a>
+    <h4>Depth Selector</h4>
+
+    <p>The <code>&lt;depth&gt;</code> tag selects files based on
+    how many directy levels deep they are in relation to the base
+    directory of the fileset.
+    </p>
+
+    <table border="1" cellpadding="2" cellspacing="0">
+      <tr>
+        <td valign="top"><b>Attribute</b></td>
+        <td valign="top"><b>Description</b></td>
+        <td align="center" valign="top"><b>Required</b></td>
+      </tr>
+      <tr>
+        <td valign="top">min</td>
+        <td valign="top">The minimum number of directory levels below
+          the base directory that a file must be in order to be selected.
+          Default is no limit.
+        </td>
+        <td valign="top" align="center" rowspan="2">At least one of the two.</td>
+      </tr>
+      <tr>
+        <td valign="top">max</td>
+        <td valign="top">The maximum number of directory levels below
+          the base directory that a file can be and still be selected.
+          Default is no limit.
+        </td>
+      </tr>
+    </table>
+
+    <p>Here is an example of how to use the Depth Selector:</p>
+
+    <blockquote><pre>
+&lt;fileset dir=&quot;${doc.path}&quot; includes=&quot;**/*&quot;&gt;
+    &lt;depth max=&quot;1&quot;/&gt;
+&lt;/fileset&gt;
+</pre></blockquote>
+
+    <p>Selects all files in the base directory and one directory below
+    that.</p>
+
+
+    <a name="filenameselect"></a>
+    <h4>Filename Selector</h4>
+
+    <p>The <code>&lt;filename&gt;</code> tag acts like the
+    <code>&lt;include&gt;</code> and <code>&lt;exclude&gt;</code>
+    tags within a fileset. By using a selector instead, however,
+    one can combine it with all the other selectors using whatever
+    <a href="#selectcontainers">selector container</a> is desired.
+    </p>
+
+    <table border="1" cellpadding="2" cellspacing="0">
+      <tr>
+        <td valign="top"><b>Attribute</b></td>
+        <td valign="top"><b>Description</b></td>
+        <td align="center" valign="top"><b>Required</b></td>
+      </tr>
+      <tr>
+        <td valign="top">name</td>
+        <td valign="top">The name of files to select. The name parameter
+          can contain the standard Ant wildcard characters.
+        </td>
+        <td valign="top" align="center">Yes</td>
+      </tr>
+      <tr>
+        <td valign="top">casesensitive</td>
+        <td valign="top">Whether to pay attention to case when looking
+          at file names. Default is "true".
+        </td>
+        <td valign="top" align="center">No</td>
+      </tr>
+      <tr>
+        <td valign="top">negate</td>
+        <td valign="top">Whether to reverse the effects of this filename
+          selection, therefore emulating an exclude rather than include
+          tag. Default is "false".
+        </td>
+        <td valign="top" align="center">No</td>
+      </tr>
+    </table>
+
+    <p>Here is an example of how to use the Filename Selector:</p>
+
+    <blockquote><pre>
+&lt;fileset dir=&quot;${doc.path}&quot; includes=&quot;**/*&quot;&gt;
+    &lt;filename name=&quot;**/*.css&quot;/&gt;
+&lt;/fileset&gt;
+</pre></blockquote>
+
+    <p>Selects all the cascading style sheet files.</p>
+
+
+    <a name="presentselect"></a>
+    <h4>Present Selector</h4>
+
+    <p>The <code>&lt;present&gt;</code> tag selects files
+    that have an equivalent file in another directory tree.</p>
+    
+    <p>The <code>&lt;present&gt;</code> tag supports the use of a
+    contained <a href="mapper.html"><code>&lt;mapper&gt;</code></a> element 
+    to define the location of the file to be tested against. If no 
+    <code>&lt;mapper&gt;</code> element is specified, the 
+    <code>identity</code> type mapper is used.</p>
+
+    <table border="1" cellpadding="2" cellspacing="0">
+      <tr>
+        <td valign="top"><b>Attribute</b></td>
+        <td valign="top"><b>Description</b></td>
+        <td align="center" valign="top"><b>Required</b></td>
+      </tr>
+      <tr>
+        <td valign="top">targetdir</td>
+        <td valign="top">The base directory to look for the files to compare
+          against. The precise location depends on a combination of this
+          attribute and the <code>&lt;mapper&gt;</code> element, if any.
+        </td>
+        <td valign="top" align="center">Yes</td>
+      </tr>
+      <tr>
+        <td valign="top">present</td>
+        <td valign="top">Whether we are requiring that a file is present in 
+          the src directory tree only, or in both the src and the target
+          directory tree. Valid values are:
+          <ul>
+            <li>srconly - select files only if they are in the src 
+              directory tree but not in the target directory tree
+            <li>both - select files only if they are present both in the
+              src and target directory trees
+          </ul>
+          Default is both.
+        </td>
+        <td valign="top" align="center">No</td>
+      </tr>
+    </table>
+
+    <p>Here is an example of how to use the Present Selector:</p>
+
+    <blockquote><pre>
+&lt;fileset dir=&quot;${ant.1.5}/src/main&quot; includes=&quot;**/*.java&quot;&gt;
+    &lt;present targetdir=&quot;${ant.1.4.1}/src/main&quot;/&gt;
+&lt;/fileset&gt;
+</pre></blockquote>
+
+    <p>Selects all the Java source files which are new in the 
+      1.5 release.
+    </p>
+
+
+    <a name="sizeselect"></a>
+    <h4>Size Selector</h4>
+
+    <p>The <code>&lt;size&gt;</code> tag in a FileSet will put
+    a limit on the files specified by the include tag, so that tags
+    which do not meet the size limits specified by the selector will not
+    end up being selected.</p>
+
+    <table border="1" cellpadding="2" cellspacing="0">
+      <tr>
+        <td valign="top"><b>Attribute</b></td>
+        <td valign="top"><b>Description</b></td>
+        <td align="center" valign="top"><b>Required</b></td>
+      </tr>
+      <tr>
+        <td valign="top">value</td>
+        <td valign="top">The size of the file which should be tested for.
+        </td>
+        <td valign="top" align="center">Yes</td>
+      </tr>
+      <tr>
+        <td valign="top">units</td>
+        <td valign="top">The units that the <code>value</code> attribute
+          is expressed in. When using the standard single letter SI
+          designations, such as &quot;k&quot;,&quot;M&quot;, or
+          &quot;G&quot;, multiples of 1000 are used. If you want to use
+          power of 2 units, use the IEC standard: &quot;Ki&quot; for 1024,
+          &quot;Mi&quot; for 1048576, and so on. The default is no units,
+          which means the <code>value</code> attribute expresses the exact
+          number of bytes.
+        </td>
+        <td valign="top" align="center">No</td>
+      </tr>
+      <tr>
+        <td valign="top">when</td>
+        <td valign="top">Indicates how to interpret the size, whether
+          the files to be selected should be larger, smaller, or equal to
+          that value. Acceptable values for this attribute are:
+          <ul>
+            <li>less - select files less than the indicated size
+            <li>more - select files greater than the indicated size
+            <li>equal - select files this exact size
+          </ul>
+          The default is less.
+        <td valign="top" align="center">No</td>
+      </tr>
+    </table>
+
+    <p>Here is an example of how to use the Size Selector:</p>
+
+    <blockquote><pre>
+&lt;fileset dir=&quot;${jar.path}&quot;&gt;
+  &lt;patternset&gt;
+    &lt;include name=&quot;**/*.jar&quot;/&gt;
+  &lt;/patternset&gt;
+  &lt;size value=&quot;4&quot; units=&quot;Ki&quot; when=&quot;more&quot;/&gt;
+&lt;/fileset&gt;
+</pre></blockquote>
+
+    <p>Selects all JAR files that are larger than 4096 bytes.</p>
+
+
+    <a name="selectcontainers"></a>
+    <h3>Selector Containers</h3>
+
+    <p>To create more complex selections, a variety of selectors that
+    contain other selectors are available for your use. They combine the
+    selections of their child selectors in various ways.</p>
+
+    <p>The selector containers are:</p>
+
+    <ul>
+      <li><a href="#andselect">&lt;and&gt;</a> - select a file only if all
+        the contained selectors select it.
+      <li><a href="#majorityselect">&lt;majority&gt;</a> - select a file
+        if a majority of its selectors select it.
+      <li><a href="#noneselect">&lt;none&gt;</a> - select a file only if
+        none of the contained selectors select it.
+      <li><a href="#notselect">&lt;not&gt;</a> - can contain only one
+        selector, and reverses what it selects and doesn't select.
+      <li><a href="#orselect">&lt;or&gt;</a> - selects a file if any one
+        of the contained selectors selects it.
+      <li><a href="#selectorselect">&lt;selector&gt;</a> - contains only one
+        selector and forwards all requests to it without alteration. This
+        is the selector to use if you want to define a reference. It is
+        usable as an element of <code>&lt;project&gt;</code>.
+    </ul>
+
+    <p>All selector containers can contain any other selector, including
+    other containers, as an element. Using containers, the selector tags
+    can be arbitrarily deep. Here is a complete list of allowable
+    selector elements within a container:</P>
+
+    <ul>
+      <li>&lt;and&gt;
+      <li>&lt;contains&gt;
+      <li>&lt;custom&gt;
+      <li>&lt;date&gt;
+      <li>&lt;depend&gt;
+      <li>&lt;depth&gt;
+      <li>&lt;filename&gt;
+      <li>&lt;majority&gt;
+      <li>&lt;none&gt;
+      <li>&lt;not&gt;
+      <li>&lt;or&gt;
+      <li>&lt;present&gt;
+      <li>&lt;selector&gt;
+      <li>&lt;size&gt;
+    </ul>
+
+    <a name="andselect"></a>
+    <h4>And Selector</h4>
+
+    <p>The <code>&lt;and&gt;</code> tag selects files that are
+    selected by all of the elements it contains. It returns as
+    soon as it finds a selector that does not select the file,
+    so it is not guaranteed to check every selector.
+    </p>
+    
+    <p>Here is an example of how to use the And Selector:</p>
+
+    <blockquote><pre>
+&lt;fileset dir=&quot;${dist}&quot; includes=&quot;**/*.jar&quot;&gt;
+    &lt;and&gt;
+        &lt;size value=&quot;4&quot; units=&quot;Ki&quot; when=&quot;more&quot;/&gt;
+        &lt;date datetime=&quot;01/01/2001 12:00 AM&quot; when=&quot;before&quot;/&gt;
+    &lt;/and&gt;
+&lt;/fileset&gt;
+</pre></blockquote>
+
+    <p>Selects all the JAR file larger than 4096 bytes which haven't been update
+      since the last millenium.
+    </p>
+
+
+    <a name="majorityselect"></a>
+    <h4>Majority Selector</h4>
+
+    <p>The <code>&lt;majority&gt;</code> tag selects files provided
+    that a majority of the contained elements also select it. Ties are
+    dealt with as specified by the <code>allowtie</code> attribute.
+    </p>
+
+    <table border="1" cellpadding="2" cellspacing="0">
+      <tr>
+        <td valign="top"><b>Attribute</b></td>
+        <td valign="top"><b>Description</b></td>
+        <td align="center" valign="top"><b>Required</b></td>
+      </tr>
+      <tr>
+        <td valign="top">allowtie</td>
+        <td valign="top">Whether files should be selected if there
+          are an even number of selectors selecting them as are
+          not selecting them. Default is true.
+        </td>
+        <td valign="top" align="center">No</td>
+      </tr>
+    </table>
+
+
+    <p>Here is an example of how to use the Majority Selector:</p>
+
+    <blockquote><pre>
+&lt;fileset dir=&quot;${docs}&quot; includes=&quot;**/*.html&quot;&gt;
+    &lt;majority&gt;
+        &lt;contains text=&quot;project&quot; casesensitive="false"/&gt;
+        &lt;contains text=&quot;taskdef&quot; casesensitive="false"/&gt;
+        &lt;contains text=&quot;IntrospectionHelper&quot; casesensitive="true"/&gt;
+    &lt;/majority&gt;
+&lt;/fileset&gt;
+</pre></blockquote>
+
+    <p>Selects all the HTML files which contain at least two of the three 
+    phrases "project", "taskdef", and "IntrospectionHelper" (this last phrase must 
+    match case exactly).
+    </p>
+
+
+    <a name="noneselect"></a>
+    <h4>None Selector</h4>
+
+    <p>The <code>&lt;none&gt;</code> tag selects files that are
+    not selected by any of the elements it contains. It returns as
+    soon as it finds a selector that selects the file,
+    so it is not guaranteed to check every selector.
+    </p>
+    
+    <p>Here is an example of how to use the None Selector:</p>
+
+    <blockquote><pre>
+&lt;fileset dir=&quot;${src}&quot; includes=&quot;**/*.java&quot;&gt;
+    &lt;none&gt;
+        &lt;present targetdir=&quot;${dest}&quot;/&gt;
+        &lt;present targetdir=&quot;${dest}&quot;&gt;
+            &lt;mapper type=&quot;glob&quot; from=&quot;*.java&quot; to=&quot;*.class&quot;/&gt;
+        &lt;/present&gt;
+    &lt;/none&gt;
+&lt;/fileset&gt;
+</pre></blockquote>
+
+    <p>Selects only Java files which do not have equivalent java or 
+    class files in the dest directory.
+    </p>
+
+
+    <a name="notselect"></a>
+    <h4>Not Selector</h4>
+
+    <p>The <code>&lt;not&gt;</code> tag reverses the meaning of the
+    single selector it contains.
+    </p>
+    
+    <p>Here is an example of how to use the Not Selector:</p>
+
+    <blockquote><pre>
+&lt;fileset dir=&quot;${src}&quot; includes=&quot;**/*.java&quot;&gt;
+    &lt;not&gt;
+        &lt;contains text=&quot;test&quot;/&gt;
+    &lt;/not&gt;
+&lt;/fileset&gt;
+</pre></blockquote>
+
+    <p>Selects all the files in the src directory that do not contain the
+    string "test".
+    </p>
+
+
+    <a name="orselect"></a>
+    <h4>Or Selector</h4>
+
+    <p>The <code>&lt;or&gt;</code> tag selects files that are
+    selected by any one of the elements it contains. It returns as
+    soon as it finds a selector that selects the file,
+    so it is not guaranteed to check every selector.
+    </p>
+    
+    <p>Here is an example of how to use the Or Selector:</p>
+
+    <blockquote><pre>
+&lt;fileset dir=&quot;${basedir}&quot;&gt;
+    &lt;or&gt;
+        &lt;depth max=&quot;0&quot;/&gt;
+        &lt;filename name="*.png"/&gt;
+        &lt;filename name="*.gif"/&gt;
+        &lt;filename name="*.jpg"/&gt;
+    &lt;/or&gt;
+&lt;/fileset&gt;
+</pre></blockquote>
+
+    <p>Selects all the files in the top directory along with all the 
+    image files below it.
+    </p>
+
+
+    <a name="selectorselect"></a>
+    <h4>Selector Reference</h4>
+
+    <p>The <code>&lt;selector&gt;</code> tag is used to create selectors
+    that can be reused through references. It should be used outside of
+    any target, as an element of the <code>&lt;project&gt;</code> tag. It
+    can contain only one other selector, but of course that selector can
+    be a container.
+    </p>
+
+    <p>Here is an example of how to use the Selector Reference:</p>
+
+    <blockquote><pre>
+&lt;project default=&quot;all&quot; basedir=&quot;./jakarta-ant&quot;&gt;
+
+    &lt;selector id=&quot;completed&quot;&gt;
+        &lt;none&gt;
+            &lt;depend targetdir=&quot;build/classes&quot;&gt;
+                &lt;mapper type=&quot;glob&quot; from=&quot;*.java&quot; to=&quot;*.class&quot;/&gt;
+            &lt;/depend&gt;
+            &lt;depend targetdir=&quot;docs/manual/api&quot;&gt;
+                &lt;mapper type=&quot;glob&quot; from=&quot;*.java&quot; to=&quot;*.html&quot;/&gt;
+            &lt;/depend&gt;
+        &lt;/none&gt;
+    &lt;/selector&gt;
+
+    &lt;target&gt;
+        &lt;zip&gt;
+            &lt;fileset dir=&quot;src/main&quot; includes=&quot;**/*.java&quot;&gt;
+                &lt;selector refid=&quot;completed&quot;/&gt;
+            &lt;/fileset&gt;
+        &lt;/zip&gt;
+    &lt;/target&gt;
+    
+&lt;/project&gt;
+</pre></blockquote>
+
+    <p>Zips up all the Java files which have an up-to-date equivalent
+    class file and javadoc file associated with them.
+    </p>
+
+
+
+    <a name="customselect"></a>
+    <h3>Custom Selectors</h3>
+
+    <p>You can write your own selectors and use them within the selector 
+    containers by specifying them within the &lt;custom&gt; tag.</p>
+
+    <p>First, you have to write your selector class in Java. The only
+    requirement it must meet in order to be a selector is that it implements
+    the <code>org.apache.tools.ant.types.selectors.FileSelector</code>
+    interface, which contains a single method. See 
+    <a href="selectors-program.html">Programming Selectors in Ant</a> for
+    more information.</p>
+
+    <p>Once that is written, you include it in your build file by using
+    the <code>&lt;custom&gt;</code> tag.
+    </p>
+
+    <table border="1" cellpadding="2" cellspacing="0">
+      <tr>
+        <td valign="top"><b>Attribute</b></td>
+        <td valign="top"><b>Description</b></td>
+        <td align="center" valign="top"><b>Required</b></td>
+      </tr>
+      <tr>
+        <td valign="top">classname</td>
+        <td valign="top">The name of your class that implements
+          <code>org.apache.tools.ant.types.selectors.FileSelector</code>.
+        </td>
+        <td valign="top" align="center">Yes</td>
+      </tr>
+      <tr>
+        <td valign="top">classpath</td>
+        <td valign="top">The classpath to use in order to load the
+          custom selector class. If neither this classpath nor the
+          classpathref are specified, the class will be
+          loaded from the classpath that Ant uses.
+        </td>
+        <td valign="top" align="center">No</td>
+      </tr>
+      <tr>
+        <td valign="top">classpathref</td>
+        <td valign="top">A reference to a classpath previously
+          defined. If neither this reference nor the
+          classpath above are specified, the class will be
+          loaded from the classpath that Ant uses.
+        </td>
+        <td valign="top" align="center">No</td>
+      </tr>
+    </table>
+
+    <p>Here is how you use <code>&lt;custom&gt;</code> to
+    use your class as a selector:
+    </p>
+
+    <blockquote><pre>
+&lt;fileset dir=&quot;${mydir}&quot; includes=&quot;**/*&quot;&gt;
+    &lt;custom classname=&quot;com.mydomain.MySelector&quot;&gt;
+        &lt;param name=&quot;myattribute&quot; value=&quot;myvalue&quot;/&gt;
+    &lt;/custom&gt;
+&lt;/fileset&gt;
+</pre></blockquote>
+
+    <p>A number of core selectors can also be used as custom selectors
+    by specifying their attributes using &lt;param&gt; elements. These
+    are</p>
+
+    <ul>
+      <li><a href="#containsselect">Contains Selector</a> with
+        classname <code>org.apache.tools.ant.types.selectors.ContainsSelector</code>
+      <li><a href="#dateselect">Date Selector</a> with
+        classname <code>org.apache.tools.ant.types.selectors.DateSelector</code>
+      <li><a href="#depthselect">Depth Selector</a> with
+        classname <code>org.apache.tools.ant.types.selectors.DepthSelector</code>
+      <li><a href="#filenameselect">Filename Selector</a> with
+        classname <code>org.apache.tools.ant.types.selectors.FilenameSelector</code>
+      <li><a href="#sizeselect">Size Selector</a> with
+        classname <code>org.apache.tools.ant.types.selectors.SizeSelector</code>
+    </ul>
+
+    <p>Here is the example from the Depth Selector section rewritten
+    to use the selector through <code>&lt;custom&gt;</code>.</p>
+
+    <blockquote><pre>
+&lt;fileset dir=&quot;${doc.path}&quot; includes=&quot;**/*&quot;&gt;
+    &lt;custom classname=&quot;org.apache.tools.ant.types.selectors.DepthSelector&quot;&gt;
+        &lt;param name=&quot;max&quot; value=&quot;1&quot;/&gt;
+    &lt;/custom&gt;
+&lt;/fileset&gt;
+</pre></blockquote>
+
+    <p>Selects all files in the base directory and one directory below
+    that.</p>
+
+    <p>For more details concerning writing your own selectors, consult
+    <a href="selectors-program.html">Programming Selectors in Ant</a>.</p>
+
+  </body>
+
+</html>
+
+
+
+
diff --git a/docs/manual/CoreTypes/xmlcatalog.html b/docs/manual/CoreTypes/xmlcatalog.html
index dfe4fec0e..ef41cdc8f 100644
--- a/docs/manual/CoreTypes/xmlcatalog.html
+++ b/docs/manual/CoreTypes/xmlcatalog.html
@@ -8,38 +8,112 @@
 <body>
 
 <h2><a name="XMLCatalog">XMLCatalog</a></h2>
-<p>An XMLCatalog is a catalog of public resources such as DTDs or entities 
-that
-are referenced in an XML document and are available locally.</p>
-<p>This allows the XML Parser, XSL Processor or other consumer of XML 
+
+<p>An XMLCatalog is a catalog of public resources such as DTDs or
+entities that are referenced in an XML document.  Catalogs are
+typically used to make web references to resources point to a locally
+cached copy of the resource.</p>
+
+<p>This allows the XML Parser, XSLT Processor or other consumer of XML 
 documents
 to efficiently allow a local substitution for a resource available on the 
 web.
 </p>
+<p>This data type provides a catalog of resource locations based
+on the <a
+href="http://oasis-open.org/committees/entity/spec-2001-08-06.html">
+OASIS "Open Catalog" standard</a>.  The catalog entries are used
+both for Entity resolution and URI resolution, in accordance with
+the <code>org.xml.sax.EntityResolver</code> and <code>
+javax.xml.transform.URIResolver</code> interfaces as defined
+in the <a href="http://java.sun.com/xml/jaxp">Java API for XML
+Processing (JAXP) Specification</a>.</p>
 <p>For example, in a <code>web.xml</code> file, the DTD is referenced as:
 <pre>
-&lt;!DOCTYPE web-app
-  PUBLIC &quot;-//Sun Microsystems, Inc.//DTD Web Application 
-2.2//EN&quot;
+&lt;!DOCTYPE web-app PUBLIC &quot;-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN&quot;
   &quot;http://java.sun.com/j2ee/dtds/web-app_2_2.dtd&quot;&gt;
 </pre>
 The XML processor, without XMLCatalog support, would need to retrieve the 
 DTD from
 the URL specified whenever validation of the document was required.
 </p>
-<p>This can be very time consuming during the build process, especially 
-where 
-network throughput is limited.</p>
+<p>This can be very time consuming during the build process,
+especially where network throughput is limited.  Alternatively, you
+can do the following:
+<ol>
+<li>Copy <code>web-app_2_2.dtd</code> onto your local disk somewhere (either in the
+filesystem or even embedded inside a jar or zip file on the classpath).</li>
+<li>Create an <code>&lt;xmlcatalog&gt;</code> with a <code>&lt;dtd&gt;</code> 
+element whose <code>location</code> attribute points to the file.</li>
+<li>Success! The XML processor will now use the local copy instead of calling out
+to the internet.</li>
+</ol>
 </p>
 <p>XMLCatalogs can appear inside tasks
 that support this feature or at the same level as <code>target</code>
 - i.e., as children of <code>project</code> for reuse across different 
 tasks,
-e.g. XML Validation and XSL Translation.</p>
+e.g. XML Validation and XSLT Transformation.  The XML Validate task
+uses XMLCatalogs for entity resolution.  The XSLT Transformation
+task uses XMLCatalogs for both entity and URI resolution.</p>
 <p>XMLCatalogs are specified as either a reference to another XMLCatalog, 
 defined
 previously in a build file, or as a list of <code>dtd</code> or
-<code>entity</code> locations.</p>
+<code>entity</code> locations.  A separate classpath for entity resolution 
+may be specified inline via nested <code>classpath</code> elements; 
+otherwise the system classpath is used for this as well.</p>
+<p>XMLCatalogs can also be nested inside other XMLCatalogs.  For
+example, a "superset" XMLCatalog could be made by including several
+nested XMLCatalogs that referred to other, previously defined
+XMLCatalogs.</p>
+<p>Currently, only <code>&lt;dtd&gt;</code> and
+<code>&lt;entity&gt;</code> elements may be specified inline; these
+roughly correspond to OASIS catalog entry types <code>PUBLIC</code> and
+<code>URI</code> respectively.</p>  
+<h3><a name="ResolverAlgorithm">Entity/DTD/URI Resolution Algorithm</a></h3>
+
+When an entity, DTD, or URI is looked up by the XML processor, the
+XMLCatalog searches its list of entries to see if any match.  That is,
+it attempts to match the <code>publicId</code> attribute of each entry
+with the PublicID or URI of the entity to be resolved.  Assuming a
+matching entry is found, XMLCatalog then executes the following steps:
+
+<h4>1. Filesystem lookup</h4>
+
+<p>The <code>location</code> is first looked up in the filesystem.  If
+the <code>location</code> is a relative path, the ant project basedir
+attribute is used as the base directory.  If the <code>location</code>
+specifies an absolute path, it is used as is.  Once we have an
+absolute path in hand, we check to see if a valid and readable file
+exists at that path.  If so, we are done.  If not, we proceed to the
+next step.</p>
+
+<h4>2. Classpath lookup</h4>
+
+<p>The <code>location</code> is next looked up in the classpath.
+Recall that jar files are merely fancy zip files.  For classpath
+lookup, the <code>location</code> is used as is (no base is
+prepended).  We use a Classloader to attempt to load the resource from
+the classpath.  For example, if hello.jar is in the classpath and it
+contains <code>foo/bar/blat.dtd</code> it will resolve an entity whose
+<code>location</code> is <code>foo/bar/blat.dtd</code>.  Of course, it
+will <em>not</em> resolve an entity whose <code>location</code> is
+<code>blat.dtd</code>.
+
+
+<h4>3. URL-space lookup</h4>
+
+<p>Finally, we attempt to make a URL out of the <code>location</code>.
+At first this may seem like this would defeat the purpose of
+XMLCatalogs -- why go back out to the internet?  But in fact, this can
+be used to (in a sense) implement HTTP redirects, substituting one URL
+for another.  The mapped-to URL might also be served by a local web
+server.  If the URL resolves to a valid and readable resource, we are
+done.  Otherwise, we give up.  In this case, the XML processor will
+perform its normal resolution algorithm.  Depending on the processor
+configuration, further resolution failures may or may not result in
+fatal (i.e. build-ending) errors.</p>
+
 <h3>XMLCatalog attributes</h3>
 <table border="1" cellpadding="2" cellspacing="0">
   <tr>
@@ -64,6 +138,7 @@ contents
 </table>
 
 <h3>XMLCatalog nested elements</h3>
+<h4>dtd/entity</h4>
 <p>The <code>dtd</code> and <code>entity</code> elements used to specify
 XMLCatalogs are identical in their structure</p>
 <table border="1" cellpadding="2" cellspacing="0">
@@ -84,46 +159,67 @@ entity,
   <tr>
     <td valign="top">location</td>
     <td valign="top">The location of the local replacement to be used for 
-the
-    public identifier specified. This may be specified as a file name, 
-resource
-    name found on the classpath, or a URL
+the public identifier specified. This may be specified as a file name, 
+resource name found on the classpath, or a URL.  Relative paths will
+be resolved according to the base, which by default is the Ant project
+basedir.
     </td>
     <td valign="top" align="center">Yes</td>
   </tr>
 </table>
-<h3>Examples</h4>
+<h4>classpath</h4>
+<p>The classpath to use for <a href="#ResolverAlgorithm">entity
+resolution</a>.  The nested <code>&lt;classpath&gt;</code> is a
+<a href="../using.html#path">path</a>-like structure.</p>
+<h3>Examples</h3>
 <p>Set up an XMLCatalog with a single dtd referenced locally in a user's 
 home 
 directory:</p>
 <blockquote><pre>
     &lt;xmlcatalog&gt;
-        &lt;dtd publicId=&quot;-//OASIS//DTD DocBook XML V4.1.2//EN&quot;
- location=&quot;/home/dion/downloads/docbook/docbookx.dtd&quot;/&gt;
+        &lt;dtd 
+            publicId=&quot;-//OASIS//DTD DocBook XML V4.1.2//EN&quot;
+            location=&quot;/home/dion/downloads/docbook/docbookx.dtd&quot;/&gt;
     &lt;/xmlcatalog&gt;
 </pre></blockquote>
-<p>Set up an XMLCatalog with a multiple dtds referenced locally in a 
-user's home 
-directory:</p>
+<p>Set up an XMLCatalog with a multiple dtds to be found either in the
+filesystem (relative to the Ant project basedir) or in the classpath:
+</p>
 <blockquote><pre>
     &lt;xmlcatalog id=&quot;commonDTDs&quot;&gt;
-        &lt;dtd publicId=&quot;-//OASIS//DTD DocBook XML V4.1.2//EN&quot;
- location=&quot;/home/dion/downloads/docbook/docbookx.dtd&quot;/&gt;
-        &lt;dtd publicId=&quot;-//Sun Microsystems, Inc.//DTD Web 
-Application 2.2//EN&quot;
-             location=&quot;/home/dion/web-app_2_2.dtd&quot;/&gt;
+        &lt;dtd 
+            publicId=&quot;-//OASIS//DTD DocBook XML V4.1.2//EN&quot;
+            location=&quot;docbook/docbookx.dtd&quot;/&gt;
+        &lt;dtd 
+            publicId=&quot;-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN&quot;
+            location=&quot;web-app_2_2.dtd&quot;/&gt;
+    &lt;/xmlcatalog&gt;
+</pre></blockquote>
+
+<p>Set up an XMLCatalog with a combination of DTDs and entities as
+well as a nested XMLCatalog:</p>
+
+<blockquote><pre>
+    &lt;xmlcatalog id=&quot;allcatalogs&quot;&gt;
+        &lt;dtd 
+            publicId=&quot;-//ArielPartners//DTD XML Article V1.0//EN&quot;
+            location=&quot;com/arielpartners/knowledgebase/dtd/article.dtd&quot;/&gt;
+        &lt;entity 
+            publicId=&quot;LargeLogo&quot;
+            location=&quot;com/arielpartners/images/ariel-logo-large.gif&quot;/&gt;
+	&lt;xmlcatalog refid="commonDTDs"/&gt;
     &lt;/xmlcatalog&gt;
 </pre></blockquote>
-<p>To reference the above xmlcatalog in a style task:<p>
+<p>To reference the above XMLCatalog in an <code>xslt</code> task:<p>
 <blockquote><pre>
-    &lt;style basedir="${source.doc}"
+    &lt;xslt basedir="${source.doc}"
            destdir="${dest.xdocs}"
            extension=".xml"
            style="${source.xsl.converter.docbook}"
            includes="**/*.xml"
            force="true"&gt;
-        &lt;xmlcatalog refid=&quot;commonDTDs&quot;/&gt;
-    &lt;/style&gt;
+        &lt;xmlcatalog refid=&quot;allcatalogs&quot;/&gt;
+    &lt;/xslt&gt;
 </pre></blockquote>
 
 <hr>
diff --git a/docs/manual/OptionalTasks/BorlandEJBTasks.html b/docs/manual/OptionalTasks/BorlandEJBTasks.html
index b1ae9f8d1..c2ffda42c 100644
--- a/docs/manual/OptionalTasks/BorlandEJBTasks.html
+++ b/docs/manual/OptionalTasks/BorlandEJBTasks.html
@@ -53,17 +53,21 @@
   <tr> 
     <td valign="top" width="63">basdtd</td>
     <td valign="top" width="915"><b>Deprecated</b>. Defines the location of the 
-      weblogic-ejb-jar DTD which covers the Borland specific deployment descriptors. 
+      DTD which covers the Borland specific deployment descriptors. 
       This should not be necessary if you have borland in your classpath. If you 
-      do not, you should use a nested &lt;dtd&gt; element, described above</td>
+      do not, you should use a nested 
+      <a href="ejb.html#ejbjar-dtd">&lt;dtd&gt;</a> element, described 
+      in the ejbjar task documentation.</td>
     <td align="center" valign="middle" width="62">no</td>
   </tr>
   <tr> 
     <td valign="top" width="63">ejbdtd</td>
     <td valign="top" width="915"><b>Deprecated</b>. Defines the location of the 
-      ejb-jar DTD in the weblogic class hierarchy. This should not be necessary 
-      if you have weblogic in your classpath. If you do not, you should use a 
-      nested &lt;dtd&gt; element, described above. </td>
+      ejb-jar DTD in the class hierarchy. This should not be necessary 
+      if you have borland in your classpath. If you do not, you should use a 
+      nested <a href="ejb.html#ejbjar-dtd">&lt;dtd&gt;</a> element, 
+      described in the ejbjar task
+      documentation. </td>
     <td align="center" valign="middle" width="62">no</td>
   </tr>
   <tr> 
@@ -92,7 +96,7 @@ The verify phase is turned on and the generate client phase as well.
 </pre>
 
 <h3>&nbsp;</h3>
-<p align="center">Copyright &copy; 2001 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/OptionalTasks/antlr.html b/docs/manual/OptionalTasks/antlr.html
index fdffaf7e2..da2400d45 100644
--- a/docs/manual/OptionalTasks/antlr.html
+++ b/docs/manual/OptionalTasks/antlr.html
@@ -105,7 +105,7 @@ href="../using.html#arg">Command line arguments</a>.</p>
 </p>
 <hr>
 
-<p align="center">Copyright &copy; 2001 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2001 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/OptionalTasks/cab.html b/docs/manual/OptionalTasks/cab.html
index bb7171684..828e66ef0 100644
--- a/docs/manual/OptionalTasks/cab.html
+++ b/docs/manual/OptionalTasks/cab.html
@@ -122,7 +122,7 @@ directory api are archived, and files with the name todo.html are
 excluded. Output from the cabarc tool is displayed in the build
 output.</p>
 <hr>
-<p align="center">Copyright &copy; 2001 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2001 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/OptionalTasks/clearcase.html b/docs/manual/OptionalTasks/clearcase.html
index 8e6fa3ee2..6edfd07ad 100644
--- a/docs/manual/OptionalTasks/clearcase.html
+++ b/docs/manual/OptionalTasks/clearcase.html
@@ -254,7 +254,7 @@ A graphical dialog will be displayed. The output will be logged to
 time will be set to the current time.</p>
 
 <hr>
-<p align="center">Copyright &copy; 2001 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2001 Apache Software Foundation. All rights
 Reserved.</p>
 </body>
 
diff --git a/docs/manual/OptionalTasks/ejb.html b/docs/manual/OptionalTasks/ejb.html
index 4b19164f5..917ef7b53 100644
--- a/docs/manual/OptionalTasks/ejb.html
+++ b/docs/manual/OptionalTasks/ejb.html
@@ -776,7 +776,7 @@ three nested elements. </p>
 to be set. It is useful when setting the classpath from a reference path. In all
 other respects the behaviour is the same as the classpath attribute.</p>
 
-<h4>dtd</h4>
+<a name="ejbjar-dtd"><h4>dtd</h4></a>
 
 <p>The &lt;dtd&gt; element is used to specify the local location of DTDs to be
 used when parsing the EJB deployment descriptor. Using a local DTD is much
@@ -1692,7 +1692,7 @@ deployment  descriptor  directory.&nbsp;</p>
 </pre>
 
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 
diff --git a/docs/manual/OptionalTasks/ftp.html b/docs/manual/OptionalTasks/ftp.html
index 77a7009f9..f05dda222 100644
--- a/docs/manual/OptionalTasks/ftp.html
+++ b/docs/manual/OptionalTasks/ftp.html
@@ -263,7 +263,7 @@ remotedir attribute.</p>
 directory.  As with all other actions, the directory separator character must be correct
 according to the desires of the FTP server.</p>
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/OptionalTasks/javacc.html b/docs/manual/OptionalTasks/javacc.html
index ddec74a9a..3b94754b3 100644
--- a/docs/manual/OptionalTasks/javacc.html
+++ b/docs/manual/OptionalTasks/javacc.html
@@ -172,7 +172,7 @@
 </p>
 <hr>
 
-<p align="center">Copyright &copy; 2001 Apache Software Foundation.
+<p align="center">Copyright &copy; 2000-2001 Apache Software Foundation.
 All rights
 Reserved.</p>
 
diff --git a/docs/manual/OptionalTasks/jlink.html b/docs/manual/OptionalTasks/jlink.html
index 3b3bc4844..185df3625 100644
--- a/docs/manual/OptionalTasks/jlink.html
+++ b/docs/manual/OptionalTasks/jlink.html
@@ -98,9 +98,9 @@ mergefiles or addfiles</td>
 
 <h3>Examples</h3>
 
-The following will merge the entries in mergefoo.jar and mergebar.jar 
+<p>The following will merge the entries in mergefoo.jar and mergebar.jar 
 into out.jar.
-mac.jar and pc.jar will be added as single entries to out.jar.
+mac.jar and pc.jar will be added as single entries to out.jar.</p>
 <pre>
 &lt;jlink compress=&quot;false&quot; outfile=&quot;out.jar&quot;&gt;
    &lt;mergefiles&gt;
@@ -114,11 +114,25 @@ mac.jar and pc.jar will be added as single entries to out.jar.
 &lt;/jlink&gt;
 </pre>
 
-Suppose the file foo.jar contains two entries: bar.class and 
+<p><b>Non-deprecated alternative to the above:</b></p>
+<pre>
+&lt;jar compress=&quot;false&quot; destfile=&quot;out.jar&quot;&gt;
+  &lt;zipgroupfileset dir=&quot;${build.dir}&quot;&gt;
+    &lt;include name=&quot;mergefoo.jar&quot;/&gt;
+    &lt;include name=&quot;mergebar.jar&quot;/&gt;
+  &lt;/zipgroupfileset&gt;
+  &lt;fileset dir=&quot;${build.dir}&quot;&gt;
+    &lt;include name=&quot;mac.jar&quot;/&gt;
+    &lt;include name=&quot;pc.jar&quot;/&gt;
+  &lt;/fileset&gt;
+&lt;/jar&gt;
+</pre>
+
+<p>Suppose the file foo.jar contains two entries: bar.class and 
 barnone/myClass.zip.
 Suppose the path for file foo.jar is build/tempbuild/foo.jar. The 
 following example
-will provide the entry tempbuild/foo.jar in the out.jar.
+will provide the entry tempbuild/foo.jar in the out.jar.</p>
 <pre>
 &lt;jlink compress=&quot;false&quot; outfile=&quot;out.jar&quot;&gt;
    &lt;mergefiles&gt;
@@ -127,8 +141,8 @@ will provide the entry tempbuild/foo.jar in the out.jar.
 &lt;/jlink&gt;
 </pre>
 
-However, the next example would result in two top-level entries in out.jar,
-namely bar.class and barnone/myClass.zip
+<p>However, the next example would result in two top-level entries in out.jar,
+namely bar.class and barnone/myClass.zip</p>
 <pre>
 &lt;jlink compress=&quot;false&quot; outfile=&quot;out.jar&quot;&gt;
    &lt;mergefiles&gt;
@@ -138,7 +152,7 @@ namely bar.class and barnone/myClass.zip
 </pre>
 
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 </body>
 
diff --git a/docs/manual/OptionalTasks/junit.html b/docs/manual/OptionalTasks/junit.html
index d37a724aa..589b3dd7a 100644
--- a/docs/manual/OptionalTasks/junit.html
+++ b/docs/manual/OptionalTasks/junit.html
@@ -479,7 +479,7 @@ aborted. Results are collected in files named
 <code>${reports.tests}</code>.</p>
 
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 </body>
 </html>
diff --git a/docs/manual/OptionalTasks/junitreport.html b/docs/manual/OptionalTasks/junitreport.html
index 84699504c..db73c2847 100644
--- a/docs/manual/OptionalTasks/junitreport.html
+++ b/docs/manual/OptionalTasks/junitreport.html
@@ -19,7 +19,7 @@ or <a href="http://xml.apache.org/dist/xalan-j/old/xalan-j_1_2_2.zip">Xalan 1.2.
 <p>
 Note:<i>For a framed format Xalan 1.2.2 will need Xerces(xerces.jar) as well as BSF(bsf.jar)
 that can be found in the distribution archive. Xerces will need to be before any other
-parser (such as the shipped crimson). It is *highly* recommended to use Xalan2 instead
+parser (such as the shipped version of Xerces, which is too new). It is *highly* recommended to use Xalan2 instead
 because Xalan1 is no more supported.
 </i></p>
 <h3>Parameters</h3>
diff --git a/docs/manual/OptionalTasks/native2ascii.html b/docs/manual/OptionalTasks/native2ascii.html
index 6b4946253..d40343244 100644
--- a/docs/manual/OptionalTasks/native2ascii.html
+++ b/docs/manual/OptionalTasks/native2ascii.html
@@ -133,6 +133,6 @@
     </p>
   </body>
 <hr>
-<p align="center">Copyright &copy; 2001 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2001 Apache Software Foundation. All rights
 Reserved.</p>
 </html>
diff --git a/docs/manual/OptionalTasks/netrexxc.html b/docs/manual/OptionalTasks/netrexxc.html
index a1435ceee..8d9787bfd 100644
--- a/docs/manual/OptionalTasks/netrexxc.html
+++ b/docs/manual/OptionalTasks/netrexxc.html
@@ -307,7 +307,7 @@ or from the command line as<br>
   </p>
 </blockquote>
 <hr>
-<p align="center">Copyright &copy; 2001 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2001 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/OptionalTasks/perforce.html b/docs/manual/OptionalTasks/perforce.html
index 4ffac8028..d9cd1a8f8 100644
--- a/docs/manual/OptionalTasks/perforce.html
+++ b/docs/manual/OptionalTasks/perforce.html
@@ -202,8 +202,10 @@ available from the <a href="http://www.perforce.com/" target="_top">Perforce web
   </tr>
   <tr>
     <td valign="top">force</td>
-    <td valign="top">force a refresh of files</td>
-    <td valign="top" align="center">no</td>
+    <td valign="top">force a refresh of files, if this attribute has
+    been set.</td>
+    <td valign="top" align="center">no - if ommitted, it will be off,
+    otherwise a refresh will be forced.</td>
   </tr>
 <tr>
     <td valign="top">label</td>
@@ -213,7 +215,7 @@ available from the <a href="http://www.perforce.com/" target="_top">Perforce web
 </table>
 
 <h3>Examples</h3>
-<pre>&lt;p4sync label=&quot;nightlybuild-0.0123&quot; force=&quot;yes&quot; /&gt;
+<pre>&lt;p4sync label=&quot;nightlybuild-0.0123&quot; force=&quot;foo&quot; /&gt;
 &lt;p4sync view=&quot;//depot/projects/projectfoo/main/src/...&quot; /&gt;
 </pre>
 <hr>
diff --git a/docs/manual/OptionalTasks/propertyfile.html b/docs/manual/OptionalTasks/propertyfile.html
index c8c197d06..fa3931655 100644
--- a/docs/manual/OptionalTasks/propertyfile.html
+++ b/docs/manual/OptionalTasks/propertyfile.html
@@ -185,7 +185,7 @@ Concatenation of strings :</p>
 <p>Each time called, a &quot;.&quot; will be appended to &quot;progress&quot;
 </p>
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 </body>
 </html>
diff --git a/docs/manual/OptionalTasks/renameextensions.html b/docs/manual/OptionalTasks/renameextensions.html
index a10b44033..1f308b357 100644
--- a/docs/manual/OptionalTasks/renameextensions.html
+++ b/docs/manual/OptionalTasks/renameextensions.html
@@ -100,7 +100,7 @@ supports all attributes of <code>&lt;fileset&gt;</code>
 </blockquote>
 
 <hr>
-<p align="center">Copyright &copy; 2001 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2001 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/OptionalTasks/script.html b/docs/manual/OptionalTasks/script.html
index 050bf4bc4..267894097 100644
--- a/docs/manual/OptionalTasks/script.html
+++ b/docs/manual/OptionalTasks/script.html
@@ -15,7 +15,14 @@
 See <a href="../install.html#librarydependencies">Library Dependencies</a> for more information.</p>
 <p>All items (tasks, targets, etc) of the running project are
 accessible from the script, using either their <code>name</code> or
-<code>id</code> attributes.  The name "project" is a pre-defined reference to the Project, which can be used instead of the project name.</p>
+<code>id</code> attributes (as long as their names are considered
+valid Java identifiers, that is). 
+The name "project" is a pre-defined reference to the Project, which can be
+used instead of the project name.</p>
+<p><b>BeanShell users:</b> This task now natively supports the BeanShell
+scripting language, using language="beanshell". The BeanShell engine is
+still required.
+</p>
 <p>Scripts can do almost anything a task written in Java could do.</p>
 <h3>Parameters</h3>
 <table border="1" cellpadding="2" cellspacing="0">
@@ -115,7 +122,7 @@ BUILD SUCCESSFUL
 </pre></blockquote>
 
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/OptionalTasks/setproxy.html b/docs/manual/OptionalTasks/setproxy.html
new file mode 100644
index 000000000..8d6fb8044
--- /dev/null
+++ b/docs/manual/OptionalTasks/setproxy.html
@@ -0,0 +1,219 @@
+    
+<html>
+<head>
+  <meta http-equiv="Content-Language" content="en-us">
+  <title>Setproxy
+ Task</title>
+</head>
+
+<body bgcolor="#ffffff" text="#000000" link="#525D76"
+      alink="#525D76" vlink="#525D76">
+
+<table border="0" width="100%" cellspacing="4">
+
+  <!-- PAGE HEADER -->
+  <tr>
+    <td>
+      <table border="0" width="100%"><tr>
+          <td valign="bottom">
+            <font size="+3" face="arial,helvetica,sanserif"><strong>Setproxy
+ Task</strong></font>
+            <br><font face="arial,helvetica,sanserif">Sets Java's web proxy properties, so that tasks and code run in the same JVM can have through-the-firewall access to remote web sites, and remote ftp sites.</font>
+          </td>
+          <td>
+            <!-- PROJECT LOGO -->
+            <a href="http://jakarta.apache.org/ant/">
+              <img src="../../images/ant_logo_large.gif" align="right" alt="Apache Ant" border="0"/>
+            </a>
+          </td>
+      </tr></table>
+    </td>
+  </tr>
+
+  <!-- START RIGHT SIDE MAIN BODY -->
+  <tr>
+    <td  valign="top" align="left">
+
+          <!-- Applying task/long-description -->
+    <!-- Start Description -->
+    <table border="0" cellspacing="0" cellpadding="2" width="100%">
+      <tr><td>&nbsp;</td></tr>
+
+      <tr><td bgcolor="#525D76">
+        <font color="#ffffff" face="arial,helvetica.sanserif">
+          <a name="description">
+          <strong>Description</strong></a></font>
+      </td></tr>
+
+      <tr><td><blockquote>
+        Sets Java's web proxy properties, so that tasks and code run in
+ the same JVM can have through-the-firewall access to remote web sites,
+ and remote ftp sites.
+ You can nominate an http and ftp proxy, or a socks server, reset the server 
+ settings, or do nothing at all.
+ <p> 
+ Examples
+ <pre>&lt;setproxy/&gt;</pre>
+ do nothing
+ <pre>&lt;setproxy proxyhost="firewall"/&gt;</pre>
+ set the proxy to firewall:80
+ <pre>&lt;setproxy proxyhost="firewall" proxyport="81"/&gt;</pre>
+ set the proxy to firewall:81
+ <pre>&lt;setproxy proxyhost=""/&gt;</pre>
+ stop using the http proxy; don't change the socks settings
+ <pre>&lt;setproxy socksproxyhost="socksy"/&gt;</pre>
+ use socks via socksy:1080
+ <pre>&lt;setproxy socksproxyhost=""/&gt;</pre>
+ stop using the socks server
+      </blockquote></td></tr>
+
+    </table>
+    <!-- End Description -->
+
+    <!-- Start Attributes -->
+    <table border="0" cellspacing="0" cellpadding="2" width="100%">
+      <tr><td>&nbsp;</td></tr>
+
+      <tr><td bgcolor="#525D76">
+        <font color="#ffffff" face="arial,helvetica.sanserif">
+          <a name="attributes">
+          <strong>Parameters</strong></a></font>
+      </td></tr>
+
+      <tr><td><blockquote>
+        <table>
+          <tr>
+        <td bgcolor="#cccccc" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif"><b>Attribute</b></font>
+        </td>
+        <td bgcolor="#cccccc" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif"><b>Description</b></font>
+        </td>
+        <td bgcolor="#cccccc" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif"><b>Type</b></font>
+        </td>
+          </tr>
+    <!-- Attribute -->
+    <tr>
+        <td bgcolor="#eeeeee" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">nonProxyHosts</font>
+        </td>
+        <td bgcolor="#eeeeee" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          A list of hosts to bypass the proxy on. These should be separated
+ with the vertical bar character '|'. Only in Java 1.4 does ftp use
+ this list.
+ e.g. fozbot.corp.sun.com|*.eng.sun.com.
+        </font>
+        </td>
+        <td bgcolor="#eeeeee" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">String</font>
+        </td>
+    </tr>
+    <!-- Attribute -->
+    <tr>
+        <td bgcolor="#eeeeee" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">proxyHost</font>
+        </td>
+        <td bgcolor="#eeeeee" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          the HTTP/ftp proxy host. Set this to "" for the http proxy
+ option to be disabled
+        </font>
+        </td>
+        <td bgcolor="#eeeeee" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">String</font>
+        </td>
+    </tr>
+    <!-- Attribute -->
+    <tr>
+        <td bgcolor="#eeeeee" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">proxyPort</font>
+        </td>
+        <td bgcolor="#eeeeee" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          the HTTP/ftp proxy port number; default is 80
+        </font>
+        </td>
+        <td bgcolor="#eeeeee" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">int</font>
+        </td>
+    </tr>
+    <!-- Attribute -->
+    <tr>
+        <td bgcolor="#eeeeee" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">socksProxyHost</font>
+        </td>
+        <td bgcolor="#eeeeee" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          The name of a Socks server. Set to "" to turn socks
+ proxying off.
+        </font>
+        </td>
+        <td bgcolor="#eeeeee" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">String</font>
+        </td>
+    </tr>
+    <!-- Attribute -->
+    <tr>
+        <td bgcolor="#eeeeee" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">socksProxyPort</font>
+        </td>
+        <td bgcolor="#eeeeee" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          Set the ProxyPort for socks connections. The default value is 1080
+        </font>
+        </td>
+        <td bgcolor="#eeeeee" valign="top" align="left">
+          <font color="#000000" size="-1" face="arial,helvetica,sanserif">int</font>
+        </td>
+    </tr>
+
+        </table>
+      </blockquote></td></tr>
+
+    </table>
+    <!-- End Attributes -->
+
+    <!-- Start Elements -->
+    <table border="0" cellspacing="0" cellpadding="2" width="100%">
+      <tr><td>&nbsp;</td></tr>
+
+      <tr><td bgcolor="#525D76">
+        <font color="#ffffff" face="arial,helvetica.sanserif">
+          <a name="elements">
+          <strong>Parameters as nested elements</strong></a></font>
+      </td></tr>
+
+      <tr><td><blockquote>
+
+      </blockquote></td></tr>
+
+    </table>
+    <!-- End Elements -->
+
+
+    </td>
+  </tr>
+  <!-- END RIGHT SIDE MAIN BODY -->
+
+  <!-- FOOTER SEPARATOR -->
+  <tr>
+    <td>
+      <hr noshade="" size="1"/>
+    </td>
+  </tr>
+
+  <!-- PAGE FOOTER -->
+  <tr>
+    <td>
+      <div align="center"><font color="#525D76" size="-1"><em>
+        Copyright &#169; 2000-2002, Apache Software Foundation
+      </em></font></div>
+    </td>
+  </tr>
+
+</table>
+
+</body>
+</html>
diff --git a/docs/manual/OptionalTasks/telnet.html b/docs/manual/OptionalTasks/telnet.html
index 585cadf41..4dc567f29 100644
--- a/docs/manual/OptionalTasks/telnet.html
+++ b/docs/manual/OptionalTasks/telnet.html
@@ -132,7 +132,7 @@ This can be done in the Telnet Server Admin app:
 select "display/change registry settings", then "NTLM", then set the value of NTLM to 1.
 </p>
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/OptionalTasks/vss.html b/docs/manual/OptionalTasks/vss.html
index 2c27355c1..77c5b70b5 100644
--- a/docs/manual/OptionalTasks/vss.html
+++ b/docs/manual/OptionalTasks/vss.html
@@ -728,7 +728,7 @@ directory (see vsscp).</p>
 <hr>
 
 <!-- Footer -->
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 </body>
 </html>
diff --git a/docs/manual/OptionalTasks/xmlvalidate.html b/docs/manual/OptionalTasks/xmlvalidate.html
index 099f209fd..edbb30175 100644
--- a/docs/manual/OptionalTasks/xmlvalidate.html
+++ b/docs/manual/OptionalTasks/xmlvalidate.html
@@ -14,6 +14,10 @@ task uses the SAX2 parser implementation provided by JAXP by default
 (probably the one that is used by Ant itself), but one can specify any
 SAX1/2 parser if needed.</p>
 
+<p>This task supports the use of nested <a
+href="../CoreTypes/xmlcatalog.html">xmlcatalog</a> elements and/or nested 
+&lt;dtd&gt; elements which are used to resolve DTDs and entities.</p>
+
 <h3>Parameters</h3>
 <table border="1" cellpadding="2" cellspacing="0">
   <tr>
@@ -77,6 +81,9 @@ SAX1/2 parser if needed.</p>
     <td align="center" valign="top">Yes</td>
   </tr>
 </table>
+<h4>xmlcatalog</h4>
+<p>The <a href="../CoreTypes/xmlcatalog.html">xmlcatalog</a> 
+element is used to perform Entity resolution.</p>
 
 
 <h3>Examples</h3>
@@ -93,6 +100,20 @@ SAX1/2 parser if needed.</p>
   &lt;dtd publicId="-//Apache Software Foundation//DTD Struts Configuration 1.0//EN"
        location="struts-config_1_0.dtd"/&gt;
 &lt;/xmlvalidate&gt;
+
+&lt;xmlvalidate failonerror="no"&gt;
+  &lt;fileset dir="${project.dir}" includes="**/*.xml"/&gt;
+  &lt;xmlcatalog refid="mycatalog"/&gt;
+&lt;/xmlvalidate&gt;
+
+&lt;xmlvalidate failonerror="no"&gt;
+  &lt;fileset dir="${project.dir}" includes="**/*.xml"/&gt;
+  &lt;xmlcatalog&gt;
+       &lt;dtd 
+         publicId=&quot;-//ArielPartners//DTD XML Article V1.0//EN&quot;
+         location=&quot;com/arielpartners/knowledgebase/dtd/article.dtd&quot;/&gt;
+  &lt;/xmlcatalog&gt;
+&lt;/xmlvalidate&gt;
 </pre></blockquote>
 <hr>
 
diff --git a/docs/manual/antexternal.html b/docs/manual/antexternal.html
new file mode 100644
index 000000000..9a92f5633
--- /dev/null
+++ b/docs/manual/antexternal.html
@@ -0,0 +1,145 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Language" content="en-us">
+<title>InputHandler</title>
+</head>
+
+<body>
+<h1>Using Ant Tasks Outside of Ant</h1>
+
+<h2>Rationale</h2>
+
+<p>Ant provides a rich set of tasks for buildfile creators and
+administrators.  But what about programmers?  Can the functionality
+provided by Ant tasks be used in java programs?</p>
+
+<p>Yes, and its quite easy.  Before getting into the details, however, 
+we should mention the pros and cons of this approach:
+
+<h3>Pros</h3>
+
+<table cellpadding="0" margin="0" border="1">
+<tr>
+<td><b>Robust</b></td>
+<td>
+Ant tasks are very robust.  They have been banged on by many people.
+Ant tasks have been used in many different contexts, and have
+therefore been instrumented to take care of a great many boundary
+conditions and potentially obscure errors.
+</td>
+</tr>
+<tr>
+<td><b>Cross Platform</b></td>
+<td>
+Ant tasks are cross platform.  They have been tested on all of the
+volume platforms, and several rather unusual ones (Netware and OS/390, to
+name a few).
+</td>
+</tr>
+<tr>
+<td><b>Community Support</b></td>
+<td>
+Using Ant tasks means you have less of your own code to support.  Ant
+code is supported by the entire jakarta-ant community.
+</td>
+</tr>
+</table>
+
+<h3>Cons</h3>
+
+<table cellpadding="0" margin="0" border="1">
+<tr>
+<td><b>Dependency on Ant Libraries</b></td>
+<td>
+Obviously, if you use an Ant task in your code, you will have to add
+"ant.jar" to your path.  Of course, you could use a code optimizer to
+remove the unnecessary classes, but you will still probably require a
+chunk of the Ant core.
+</td>
+</tr>
+<tr>
+<td><b>Loss of Flexibility</b></td>
+<td>
+At some point, if you find yourself having to modify the Ant code, it
+probably makes more sense to "roll your own."  Of course, you can
+still steal some code snippets and good ideas.  This is the beauty of
+open source!
+</td>
+</tr>
+</table>
+
+
+<h2>Example</h2>
+
+<p>Let's say you want to unzip a zip file programmatically from java
+into a certain directory.  Of course you could write your own routine
+to do this, but why not use the Ant task that has already been written?</p>
+
+<p>In my example, I wanted to be able to unzip a file from within an
+XSLT Transformation.  XSLT Transformers can be extended by plugging in
+static methods in java.  I therefore need a function something like
+this:</p>
+
+<pre>
+/**
+ * Unzip a zip file into a given directory.
+ *
+ * @param zipFilepath A pathname representing a local zip file
+ * @param destinationDir where to unzip the archive to
+ */
+ static public void unzip(String zipFilepath, String destinationDir)
+</pre>
+
+<p>
+The Ant task to perform this function is
+<code>org.apache.tools.ant.taskdefs.Expand</code>.  All we have to do
+is create a dummy Ant <code>Project</code> and <code>Target</code>,
+set the <code>Task</code> parameters that would normally be set in a
+buildfile, and call <code>execute()</code>.</p>
+
+<p>First, let's make sure we have the proper includes:</p>
+
+<pre>
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Target;
+import org.apache.tools.ant.taskdefs.Expand;
+import java.io.File;
+</pre>
+
+<p>The function call is actually quite simple:</p>
+
+<pre>
+static public void unzip(String zipFilepath, String destinationDir) {
+
+    final class Expander extends Expand {
+        public Expander() {
+ 	    project = new Project();
+	    project.init();
+	    taskType = "unzip";
+	    taskName = "unzip";
+	    target = new Target();
+	}	
+    }
+    Expander expander = new Expander();
+    expander.setSrc(new File(zipfile));
+    expander.setDest(new File(destdir));
+    expander.execute();
+</pre>
+
+<p>In actual practice, you will probably want to add your own error
+handling code and you may not want to use a local inner class.
+However, the point of the example is to show how an Ant task can be
+called programmatically in relatively few lines of code.</p>
+
+<p>The question you are probably asking yourself at this point is:
+<i>How would I know which classes and methods have to be called in
+order to set up a dummy Project and Target?</i> The answer is: you
+don't.  Ultimately, you have to be willing to get your feet wet and
+read the source code.  The above example is merely designed to whet
+your appetite and get you started.  Go for it!</p>
+
+<hr>
+<p align="center">Copyright &copy; 2002 Apache Software Foundation. All rights
+Reserved.</p>
+</html>
diff --git a/docs/manual/anttaskslist.html b/docs/manual/anttaskslist.html
index 49e229fc5..b11c7e26e 100644
--- a/docs/manual/anttaskslist.html
+++ b/docs/manual/anttaskslist.html
@@ -15,6 +15,8 @@
 <a href="tasksoverview.html" target="mainFrame">Overview of Ant Tasks</a><br>
 <a href="coretasklist.html" target="navFrame">Core Tasks</a><br>
 <a href="optionaltasklist.html" target="navFrame">Optional Tasks</a><br>
+&nbsp;&nbsp;<a href="install.html#librarydependencies" target="mainFrame">
+Library Dependencies</a><br>
 
 </body>
 </html>
diff --git a/docs/manual/base_task_classes.html b/docs/manual/base_task_classes.html
new file mode 100644
index 000000000..a37cb583c
--- /dev/null
+++ b/docs/manual/base_task_classes.html
@@ -0,0 +1,87 @@
+<html>
+
+<head>
+<meta http-equiv="Content-Language" content="en-us">
+<title>Tasks Desinged for Extension</title>
+</head>
+
+<body>
+<h1>Tasks Desgined for Extension</h1>
+These classes are desgined to be extended.  Always start here when writting your own task.
+
+<table border="1">
+<thead>
+<tr>
+<th>
+Class
+</th>
+<th>
+Description
+</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>
+<a href="api/org/apache/tools/ant/Task.html">Task</a>
+</td>
+<td>
+Base class for all tasks.
+</td>
+</tr>
+
+<tr>
+<td>
+<a href="api/org/apache/tools/ant/taskdefs/AbstractCvsTask.html">AbstractCvsTask</a>
+</td>
+<td>
+Another task can extend this with some customized output processing
+</td>
+</tr>
+
+<tr>
+<td>
+<a href="api/org/apache/tools/ant/taskdefs/JDBCTask.html">JDBCTask</a>
+</td>
+<td>
+Handles JDBC configuration needed by SQL type tasks.
+</td>
+</tr>
+
+<tr>
+<td>
+<a href="api/org/apache/tools/ant/taskdefs/MatchingTask.html">MatchingTask</a>
+</td>
+<td>
+This is an abstract task that should be used by all those tasks that require to include or exclude files based on pattern matching.
+</td>
+</tr>
+
+<tr>
+<td>
+<a href="api/org/apache/tools/ant/taskdefs/Pack.html">Pack</a>
+</td>
+<td>
+Abstract Base class for pack tasks.
+</td>
+</tr>
+
+
+<tr>
+<td>
+<a href="api/org/apache/tools/ant/taskdefs/Unpack.html">Unpack</a>
+</td>
+<td>
+Abstract Base class for unpack tasks.
+</td>
+</tr>
+
+</tbody>
+</table>
+
+<hr>
+<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+Reserved.</p>
+
+</body>
+</html>
diff --git a/docs/manual/conceptstypeslist.html b/docs/manual/conceptstypeslist.html
index 8a056b91a..f96b0cddf 100644
--- a/docs/manual/conceptstypeslist.html
+++ b/docs/manual/conceptstypeslist.html
@@ -24,6 +24,7 @@
 <a href="CoreTypes/filterchain.html">FilterChains and FilterReaders</a><br>
 <a href="CoreTypes/filterset.html">FilterSet</a><br>
 <a href="CoreTypes/patternset.html">PatternSet</a><br>
+<a href="CoreTypes/selectors.html">Selectors</a><br>
 <a href="CoreTypes/xmlcatalog.html">XMLCatalog</a><br>
 
 <h3>Optional Types</h3>
diff --git a/docs/manual/coretasklist.html b/docs/manual/coretasklist.html
index aa8c41a0f..636ece833 100644
--- a/docs/manual/coretasklist.html
+++ b/docs/manual/coretasklist.html
@@ -71,6 +71,7 @@
 <a href="CoreTasks/signjar.html">SignJar</a><br>
 <a href="CoreTasks/sleep.html">Sleep</a><br>
 <a href="CoreTasks/sql.html">Sql</a><br>
+<a href="CoreTasks/style.html">Style</a><br>
 <a href="CoreTasks/tar.html">Tar</a><br>
 <a href="CoreTasks/taskdef.html">Taskdef</a><br>
 <a href="CoreTasks/touch.html">Touch</a><br>
@@ -84,7 +85,7 @@
 <a href="CoreTasks/waitfor.html">Waitfor</a><br>
 <a href="CoreTasks/war.html">War</a><br>
 <a href="CoreTasks/xmlproperty.html">XmlProperty</a><br>
-<a href="CoreTasks/style.html">Xslt/Style</a><br>
+<a href="CoreTasks/style.html">Xslt</a><br>
 <a href="CoreTasks/zip.html">Zip</a><br>
 </body>
 </html>
diff --git a/docs/manual/cover.html b/docs/manual/cover.html
index 6f3ff9a94..dc6d6fc27 100644
--- a/docs/manual/cover.html
+++ b/docs/manual/cover.html
@@ -20,7 +20,7 @@
   <p>&nbsp;</p>
 </div>
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/credits.html b/docs/manual/credits.html
index a49422e0f..994d7535e 100644
--- a/docs/manual/credits.html
+++ b/docs/manual/credits.html
@@ -36,6 +36,7 @@
   <li>Roger Vaughn (<a href="mailto:rvaughn@seaconinc.com">rvaughn@seaconinc.com</a>)</li>
   <li>Dave Walend (<a href="mailto:dwalend@cs.tufts.edu">dwalend@cs.tufts.edu</a>)</li>
   <li>Phillip Wells (<a href="mailto:philwells@rocketmail.com">philwells@rocketmail.com</a>)</li>
+  <li>Craeg Strong (<a href="mailto:cstrong@arielpartners.com">cstrong@arielpartners.com</a>)</li>  
 </ul>
 
 <center>
@@ -43,7 +44,7 @@
 $Id$</p>
 </center>
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/develop.html b/docs/manual/develop.html
index 246996a6a..da505fd98 100644
--- a/docs/manual/develop.html
+++ b/docs/manual/develop.html
@@ -11,7 +11,8 @@
 <h2><a name="writingowntask">Writing Your Own Task</a></h2>
 <p>It is very easy to write your own task:</p>
 <ol>
-  <li>Create a Java class that extends <code>org.apache.tools.ant.Task</code>.</li>
+  <li>Create a Java class that extends <code>org.apache.tools.ant.Task</code>
+      or <a href="base_task_classes.html">another class</a> that was desgined to be extended.</li>
   <li>For each attribute, write a <i>setter</i> method. The setter method must be a
     <code>public void</code> method that takes a single argument. The
     name of the method must begin with <code>set</code>, followed by the
@@ -355,7 +356,7 @@ which provides some advice to people developing and testing tasks. Even if you i
 keep your tasks to yourself, you should still read this as it should be informative.
 
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/developlist.html b/docs/manual/developlist.html
index 928d5d34f..370d8df9a 100644
--- a/docs/manual/developlist.html
+++ b/docs/manual/developlist.html
@@ -13,9 +13,11 @@
 <h3>Developing with Ant</h3>
 
 <a href="develop.html#writingowntask">Writing Your Own Task</a><br>
+<a href="base_task_classes.html">Tasks Designed for Extensiton</a><br>
 <a href="develop.html#buildevents">Build Events</a><br>
 <a href="develop.html#integration">Source-code Integration</a><br>
 <a href="inputhandler.html">InputHandler</a><br>
+<a href="antexternal.html">Using Ant Tasks Outside of Ant</a><br>
 
 </body>
 </html>
diff --git a/docs/manual/dirtasks.html b/docs/manual/dirtasks.html
index 79e1a79b9..e19807d2b 100644
--- a/docs/manual/dirtasks.html
+++ b/docs/manual/dirtasks.html
@@ -165,7 +165,7 @@ They are:</p>
 <p>If you do not want these default excludes applied, you may disable them with the
 <code>defaultexcludes=&quot;no&quot;</code> attribute.</p>
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/feedback.html b/docs/manual/feedback.html
index cea9baa94..8a08f3f85 100644
--- a/docs/manual/feedback.html
+++ b/docs/manual/feedback.html
@@ -52,7 +52,7 @@ href="http://marc.theaimsgroup.com" target="_top">http://marc.theaimsgroup.com</
 you know of any additional archive sites, please report them to the
 lists.</p>
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/ide.html b/docs/manual/ide.html
index a2e7f36c7..e43b01d9b 100644
--- a/docs/manual/ide.html
+++ b/docs/manual/ide.html
@@ -11,6 +11,8 @@
 <h2><a href="toc.html" target="navFrame">Table of Contents</a></h2>
 
 <h3>IDE Integration</h3>
+All the modern Java IDEs support Ant almost out the box, with the
+notable exception of JBuilder.<br><br>
 <a href="Integration/Antidote.html">
          Antidote<br>(in development)</a><br><br>
 <a href="http://www.dieter-bogdoll.de/java/AntRunner/">
@@ -23,9 +25,22 @@ errors. Installation: built-in JDE  2.2.8 or later. Configuration: through
 customize menu "Jde Build Function"<br><br>
 <a href="http://www.intellij.com/idea/">IDEA</a> has built-in GUI ANT integration: GUI
 selection of targets, execution, hyperlink to compilation errors<br><br>
-<a href="http://ant.netbeans.org/">NetBeans <br>Forte for Java <br>(unbundled)</a><br><br>
-<a href="Integration/VAJAntTool.html">VisualAge for Java</a><br><br>
+<a href="http://www.netbeans.org/">NetBeans</a>
+NetBeans 3.3 has very good Ant integration indeed.
+</a><br><br>
 
+<a href="http://jedit.org/">jEdit</a>
+jEdit is an open source java IDE with some great plugins for Java dev, a
+good XML editor and the Antfarm plugin to execute targets in a build
+file.
+<br><br>
+<a href="http://eclipse.org/">Eclipse</a>
+Eclipse is IBM's counterpoint to Netbeans; an open source IDE with Java and ant
+support.
+<br><br>
+<a href="Integration/VAJAntTool.html">VisualAge for Java</a><br><br>
+<a href="http://www7b.software.ibm.com/wsdd/library/techarticles/0203_searle/searle1.html">
+WebSphere Studio Application Developer</a><br><br>
 <hr>
 <p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
 Reserved.</p>
diff --git a/docs/manual/install.html b/docs/manual/install.html
index 9e8e53f5b..c861c2605 100644
--- a/docs/manual/install.html
+++ b/docs/manual/install.html
@@ -41,12 +41,12 @@ To build and use Ant, you must have a JAXP-compliant XML parser installed and
 available on your classpath.</p>
 <p>
 The binary distribution of Ant includes the latest version of the
-<a href="http://xml.apache.org/crimson/index.html">Apache Crimson</a> XML parser. 
+<a href="http://xml.apache.org/xerces2-j/index.html">Apache Xerces2</a> XML parser. 
 Please see 
 <a href="http://java.sun.com/xml/" target="_top">http://java.sun.com/xml/</a> 
 for more information about JAXP. 
 If you wish to use a different JAXP-compliant parser, you should remove
-<code>jaxp.jar</code> and <code>crimson.jar</code>
+<code>xercesImpl.jar</code> and <code>xmlParserAPIs.jar</code>
 from Ant's <code>lib</code> directory.
 
 You can then either put the jars from your preferred parser into Ant's 
@@ -319,7 +319,7 @@ Installing Ant / Optional Tasks</a> section above.</p>
         www2.hursley.ibm.com/netrexx</a></td>
   </tr>
   <tr>
-    <td>rhino.jar</td>
+    <td>js.jar</td>
     <td>javascript with script task</td>
     <td><a href="http://www.mozilla.org/rhino/" target="_top">www.mozilla.org/rhino</a></td>
   </tr>
@@ -333,6 +333,11 @@ Installing Ant / Optional Tasks</a> section above.</p>
     <td>TCL with script task</td>
     <td><a href="http://www.scriptics.com/java" target="_top">www.scriptics.com/java</a></td>
   </tr>
+  <tr>
+    <td>BeanShell JAR(s)</td>
+    <td>BeanShell with script task</td>
+    <td><a href="http://www.beanshell.org" target="_top">www.beanshell.org</a></td>
+  </tr>
   <tr>
     <td>netcomponents.jar</td>
     <td>ftp and telnet tasks</td>
@@ -368,7 +373,7 @@ Installing Ant / Optional Tasks</a> section above.</p>
 </table>
 <br>
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/intro.html b/docs/manual/intro.html
index 73e609ad1..b010c46e5 100644
--- a/docs/manual/intro.html
+++ b/docs/manual/intro.html
@@ -46,7 +46,7 @@ allows different commands to be executed based on the OS it is executing
 on.</p>
 
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/listeners.html b/docs/manual/listeners.html
index 74bca3f4b..43fb01d96 100644
--- a/docs/manual/listeners.html
+++ b/docs/manual/listeners.html
@@ -309,7 +309,7 @@ developers.</p>
 </ul>
 
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/optionaltasklist.html b/docs/manual/optionaltasklist.html
index e54c8de69..3c7e42a6c 100644
--- a/docs/manual/optionaltasklist.html
+++ b/docs/manual/optionaltasklist.html
@@ -28,7 +28,7 @@
 <a href="OptionalTasks/jspc.html">JspC</a><br>
 <a href="OptionalTasks/jdepend.html">JDepend</a><br>
 <a href="OptionalTasks/jjtree.html">JJTree</a><br>
-<a href="OptionalTasks/jlink.html">Jlink</a><br>
+<a href="OptionalTasks/jlink.html"><i>Jlink</i></a><br>
 <a href="OptionalTasks/jpcoverage.html">JProbe Coverage</a><br>
 <a href="OptionalTasks/junit.html">JUnit</a><br>
 <a href="OptionalTasks/junitreport.html">JUnitReport</a><br>
diff --git a/docs/manual/platform.html b/docs/manual/platform.html
index 264b8187f..5e2825ce3 100644
--- a/docs/manual/platform.html
+++ b/docs/manual/platform.html
@@ -50,14 +50,15 @@ it is treated like any other Unix.
 <p>To give the same level of sophisticated control as Ant's startup scripts on other platforms, it was decided to make the main ant startup on NetWare be via a Perl Script, "runant.pl".  This is found in the bin directory (for instance - bootstrap\bin or dist\bin).</p>
 
 <p>One important item of note is that you need to set up the following to run ant:</p>
-<ul><li><code>CLASSPATH</code> - put ant.jar, crimson.jar, optional.jar, and any other needed jars on the system classpath.</li>
+<ul><li><code>CLASSPATH</code> - put ant.jar, xercesImpl.jar, xmlParserAPIs.jar and any other needed jars on the system classpath.</li>
    <li><code>ANT_OPTS</code> - On NetWare, <code>ANT_OPTS</code> needs to include a parameter of the form, <nobr>"-envCWD=<code>ANT_HOME</code>"</nobr>, with <code>ANT_HOME</code> being the fully expanded location of Ant, <b>not</b> an environment variable.  This is due to the fact that the NetWare System Console has no notion of a current working directory.</li>
 </ul>
 <p>It is suggested that you create up an ant.ncf that sets up these parameters, and calls <code>perl ANT_HOME/dist/bin/runant.pl</code></p>
 <p>The following is an example of such an NCF file(assuming ant is installed in <nobr>'sys:/jakarta-ant/'):</nobr></p>
 <code>
    &nbsp;&nbsp;&nbsp;envset CLASSPATH=SYS:/jakarta-ant/bootstrap/lib/ant.jar<br />
-   &nbsp;&nbsp;&nbsp;envset CLASSPATH=$CLASSPATH;SYS:/jakarta-ant/lib/crimson.jar <br />
+   &nbsp;&nbsp;&nbsp;envset CLASSPATH=$CLASSPATH;SYS:/jakarta-ant/lib/xercesImpl.jar <br />
+   &nbsp;&nbsp;&nbsp;envset CLASSPATH=$CLASSPATH;SYS:/jakarta-ant/lib/xmlParserAPIs.jar <br />
    &nbsp;&nbsp;&nbsp;envset CLASSPATH=$CLASSPATH;SYS:/jakarta-ant/lib/optional/junit.jar <br />
    &nbsp;&nbsp;&nbsp;envset CLASSPATH=$CLASSPATH;SYS:/jakarta-ant/bootstrap/lib/optional.jar <br />
 <br />
diff --git a/docs/manual/running.html b/docs/manual/running.html
index 1ceff0eab..65f6fbfcb 100644
--- a/docs/manual/running.html
+++ b/docs/manual/running.html
@@ -152,7 +152,7 @@ command. This example assumes you have set your classpath to include:</p>
 </ul>
 <br>
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/tasksoverview.html b/docs/manual/tasksoverview.html
index dba92cf24..9145e8de6 100644
--- a/docs/manual/tasksoverview.html
+++ b/docs/manual/tasksoverview.html
@@ -94,11 +94,10 @@ documentation.</p>
 
   <tr valign="top">
     <td nowrap><a href="OptionalTasks/jlink.html">Jlink</a></td>
-    <td><p>This task can be used to build jar and zip files,
-     similar to the <a href="CoreTasks/jar.html">Jar</a> task.
-     However, Jlink provides options for controlling the way entries from
-     input files are added to the output file. Specifically, capabilities
-     for merging entries from multiple zip or jar files are available.</p></td>
+    <td><p><i>Deprecated.</i> Use the <code>zipfileset</code>
+     and <code>zipgroupfileset</code> attributes of the
+     <a href="CoreTasks/jar.html">Jar</a> or
+     <a href="../CoreTasks/zip.html">Zip</a> tasks instead.</p></td>
   </tr>
 
   <tr valign="top">
@@ -660,13 +659,6 @@ documentation.</p>
      message and reading a line of input from the console.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="CoreTasks/pathconvert.html">PathConvert</a></td>
-    <td><p>Converts a nested path, path reference, or fileset reference
-     to the form usable on a specified platform and stores the result in
-     a given property.</p></td>
-  </tr>
-
   <tr valign="top">
     <td nowrap><a href="OptionalTasks/script.html">Script</a></td>
     <td><p>Executes a script in a 
@@ -715,7 +707,7 @@ documentation.</p>
   <tr valign="top">
     <td nowrap><a href="OptionalTasks/xmlvalidate.html">XmlValidate</a></td>
     <td><p>Checks that XML files are valid (or only well-formed). This task
-     uses the Crimson SAX2 parser implementation by default, but any SAX1/2
+     uses the XML parser that is currently used by Ant by default, but any SAX1/2
      parser can be specified, if needed.</p></td>
   </tr>
 </table>
@@ -877,12 +869,12 @@ documentation.</p>
     <a href="OptionalTasks/echoproperties.html">Echoproperties</a><br>
 
     </td>
-    <td><p>Lists the current properties</p></td>
+    <td><p>Lists the current properties.</p></td>
   </tr>
 
   <tr valign="top">
     <td nowrap><a href="CoreTasks/loadfile.html">LoadFile</a></td>
-    <td><p>Loads a file into a property</p></td>
+    <td><p>Loads a file into a property.</p></td>
   </tr>
 
   <tr valign="top">
@@ -893,6 +885,14 @@ documentation.</p>
      and it cannot be specified outside a target.</p></td>
   </tr>
 
+  <tr valign="top">
+    <td nowrap><a href="CoreTasks/pathconvert.html">PathConvert</a></td>
+    <td><p>Converts a nested path, path reference, filelist reference, or
+     fileset reference to the form usable on a specified platform and/or
+     to a list of items separated by the specified separator and stores
+     the result in the specified property.</p></td>
+  </tr>
+
   <tr valign="top">
     <td nowrap><a href="CoreTasks/property.html">Property</a></td>
     <td><p>Sets a property (by name and value), or set of properties
@@ -914,6 +914,11 @@ documentation.</p>
     <td><p>Sets a property if a given target file is newer than a set of
      source files.</p></td>
   </tr>
+
+  <tr valign="top">
+    <td nowrap><a href="CoreTasks/xmlproperty.html">XmlProperty</a></td>
+    <td><p>Loads property values from a valid XML file.</p></td>
+  </tr>
 </table>
 
 <p></p>
diff --git a/docs/manual/using.html b/docs/manual/using.html
index be070d594..5719f40b0 100644
--- a/docs/manual/using.html
+++ b/docs/manual/using.html
@@ -523,7 +523,7 @@ href="CoreTypes/patternset.html">PatternSet</a>s, <a href="CoreTypes/fileset.htm
 structures as well.</p>
 
 <hr>
-<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/lib/xml-apis.jar b/lib/xml-apis.jar
new file mode 100644
index 000000000..8331d27f1
Binary files /dev/null and b/lib/xml-apis.jar differ
diff --git a/proposal/xdocs/src/org/apache/tools/ant/xdoclet/TaskTagsHandler.java b/proposal/xdocs/src/org/apache/tools/ant/xdoclet/TaskTagsHandler.java
index 85f8d27ac..826a3f34d 100644
--- a/proposal/xdocs/src/org/apache/tools/ant/xdoclet/TaskTagsHandler.java
+++ b/proposal/xdocs/src/org/apache/tools/ant/xdoclet/TaskTagsHandler.java
@@ -307,31 +307,51 @@ public class TaskTagsHandler extends XDocletTagSupport {
         return false;
     }
 
-    /**
-     * @todo need to add checks for number of parameters and non-supported parameters
-     */
     private MethodDoc[] getAttributeMethods(ClassDoc cur_class) throws XDocletException {
         MethodDoc[] methods = getMethods(cur_class);
         List attributeMethods = new ArrayList();
+        Map nameTypeMap = new HashMap();
 
         for (int i = 0; i < methods.length; i++) {
-            if (!methods[i].name().startsWith("set")) {
+            MethodDoc method = methods[i];
+
+            if (!method.isPublic()) {
+                continue;
+            }
+
+            if (!method.name().startsWith("set")) {
                 continue;
             }
 
             // if superclass is org.apache.tools.ant.Task then
             // remove some known unallowed properties
-            if (isAntAttribute(methods[i])) {
+            if (isAntAttribute(method)) {
                 continue;
             }
 
             // ensure method only has one parameter
-            Parameter[] params = methods[i].parameters();
+            Parameter[] params = method.parameters();
             if (params.length != 1) {
                 continue;
             }
 
-            attributeMethods.add(methods[i]);
+            Parameter param = params[0];
+
+            // Screen out attribute setters if there are duplicates,
+            // and only return the first non-String one
+            // (this may or may not jive with IntrospectionHelper)
+            MethodDoc oldMethod = (MethodDoc) nameTypeMap.get(method.name());
+            if (oldMethod == null) {
+                nameTypeMap.put(method.name(), method);
+            }
+            else {
+                if ("java.lang.String".equals(oldMethod.parameters()[0].typeName())) {
+                    attributeMethods.remove(oldMethod);
+                    nameTypeMap.put(method.name(), method);
+                }
+            }
+
+            attributeMethods.add(method);
         }
 
         return (MethodDoc[]) attributeMethods.toArray(new MethodDoc[0]);
@@ -347,6 +367,10 @@ public class TaskTagsHandler extends XDocletTagSupport {
         List attributeMethods = new ArrayList();
 
         for (int i = 0; i < methods.length; i++) {
+            if (! methods[i].isPublic()) {
+                continue;
+            }
+
             String name = methods[i].name();
 
             // ensure if there are no parameters, there is a return type,
@@ -356,6 +380,12 @@ public class TaskTagsHandler extends XDocletTagSupport {
                 if (methods[i].returnType().asClassDoc() == null) {
                     continue;
                 }
+
+                // only the "createXXX" method has zero params
+                // the "addXXX" and "addConfiguredXXX" have 1 param
+                if (!name.startsWith("create")) {
+                    continue;
+                }
             }
             else if (params.length != 1) {
                 continue;
diff --git a/src/etc/testcases/taskdefs/ant.xml b/src/etc/testcases/taskdefs/ant.xml
index 4024bc3d2..8a8485a40 100644
--- a/src/etc/testcases/taskdefs/ant.xml
+++ b/src/etc/testcases/taskdefs/ant.xml
@@ -2,6 +2,10 @@
 
 <project name="ant-test" basedir="." default="test1">
 
+  <path id="inheritable">
+    <pathelement path="${java.class.path}" />
+  </path>
+
   <target name="cleanup">
     <delete file="test1.log" />
     <delete file="test2.log" />
@@ -83,4 +87,10 @@
     <ant antfile="ant.xml" target="dummy" output="test4.log" 
          dir="ant" />
   </target>
+
+  <target name="testRefid">
+    <ant antfile="ant/references.xml" inheritRefs="false" target="dummy">
+      <property name="testprop" refid="inheritable" />
+    </ant>
+  </target>
 </project>
diff --git a/src/etc/testcases/taskdefs/available.xml b/src/etc/testcases/taskdefs/available.xml
index 4bdd7fdd6..ce7a8f833 100644
--- a/src/etc/testcases/taskdefs/available.xml
+++ b/src/etc/testcases/taskdefs/available.xml
@@ -110,7 +110,14 @@
 
   <target name="test21">
     <available property="test" ignoresystemclasses="true"
-               classname="java.awt.Graphics" classpath="${java.home}/lib/rt.jar:${java.home}/lib/classes.zip"/>
+               classname="java.awt.Graphics">
+      <classpath>
+        <pathelement location="${java.home}/lib/rt.jar" />
+        <pathelement location="${java.home}/lib/classes.jar" />
+        <pathelement location="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes/classes.jar" />
+        <pathelement location="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes/ui.jar" />
+      </classpath>
+    </available>
   </target>
 
   <target name="test22">
@@ -134,4 +141,14 @@
     <delete dir="${user.dir}/test"/>
     <delete file="${user.dir}/test.jar"/>
   </target>
+
+  <target name="searchInPathNotThere">
+    <available file="not_there" filepath="..:optional"
+               property="test" />
+  </target>
+
+  <target name="searchInPathIsThere">
+    <available file="pvcs.xml" filepath="..:optional"
+               property="test" />
+  </target>
 </project>
diff --git a/src/etc/testcases/taskdefs/condition.xml b/src/etc/testcases/taskdefs/condition.xml
index 92497afee..a9a576531 100644
--- a/src/etc/testcases/taskdefs/condition.xml
+++ b/src/etc/testcases/taskdefs/condition.xml
@@ -197,6 +197,7 @@
     </condition>
     <echo>${filesmatch-different}</echo>
   </target>   
+
   
   <target name="filesmatch-match" >
     <echo file="match3.txt" message="012345676890" />
@@ -208,6 +209,26 @@
     </condition>
     <echo>${filesmatch-match}</echo>
   </target>   
+
+  <target name="filesmatch-different-sizes">
+    <echo file="match5.txt" message="012345676890" />
+    <echo file="match6.txt" message="0123456768" />
+    <condition property="filesmatch-different-sizes">
+      <filesmatch 
+        file1="match5.txt" 
+        file2="match6.txt" />
+    </condition>
+    <echo>${filesmatch-different-sizes}</echo>
+  </target>   
+
+  <target name="filesmatch-different-onemissing">
+    <condition property="filesmatch-different-sizes">
+      <filesmatch 
+        file1="condition.xml" 
+        file2="missing-file.txt" />
+    </condition>
+    <echo>${filesmatch-different-onemissing}</echo>
+  </target>   
   
   <target name="contains" >
     <condition property="contains">
@@ -332,6 +353,8 @@
     <delete file="match2.txt" />
     <delete file="match3.txt" />
     <delete file="match4.txt" />
+    <delete file="match5.txt" />
+    <delete file="match6.txt" />
   </target>
    
 </project>
diff --git a/src/etc/testcases/taskdefs/filter.xml b/src/etc/testcases/taskdefs/filter.xml
index f2ea3a6f8..f769c02b5 100644
--- a/src/etc/testcases/taskdefs/filter.xml
+++ b/src/etc/testcases/taskdefs/filter.xml
@@ -42,6 +42,13 @@
     </copy>
   </target>
 
+  <target name="test9">
+    <filter filtersfile="filterdefs.properties" />
+    <copy todir="./taskdefs.tmp" filtering="yes" overwrite="yes">
+      <fileset dir="." includes="filter3.txt"/>
+    </copy>
+  </target>
+
   <target name="cleanup">
     <delete dir="taskdefs.tmp" />
   </target>
diff --git a/src/etc/testcases/taskdefs/filter3.txt b/src/etc/testcases/taskdefs/filter3.txt
new file mode 100644
index 000000000..03d7d29e5
--- /dev/null
+++ b/src/etc/testcases/taskdefs/filter3.txt
@@ -0,0 +1 @@
+@property@
diff --git a/src/etc/testcases/taskdefs/filterdefs.properties b/src/etc/testcases/taskdefs/filterdefs.properties
new file mode 100644
index 000000000..7933956c8
--- /dev/null
+++ b/src/etc/testcases/taskdefs/filterdefs.properties
@@ -0,0 +1 @@
+property=included
diff --git a/src/etc/testcases/taskdefs/fixcrlf/build.xml b/src/etc/testcases/taskdefs/fixcrlf/build.xml
index b99f579d4..938f61902 100644
--- a/src/etc/testcases/taskdefs/fixcrlf/build.xml
+++ b/src/etc/testcases/taskdefs/fixcrlf/build.xml
@@ -109,7 +109,7 @@
              includes="input.crlf.utf16"
              javafiles="false"
              cr="remove"
-             encoding="UTF16"
+             encoding="UnicodeBig"
              />
   </target>
 
diff --git a/src/etc/testcases/taskdefs/manifest.xml b/src/etc/testcases/taskdefs/manifest.xml
index 33d7f995f..5d5933dba 100644
--- a/src/etc/testcases/taskdefs/manifest.xml
+++ b/src/etc/testcases/taskdefs/manifest.xml
@@ -7,14 +7,18 @@
   <target name="test1">
     <jar file="mftest1.jar" manifest="manifests/test1.mf"/>
     <unjar src="mftest1.jar" dest="manifests">
-      <include name="META-INF/MANIFEST.MF"/>
+      <patternset>
+        <include name="META-INF/MANIFEST.MF"/>
+      </patternset>
     </unjar>
   </target>
   
   <target name="test2">
     <jar file="mftest2.jar" manifest="manifests/test2.mf"/>
     <unjar src="mftest2.jar" dest="manifests">
-      <include name="META-INF/MANIFEST.MF"/>
+      <patternset>
+        <include name="META-INF/MANIFEST.MF"/>
+      </patternset>
     </unjar>
   </target>
   
@@ -48,7 +52,9 @@
       </manifest>
     </jar>
     <unjar src="mftest8.jar" dest="manifests">
-      <include name="META-INF/MANIFEST.MF"/>
+      <patternset>
+        <include name="META-INF/MANIFEST.MF"/>
+      </patternset>
     </unjar>
   </target>
 
@@ -108,7 +114,9 @@
       </manifest>
     </jar>
     <unjar src="mftest14.jar" dest="manifests">
-      <include name="META-INF/MANIFEST.MF"/>
+      <patternset>
+        <include name="META-INF/MANIFEST.MF"/>
+      </patternset>
     </unjar>
   </target>
 
@@ -124,7 +132,9 @@
       </manifest>
     </jar>
     <unjar src="mftestLongLine.jar" dest="manifests">
-      <include name="META-INF/MANIFEST.MF"/>
+      <patternset>
+        <include name="META-INF/MANIFEST.MF"/>
+      </patternset>
     </unjar>
   </target>
 
@@ -141,7 +151,9 @@
       </manifest>
     </jar>
     <unjar src="mftestOrder1.jar" dest="manifests">
-      <include name="META-INF/MANIFEST.MF"/>
+      <patternset>
+        <include name="META-INF/MANIFEST.MF"/>
+      </patternset>
     </unjar>
   </target>
 
@@ -158,7 +170,9 @@
       </manifest>
     </jar>
     <unjar src="mftestOrder2.jar" dest="manifests">
-      <include name="META-INF/MANIFEST.MF"/>
+      <patternset>
+        <include name="META-INF/MANIFEST.MF"/>
+      </patternset>
     </unjar>
   </target>
 
diff --git a/src/etc/testcases/taskdefs/optional/propertyfile.xml b/src/etc/testcases/taskdefs/optional/propertyfile.xml
index 75f1af3ee..c55478642 100644
--- a/src/etc/testcases/taskdefs/optional/propertyfile.xml
+++ b/src/etc/testcases/taskdefs/optional/propertyfile.xml
@@ -3,14 +3,14 @@
 <project name="propertyfile-test" default="main" basedir=".">
 
    <property file="propertyfile.build.properties"/>
-   
+
    <target name="main">
       <fail>
          This file is for testing purposes only...
          @see PropertyFileTest.java for more info.
       </fail>
    </target>
-   
+
    <target name="update-existing-properties">
       <propertyfile
           file="${test.propertyfile}"
@@ -22,9 +22,9 @@
         <entry  key="age"       default="${age}" type="int"/>
         <entry  key="date"      default="${date}" type="date"/>
       </propertyfile>
-      
+
    </target>
-   
+
    <target name="exercise">
      <propertyfile file="${test.propertyfile}">
         <entry key="existing.prop"
@@ -45,6 +45,10 @@
                default="2"
                operation="+"
                type="int"/>
+        <entry key="int.without.value"
+               default="5"
+               operation="+"
+               type="int"/>
         <entry key="int.without.default"
                value="1"
                operation="+"
diff --git a/src/etc/testcases/taskdefs/optional/xmlvalidate.xml b/src/etc/testcases/taskdefs/optional/xmlvalidate.xml
index 1c9125f83..31a761def 100644
--- a/src/etc/testcases/taskdefs/optional/xmlvalidate.xml
+++ b/src/etc/testcases/taskdefs/optional/xmlvalidate.xml
@@ -24,5 +24,19 @@
       </xmlcatalog>
     </xmlvalidate>
   </target>
+
+  <target name="xmlcatalognested">
+    <xmlvalidate warn="false">
+      <fileset dir="xml" includes="**/about.xml"/>
+      <xmlcatalog classpath="xml">
+	 <entity publicID = "bogusImage"
+                 location = "/i/dont/exist.jpg"/>
+        <xmlcatalog>
+          <dtd publicID="-//stevo//DTD doc 1.0//EN"
+               location="doc.dtd"/>
+        </xmlcatalog>
+      </xmlcatalog>
+    </xmlvalidate>
+  </target>
   
 </project>
diff --git a/src/etc/testcases/types/selectors.xml b/src/etc/testcases/types/selectors.xml
new file mode 100644
index 000000000..087babafa
--- /dev/null
+++ b/src/etc/testcases/types/selectors.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+
+<project name="selectors-test" basedir="." default="setupfiles">
+
+  <property name="etc.dir" value=".."/>
+  <property name="test.dir"
+          value="selectortest"/>
+
+  <target name="setupfiles">
+    <mkdir dir="${test.dir}" />
+    <mkdir dir="${test.dir}/zip" />
+    <mkdir dir="${test.dir}/tar" />
+    <mkdir dir="${test.dir}/tar/gz" />
+    <mkdir dir="${test.dir}/tar/bz2" />
+    <copy file="${etc.dir}/taskdefs/expected/asf-logo.gif.md5"
+            tofile="${test.dir}/asf-logo.gif.md5" />
+    <copy file="${etc.dir}/taskdefs/expected/asf-logo.gif.bz2"
+            tofile="${test.dir}/asf-logo.gif.bz2" />
+    <copy file="${etc.dir}/taskdefs/expected/asf-logo.gif.gz"
+            tofile="${test.dir}/asf-logo.gif.gz" />
+    <copy file="${etc.dir}/taskdefs/expected/copy.filterset.filtered"
+            tofile="${test.dir}/copy.filterset.filtered" />
+    <copy file="${etc.dir}/taskdefs/expected/asf-logo.gif.zip"
+            tofile="${test.dir}/zip/asf-logo.gif.zip" />
+    <copy file="${etc.dir}/taskdefs/expected/asf-logo.gif.tar"
+            tofile="${test.dir}/tar/asf-logo.gif.tar" />
+    <copy file="${etc.dir}/taskdefs/expected/asf-logo-huge.tar"
+            tofile="${test.dir}/tar/asf-logo-huge.tar" />
+    <copy file="${etc.dir}/taskdefs/expected/asf-logo.gif.tar.gz"
+            tofile="${test.dir}/tar/gz/asf-logo.gif.tar.gz" />
+    <copy file="${etc.dir}/taskdefs/expected/asf-logo.gif.tar.bz2"
+            tofile="${test.dir}/tar/bz2/asf-logo.gif.tar.bz2" />
+    <copy file="${etc.dir}/taskdefs/expected/asf-logo-huge.tar.bz2"
+            tofile="${test.dir}/tar/bz2/asf-logo-huge.tar.bz2" />
+    <!-- Make linefeeds consistent between platforms -->
+    <fixcrlf srcdir="${test.dir}" includes="*.filtered" eol="lf"/>
+    <!-- Set a known base time for all files -->
+    <touch datetime="11/21/2001 4:55 AM">
+        <fileset dir="${test.dir}">
+            <include name="**/*"/>
+        </fileset>
+    </touch>
+    <!-- Then adjust individual ones -->
+    <touch file="${test.dir}/asf-logo.gif.bz2"
+            datetime="01/01/2001 12:00 AM"/>
+    <touch file="${test.dir}/asf-logo.gif.gz"
+            datetime="04/15/2002 2:30 PM"/>
+    <touch file="${test.dir}/zip/asf-logo.gif.zip"
+            datetime="05/10/2002 2:30 PM"/>
+    <touch file="${test.dir}/tar/asf-logo.gif.tar"
+            datetime="05/10/2002 2:29 PM"/>
+    <touch file="${test.dir}/tar/asf-logo-huge.tar"
+            datetime="05/10/2002 2:29 AM"/>
+  </target>
+
+  <target name="cleanup">
+    <delete dir="${test.dir}" />
+  </target>
+
+</project>
diff --git a/src/main/org/apache/tools/ant/AntClassLoader.java b/src/main/org/apache/tools/ant/AntClassLoader.java
index 0ccaf32d9..ce9bdbf3c 100644
--- a/src/main/org/apache/tools/ant/AntClassLoader.java
+++ b/src/main/org/apache/tools/ant/AntClassLoader.java
@@ -391,7 +391,8 @@ public class AntClassLoader extends ClassLoader implements BuildListener {
         if (LoaderUtils.isContextLoaderAvailable()) {
             savedContextLoader = LoaderUtils.getContextClassLoader();
             ClassLoader loader = this;
-            if ("only".equals(project.getProperty("build.sysclasspath"))) {
+            if (project != null 
+                && "only".equals(project.getProperty("build.sysclasspath"))) {
                 loader = this.getClass().getClassLoader();
             }
             LoaderUtils.setContextClassLoader(loader);
@@ -1103,9 +1104,7 @@ public class AntClassLoader extends ClassLoader implements BuildListener {
      * Cleans up any resources held by this classloader. Any open archive
      * files are closed.
      */
-    public void cleanup() {
-        pathComponents = null;
-        project = null;
+    public synchronized void cleanup() {
         for (Enumeration e = zipFiles.elements(); e.hasMoreElements();) {
             ZipFile zipFile = (ZipFile)e.nextElement();
             try {
@@ -1132,6 +1131,8 @@ public class AntClassLoader extends ClassLoader implements BuildListener {
      * @param event the buildFinished event
      */
     public void buildFinished(BuildEvent event) {
+        project.removeBuildListener(this);
+        project = null;
         cleanup();
     }
 
diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java b/src/main/org/apache/tools/ant/DirectoryScanner.java
index 12b46560e..82134da78 100644
--- a/src/main/org/apache/tools/ant/DirectoryScanner.java
+++ b/src/main/org/apache/tools/ant/DirectoryScanner.java
@@ -55,12 +55,14 @@
 package org.apache.tools.ant;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.Vector;
 import java.util.StringTokenizer;
 
 import org.apache.tools.ant.types.selectors.SelectorScanner;
 import org.apache.tools.ant.types.selectors.FileSelector;
 import org.apache.tools.ant.types.selectors.SelectorUtils;
+import org.apache.tools.ant.util.FileUtils;
 
 /**
  * Class for scanning a directory for files/directories which match certain
@@ -229,6 +231,16 @@ public class DirectoryScanner implements FileScanner, SelectorScanner {
      */
     protected boolean isCaseSensitive = true;
 
+    /**
+     * Whether or not symbolic links should be followed.
+     *
+     * @since Ant 1.5
+     */
+    private boolean followSymlinks = true;
+
+    /** Helper. */
+    private static final FileUtils fileUtils = FileUtils.newFileUtils();
+
     /** Whether or not everything tested so far has been included. */
     protected boolean everythingIncluded = true;
 
@@ -410,6 +422,15 @@ public class DirectoryScanner implements FileScanner, SelectorScanner {
         this.isCaseSensitive = isCaseSensitive;
     }
 
+    /**
+     * Sets whether or not symbolic links should be followed.
+     *
+     * @param followSymlinks whether or not symbolic links should be followed
+     */
+    public void setFollowSymlinks(boolean followSymlinks) {
+        this.followSymlinks = followSymlinks;
+    }
+
     /**
      * Sets the list of include patterns to use. All '/' and '\' characters
      * are replaced by <code>File.separatorChar</code>, so the separator used
@@ -619,6 +640,33 @@ public class DirectoryScanner implements FileScanner, SelectorScanner {
                                      + dir.getAbsolutePath());
         }
 
+        if (!followSymlinks) {
+            Vector noLinks = new Vector();
+            for (int i = 0; i < newfiles.length; i++) {
+                try {
+                    if (fileUtils.isSymbolicLink(dir, newfiles[i])) {
+                        String name = vpath + newfiles[i];
+                        File   file = new File(dir, newfiles[i]);
+                        if (file.isDirectory()) {
+                            dirsExcluded.addElement(name);
+                        } else {
+                            filesExcluded.addElement(name);
+                        }
+                    } else {
+                        noLinks.addElement(newfiles[i]);
+                    }
+                } catch (IOException ioe) {
+                    String msg = "IOException caught while checking "
+                        + "for links, couldn't get cannonical path!";
+                    // will be caught and redirected to Ant's logging system
+                    System.err.println(msg);
+                    noLinks.addElement(newfiles[i]);
+                }
+            }
+            newfiles = new String[noLinks.size()];
+            noLinks.copyInto(newfiles);
+        }
+
         for (int i = 0; i < newfiles.length; i++) {
             String name = vpath + newfiles[i];
             File   file = new File(dir, newfiles[i]);
diff --git a/src/main/org/apache/tools/ant/Main.java b/src/main/org/apache/tools/ant/Main.java
index e637c3e6e..4d8c45b96 100644
--- a/src/main/org/apache/tools/ant/Main.java
+++ b/src/main/org/apache/tools/ant/Main.java
@@ -851,7 +851,11 @@ public class Main {
         }
 
         printTargets(topNames, topDescriptions, "Main targets:", maxLength);
-
+        //if there were no main targets, we list all subtargets
+        //as it means nothing has a description
+        if(topNames.size()==0) {
+            printSubTargets=true;
+        }
         if (printSubTargets) {
             printTargets(subNames, null, "Subtargets:", 0);
         }
diff --git a/src/main/org/apache/tools/ant/PathTokenizer.java b/src/main/org/apache/tools/ant/PathTokenizer.java
index d10f4ee43..e3892f180 100644
--- a/src/main/org/apache/tools/ant/PathTokenizer.java
+++ b/src/main/org/apache/tools/ant/PathTokenizer.java
@@ -165,7 +165,7 @@ public class PathTokenizer {
         } else {
             // we are on NetWare, tokenizing is handled a little differently,
             // due to the fact that NetWare has multiple-character volume names.
-            if (token.equals(File.pathSeparator)) {
+            if (token.equals(File.pathSeparator) || token.equals(":")) {
                 // ignore ";" and get the next token
                 token = tokenizer.nextToken().trim();
             }
@@ -184,6 +184,7 @@ public class PathTokenizer {
                                 token += ":" + oneMore;
                             } else {
                                 token += ":";
+                                lookahead = oneMore;
                             }
                         }
                         // implicit else: ignore the ':' since we have either a
diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java
index 85eb2b1c1..9e7f81443 100644
--- a/src/main/org/apache/tools/ant/Project.java
+++ b/src/main/org/apache/tools/ant/Project.java
@@ -151,7 +151,7 @@ public class Project {
     /** Description for this project (if any). */
     private String description;
 
-    /** Project properties map (String to String). */
+    /** Project properties map (usually String to String). */
     private Hashtable properties = new Hashtable();
     /**
      * Map of "user" properties (as created in the Ant task, for example).
@@ -1755,7 +1755,7 @@ public class Project {
     /**
      * Sends a "build started" event to the build listeners for this project.
      */
-    protected void fireBuildStarted() {
+    public void fireBuildStarted() {
         BuildEvent event = new BuildEvent(this);
         for (int i = 0; i < listeners.size(); i++) {
             BuildListener listener = (BuildListener) listeners.elementAt(i);
@@ -1769,7 +1769,7 @@ public class Project {
      *                  failure. May be <code>null</code>, indicating
      *                  a successful build.
      */
-    protected void fireBuildFinished(Throwable exception) {
+    public void fireBuildFinished(Throwable exception) {
         BuildEvent event = new BuildEvent(this);
         event.setException(exception);
         for (int i = 0; i < listeners.size(); i++) {
diff --git a/src/main/org/apache/tools/ant/ProjectHelper.java b/src/main/org/apache/tools/ant/ProjectHelper.java
index 0ec30cc3c..f1b7e5552 100644
--- a/src/main/org/apache/tools/ant/ProjectHelper.java
+++ b/src/main/org/apache/tools/ant/ProjectHelper.java
@@ -76,7 +76,7 @@ import org.apache.tools.ant.util.LoaderUtils;
  *
  * All helper plugins must provide backward compatiblity with the
  * original ant patterns, unless a different behavior is explicitely
- * specified. For example, if namespace is used on the <project> tag
+ * specified. For example, if namespace is used on the &lt;project&gt; tag
  * the helper can expect the entire build file to be namespace-enabled.
  * Namespaces or helper-specific tags can provide meta-information to
  * the helper, allowing it to use new ( or different policies ).
diff --git a/src/main/org/apache/tools/ant/Task.java b/src/main/org/apache/tools/ant/Task.java
index 3bb8024f7..edc2df412 100644
--- a/src/main/org/apache/tools/ant/Task.java
+++ b/src/main/org/apache/tools/ant/Task.java
@@ -226,13 +226,17 @@ public abstract class Task extends ProjectComponent {
 
     /**
      * Sets the wrapper to be used for runtime configuration.
+     *
+     * This method should be used only by the ProjectHelper and ant internals.
+     * It is public to allow helper plugins to operate on tasks, normal tasks
+     * should never use it.
      * 
      * @param wrapper The wrapper to be used for runtime configuration.
      *                May be <code>null</code>, in which case the next call
      *                to getRuntimeConfigurableWrapper will generate a new
      *                wrapper.
      */
-    protected void setRuntimeConfigurableWrapper(RuntimeConfigurable wrapper) {
+    public void setRuntimeConfigurableWrapper(RuntimeConfigurable wrapper) {
         this.wrapper = wrapper;
     }
 
diff --git a/src/main/org/apache/tools/ant/filters/LineContains.java b/src/main/org/apache/tools/ant/filters/LineContains.java
index f4246ca09..9d2d86d8d 100644
--- a/src/main/org/apache/tools/ant/filters/LineContains.java
+++ b/src/main/org/apache/tools/ant/filters/LineContains.java
@@ -77,7 +77,7 @@ import org.apache.tools.ant.types.Parameter;
  *    &lt;param type="contains" value="bar"/&gt;
  * &lt;/filterreader&gt;</pre>
  *
- * This will include only those lines that contain <code>foo</code> and 
+ * This will include only those lines that contain <code>foo</code> and
  * <code>bar</code>.
  *
  * @author <a href="mailto:umagesh@apache.org">Magesh Umasankar</a>
@@ -91,7 +91,7 @@ public final class LineContains
     /** Vector that holds the strings that input lines must contain. */
     private Vector contains = new Vector();
 
-    /** 
+    /**
      * Remaining line to be read from this filter, or <code>null</code> if
      * the next call to <code>read()</code> should read the original stream
      * to find the next matching line.
@@ -100,7 +100,7 @@ public final class LineContains
 
     /**
      * Constructor for "dummy" instances.
-     * 
+     *
      * @see BaseFilterReader#BaseFilterReader()
      */
     public LineContains() {
@@ -120,12 +120,12 @@ public final class LineContains
     /**
      * Returns the next character in the filtered stream, only including
      * lines from the original stream which contain all of the specified words.
-     * 
+     *
      * @return the next character in the resulting stream, or -1
      * if the end of the resulting stream has been reached
-     * 
+     *
      * @exception IOException if the underlying stream throws an IOException
-     * during reading     
+     * during reading
      */
     public final int read() throws IOException {
         if (!getInitialized()) {
@@ -143,21 +143,24 @@ public final class LineContains
                 line = line.substring(1);
             }
         } else {
+            String goodLine = null;
             line = readLine();
-            if (line == null) {
-                ch = -1;
-            } else {
+            while((line != null) && (goodLine == null)) {
+                goodLine = line;
                 int containsSize = contains.size();
                 for (int i = 0; i < containsSize; i++) {
                     String containsStr = (String) contains.elementAt(i);
                     if (line.indexOf(containsStr) == -1) {
-                        line = null;
+                        goodLine = null;
                         break;
                     }
                 }
-
-                return read();
+                line = readLine();
             }
+            if (goodLine != null) {
+                line = goodLine;
+                return read();
+            };
         }
 
         return ch;
@@ -165,8 +168,8 @@ public final class LineContains
 
     /**
      * Adds a <code>contains</code> element.
-     * 
-     * @param contains The <code>contains</code> element to add. 
+     *
+     * @param contains The <code>contains</code> element to add.
      *                 Must not be <code>null</code>.
      */
     public final void addConfiguredContains(final Contains contains) {
@@ -176,7 +179,7 @@ public final class LineContains
     /**
      * Sets the vector of words which must be contained within a line read
      * from the original stream in order for it to match this filter.
-     * 
+     *
      * @param contains A vector of words which must be contained within a line
      * in order for it to match in this filter. Must not be <code>null</code>.
      */
@@ -187,7 +190,7 @@ public final class LineContains
     /**
      * Returns the vector of words which must be contained within a line read
      * from the original stream in order for it to match this filter.
-     * 
+     *
      * @return the vector of words which must be contained within a line read
      * from the original stream in order for it to match this filter. The
      * returned object is "live" - in other words, changes made to the
@@ -200,10 +203,10 @@ public final class LineContains
     /**
      * Creates a new LineContains using the passed in
      * Reader for instantiation.
-     * 
+     *
      * @param rdr A Reader object providing the underlying stream.
      *            Must not be <code>null</code>.
-     * 
+     *
      * @return a new filter based on this configuration, but filtering
      *         the specified reader
      */
@@ -238,8 +241,8 @@ public final class LineContains
 
         /**
          * Sets the contains string
-         * 
-         * @param contains The contains string to set. 
+         *
+         * @param contains The contains string to set.
          *                 Must not be <code>null</code>.
          */
         public final void setValue(String contains) {
@@ -248,7 +251,7 @@ public final class LineContains
 
         /**
          * Returns the contains string.
-         * 
+         *
          * @return the contains string for this element
          */
         public final String getValue() {
diff --git a/src/main/org/apache/tools/ant/filters/ReplaceTokens.java b/src/main/org/apache/tools/ant/filters/ReplaceTokens.java
index 19aa14d36..bd0f8b4b5 100644
--- a/src/main/org/apache/tools/ant/filters/ReplaceTokens.java
+++ b/src/main/org/apache/tools/ant/filters/ReplaceTokens.java
@@ -60,7 +60,7 @@ import java.util.Hashtable;
 import org.apache.tools.ant.types.Parameter;
 
 /**
- * Replaces tokens in the original input with user-supplied values
+ * Replaces tokens in the original input with user-supplied values.
  *
  * Example:
  *
diff --git a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
index 73915ca41..80e5d155a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
@@ -276,17 +276,16 @@ public abstract class AbstractCvsTask extends Task {
          * Need a better cross platform integration with <cvspass>, so
          * use the same filename.
          */
-        /* But currently we cannot because 'cvs log' is not working
-         * with a pass file.
-        if(passFile == null){
+        if(passFile == null) {
 
-            File defaultPassFile = new File(System.getProperty("user.home") 
+            File defaultPassFile = new File(
+                System.getProperty("cygwin.user.home",
+                    System.getProperty("user.home")) 
                 + File.separatorChar + ".cvspass");
 
             if(defaultPassFile.exists())
                 this.setPassfile(defaultPassFile);
         }
-         */
 
         if (passFile != null) {
             Environment.Variable var = new Environment.Variable();
@@ -315,6 +314,10 @@ public abstract class AbstractCvsTask extends Task {
             dest = project.getBaseDir();
         }
 
+        if (!dest.exists()) {
+            dest.mkdirs();
+        }
+
         exe.setWorkingDirectory(dest);
         exe.setCommandline(toExecute.getCommandline());
         exe.setEnvironment(env.getVariables());
diff --git a/src/main/org/apache/tools/ant/taskdefs/Ant.java b/src/main/org/apache/tools/ant/taskdefs/Ant.java
index 8cb591321..2ed50c4bb 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Ant.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Ant.java
@@ -99,9 +99,9 @@ public class Ant extends Task {
     /** the basedir where is executed the build file */
     private File dir = null;
 
-    /** 
+    /**
      * the build.xml file (can be absolute) in this case dir will be
-     * ignored 
+     * ignored
      */
     private String antFile = null;
 
@@ -184,12 +184,18 @@ public class Ant extends Task {
             if (p.getResource() != null) {
                 newP.setResource(p.getResource());
             }
+            if (p.getPrefix() != null) {
+                newP.setPrefix(p.getPrefix());
+            }
             if (p.getRefid() != null) {
                 newP.setRefid(p.getRefid());
             }
             if (p.getEnvironment() != null) {
                 newP.setEnvironment(p.getEnvironment());
             }
+            if (p.getClasspath() != null) {
+                newP.setClasspath(p.getClasspath());
+            }
             properties.setElementAt(newP, i);
         }
     }
@@ -274,7 +280,6 @@ public class Ant extends Task {
                     // basedir and ant.file get special treatment in execute()
                     continue;
                 }
-
                 String value = props.get(arg).toString();
                 if (newProject.getProperty(arg) == null){
                     // no user property
@@ -362,7 +367,7 @@ public class Ant extends Task {
                 getOwningTarget() != null &&
                 target.equals(this.getOwningTarget().getName())) {
 
-                throw new BuildException("ant task calling its own parent " 
+                throw new BuildException("ant task calling its own parent "
                     + "target");
             }
 
@@ -527,7 +532,7 @@ public class Ant extends Task {
         if (newProject == null) {
             reinit();
         }
-        Property p = new Property(true);
+        Property p = new Property(true, getProject());
         p.setProject(newProject);
         p.setTaskName("property");
         properties.addElement(p);
@@ -560,10 +565,10 @@ public class Ant extends Task {
          * Set the id that this reference to be stored under in the
          * new project.
          *
-         * @param targetid the id under which this reference will be passed to 
-         *        the new project */ 
+         * @param targetid the id under which this reference will be passed to
+         *        the new project */
         public void setToRefid(String targetid) {
-            this.targetid = targetid; 
+            this.targetid = targetid;
         }
 
         /**
@@ -572,8 +577,8 @@ public class Ant extends Task {
          *
          * @return the id of the reference in the new project.
          */
-        public String getToRefid() { 
-            return targetid; 
+        public String getToRefid() {
+            return targetid;
         }
     }
 }
diff --git a/src/main/org/apache/tools/ant/taskdefs/Available.java b/src/main/org/apache/tools/ant/taskdefs/Available.java
index f2ad26667..eba93cd49 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Available.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Available.java
@@ -185,8 +185,9 @@ public class Available extends Task implements Condition {
      *
      * @param file the name of the file which is required.
      */
-    public void setFile(String file) {
-        this.file = file;
+    public void setFile(File f) {
+        this.file = FileUtils.newFileUtils()
+            .removeLeadingPath(getProject().getBaseDir(), f);
     }
 
     /**
@@ -464,19 +465,20 @@ public class Available extends Task implements Condition {
         try {
             Class requiredClass = null;
             if (ignoreSystemclasses) {
-                loader = new AntClassLoader(null, getProject(), 
-                    classpath, false);
+                loader = new AntClassLoader(null, getProject(), classpath, 
+                                            false);
                 if (loader != null) {
                     try {
-                        loader.findClass(classname);
+                        requiredClass = loader.findClass(classname);
                     } catch (SecurityException se) {
-                        // class found but restricted name; this is actually
-                        // the case we're looking for, so catch the exception
-                        // and return
+                        // class found but restricted name; this is
+                        // actually the case we're looking for in JDK 1.3+,
+                        // so catch the exception and return
                         return true;
                     }
+                } else {
+                    return false;
                 }
-                return false;
             } else if (loader != null) {
                 requiredClass = loader.loadClass(classname);
             } else {
diff --git a/src/main/org/apache/tools/ant/taskdefs/CVSPass.java b/src/main/org/apache/tools/ant/taskdefs/CVSPass.java
index 11ea5c6f7..2669c621c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/CVSPass.java
+++ b/src/main/org/apache/tools/ant/taskdefs/CVSPass.java
@@ -110,7 +110,10 @@ public class CVSPass extends Task {
      * Create a CVS task using the default cvspass file location.
      */
     public CVSPass(){
-        passFile = new File(System.getProperty("user.home") + "/.cvspass");
+        passFile = new File(
+            System.getProperty("cygwin.user.home",
+                System.getProperty("user.home"))
+            + File.separatorChar + ".cvspass");
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java b/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java
index 8cc405009..7cff3670a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java
@@ -55,6 +55,7 @@
 package org.apache.tools.ant.taskdefs;
 
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.condition.Condition;
 import org.apache.tools.ant.taskdefs.condition.ConditionBase;
 
@@ -114,7 +115,12 @@ public class ConditionTask extends ConditionBase {
         
         Condition c = (Condition) getConditions().nextElement();
         if (c.eval()) {
+            log("Condition true; setting "+property+" to "+value,
+                Project.MSG_DEBUG);
             getProject().setNewProperty(property, value);
+        } else {
+            log("Condition false; not setting "+property,
+                Project.MSG_DEBUG);
         }
     }
 }
diff --git a/src/main/org/apache/tools/ant/taskdefs/Definer.java b/src/main/org/apache/tools/ant/taskdefs/Definer.java
index a4d312b68..e4b37630f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Definer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Definer.java
@@ -84,7 +84,11 @@ public abstract class Definer extends Task {
     private File file;
     private String resource;
     private boolean reverseLoader = false;
-
+    private String loaderId = null;
+    private String classpathId = null;
+    
+    private static final String REUSE_LOADER_REF = "ant.reuse.loader";
+    
     public void setReverseLoader(boolean reverseLoader) {
         this.reverseLoader = reverseLoader;
         log("The reverseloader attribute is DEPRECATED. It will be removed", 
@@ -112,9 +116,26 @@ public abstract class Definer extends Task {
     }
 
     public void setClasspathRef(Reference r) {
+        classpathId=r.getRefId();
         createClasspath().setRefid(r);
     }
 
+    /**
+     * Use the reference to locate the loader. If the loader is not
+     * found, taskdef will use the specified classpath and register it
+     * with the specified name.
+     *     
+     * This allow multiple taskdef/typedef to use the same class loader,
+     * so they can be used togheter. It eliminate the need to
+     * put them in the CLASSPATH.
+     *
+     * @since Ant 1.5
+     */
+    public void setLoaderRef(Reference r) {
+        loaderId = r.getRefId();
+    }
+
+    
     public void execute() throws BuildException {
         AntClassLoader al = createLoader();
 
@@ -205,8 +226,32 @@ public abstract class Definer extends Task {
         }
     }
 
-
     private AntClassLoader createLoader() {
+        // magic property 
+        if (project.getProperty(REUSE_LOADER_REF) != null) {
+            // Generate the 'reuse' name automatically from the reference.
+            // This allows <taskdefs> that work on both ant1.4 and ant1.5.
+            // ( in 1.4 it'll require the task/type to be in classpath if they
+            //   are used togheter ).
+            if (loaderId == null && classpathId != null) {
+                loaderId = "ant.loader." + classpathId;
+            }
+        }
+        
+        // If a loader has been set ( either by loaderRef or magic property )
+        if (loaderId != null) {
+            Object reusedLoader = project.getReference(loaderId);
+            if (reusedLoader != null) {
+                if (reusedLoader instanceof AntClassLoader) {
+                    return (AntClassLoader)reusedLoader;
+                }
+                // In future the reference object may be the <loader> type
+                // if( reusedLoader instanceof Loader ) {
+                //      return ((Loader)reusedLoader).getLoader(project);
+                // }
+            }
+        }
+       
         AntClassLoader al = null;
         if (classpath != null) {
             al = new AntClassLoader(project, classpath, !reverseLoader);
@@ -218,6 +263,16 @@ public abstract class Definer extends Task {
         // task we want to define will never be a Task but always
         // be wrapped into a TaskAdapter.
         al.addSystemPackageRoot("org.apache.tools.ant");
+
+
+        // If the loader is new, record it for future uses by other
+        // task/typedefs
+        if (loaderId != null) {
+            if (project.getReference(loaderId) == null) {
+                project.addReference(loaderId, al);
+            }
+        }
+
         return al;
     }
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/DependSet.java b/src/main/org/apache/tools/ant/taskdefs/DependSet.java
index 873c6db65..ed3cc1e1b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/DependSet.java
+++ b/src/main/org/apache/tools/ant/taskdefs/DependSet.java
@@ -190,6 +190,11 @@ public class DependSet extends MatchingTask {
         while (enumTargetSets.hasMoreElements()) {
                  
            FileSet targetFS          = (FileSet) enumTargetSets.nextElement();
+           if (!targetFS.getDir(getProject()).exists()) {
+               // this is the same as if it was empty, no target files found
+               continue;
+           }
+           
            DirectoryScanner targetDS = targetFS.getDirectoryScanner(project);
            String[] targetFiles      = targetDS.getIncludedFiles();
                  
diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecTask.java b/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
index fb0170bbd..f45042c49 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
@@ -342,7 +342,7 @@ public class ExecTask extends Task {
         }
         if (baos != null) {
             BufferedReader in =
-                new BufferedReader(new StringReader(baos.toString()));
+                new BufferedReader(new StringReader(Execute.toString(baos)));
             String line = null;
             StringBuffer val = new StringBuffer();
             while ((line = in.readLine()) != null) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/Execute.java b/src/main/org/apache/tools/ant/taskdefs/Execute.java
index 847d6bdb4..48d1d8338 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Execute.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Execute.java
@@ -182,8 +182,9 @@ public class Execute {
                 // Just try to use what we got
             }
 
-            BufferedReader in =
-                new BufferedReader(new StringReader(out.toString()));
+            BufferedReader in = 
+                new BufferedReader(new StringReader(toString(out)));
+                
             String var = null;
             String line, lineSep = System.getProperty("line.separator");
             while ((line = in.readLine()) != null) {
@@ -231,6 +232,9 @@ public class Execute {
                 String[] cmd = {"command.com", "/c", "set" };
                 return cmd;
             }
+        } else if (Os.isFamily("z/os")) {
+            String[] cmd = {"/bin/env"};
+            return cmd;
         } else if (Os.isFamily("unix")) {
             // Generic UNIX
             // Alternatively one could use: /bin/sh -c env
@@ -247,6 +251,23 @@ public class Execute {
         }
     }
 
+    /**
+     * ByteArrayOutputStream#toString doesn't seem to work reliably on
+     * OS/390, at least not the way we use it in the execution
+     * context.
+     *
+     * @since Ant 1.5
+     */
+    public static String toString(ByteArrayOutputStream bos) {
+        if (Os.isFamily("z/os")) {
+            try {
+                bos.toString("Cp1047");
+            } catch (java.io.UnsupportedEncodingException e) {
+            }
+        }
+        return bos.toString();
+    }
+
     /**
      * Creates a new execute object using <code>PumpStreamHandler</code> for
      * stream handling.
@@ -325,7 +346,7 @@ public class Execute {
     /**
      * Sets the environment variables for the subprocess to launch.
      *
-     * @param commandline array of Strings, each element of which has
+     * @param env array of Strings, each element of which has
      * an environment variable settings in format <em>key=value</em>
      */
     public void setEnvironment(String[] env) {
@@ -365,7 +386,7 @@ public class Execute {
      * allow the shell to perform additional processing such as associating an
      * executable with a script, etc
      *
-     * @param vmLauncher true if exec should launch through thge VM,
+     * @param useVMLauncher true if exec should launch through thge VM,
      *                   false if the shell should be used to launch the 
      *                   command.
      */
@@ -379,7 +400,7 @@ public class Execute {
      * @param project the Project, only used for logging purposes, may be null.
      * @param command the command to run
      * @param env the environment for the command
-     * @param the working directory for the command
+     * @param dir the working directory for the command
      * @param useVM use the built-in exec command for JDK 1.3 if available.
      *
      * @since Ant 1.5
@@ -400,7 +421,7 @@ public class Execute {
      * Runs a process defined by the command line and returns its exit status.
      *
      * @return the exit status of the subprocess or <code>INVALID</code>
-     * @exception java.io.IOExcpetion The exception is thrown, if launching
+     * @exception java.io.IOException The exception is thrown, if launching
      *            of the subprocess failed
      */
     public int execute() throws IOException {
diff --git a/src/main/org/apache/tools/ant/taskdefs/Expand.java b/src/main/org/apache/tools/ant/taskdefs/Expand.java
index a4b8405e7..5c32b7a36 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Expand.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Expand.java
@@ -57,6 +57,7 @@ package org.apache.tools.ant.taskdefs;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.PatternSet;
 import org.apache.tools.ant.util.FileUtils;
@@ -85,7 +86,7 @@ import java.util.zip.ZipEntry;
  *           name="unjar"
  *           name="unwar"
  */
-public class Expand extends MatchingTask {
+public class Expand extends Task {
     private File dest; //req
     private File source; // req
     private boolean overwrite = true;
@@ -298,4 +299,5 @@ public class Expand extends MatchingTask {
     public void addFileset(FileSet set) {
         filesets.addElement(set);
     }
+
 }
diff --git a/src/main/org/apache/tools/ant/taskdefs/Get.java b/src/main/org/apache/tools/ant/taskdefs/Get.java
index 586cb3237..f4880c2c6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Get.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Get.java
@@ -64,6 +64,7 @@ import java.net.HttpURLConnection;
 import java.util.Date;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
+import org.apache.tools.ant.Project;
 import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.JavaEnvUtils;
 
@@ -176,8 +177,13 @@ public class Get extends Task {
                 // test for 401 result (HTTP only)
                 if (httpConnection.getResponseCode()
                     == HttpURLConnection.HTTP_UNAUTHORIZED)  {
-                    log("Not authorized - check " + dest + " for details");
-                    return;
+                    String message="HTTP Authorization failure";
+                    if(ignoreErrors) {
+                        log(message,Project.MSG_WARN);
+                        return;
+                    } else {
+                        throw new BuildException(message);
+                    }
                 }
 
             }
diff --git a/src/main/org/apache/tools/ant/taskdefs/Jar.java b/src/main/org/apache/tools/ant/taskdefs/Jar.java
index b887eb7c1..55b94a78c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Jar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Jar.java
@@ -78,7 +78,7 @@ import java.util.Enumeration;
  * Creates a JAR archive.
  *
  * @author James Davidson <a href="mailto:duncan@x180.com">duncan@x180.com</a>
- * @author Brian Deitte 
+ * @author Brian Deitte
  *         <a href="mailto:bdeitte@macromedia.com">bdeitte@macromedia.com</a>
  *
  * @since Ant 1.1
@@ -101,7 +101,12 @@ public class Jar extends Zip {
      *  whether to merge fileset manifests;
      *  value is true if filesetmanifest is 'merge' or 'mergewithoutmain'
      */
-    private boolean mergeManifests = false;
+    private FilesetManifestConfig filesetManifestConfig;
+
+    /**
+     *  Whether to create manifest file on finalizeOutputStream?
+     */
+    private boolean manifestOnFinalize = true;
 
     /**
      * whether to merge the main section of fileset manifests;
@@ -151,7 +156,7 @@ public class Jar extends Zip {
         index = flag;
     }
 
-    public void addConfiguredManifest(Manifest newManifest) 
+    public void addConfiguredManifest(Manifest newManifest)
         throws ManifestException {
         if (configuredManifest == null) {
             configuredManifest = newManifest;
@@ -178,8 +183,8 @@ public class Jar extends Zip {
             r = new FileReader(manifestFile);
             newManifest = getManifest(r);
         } catch (IOException e) {
-            throw new BuildException("Unable to read manifest file: " 
-                                     + manifestFile 
+            throw new BuildException("Unable to read manifest file: "
+                                     + manifestFile
                                      + " (" + e.getMessage() + ")", e);
         } finally {
             if (r != null) {
@@ -200,7 +205,7 @@ public class Jar extends Zip {
             newManifest = new Manifest(r);
         } catch (ManifestException e) {
             log("Manifest is invalid: " + e.getMessage(), Project.MSG_ERR);
-            throw new BuildException("Invalid Manifest: " + manifestFile, 
+            throw new BuildException("Invalid Manifest: " + manifestFile,
                                      e, getLocation());
         } catch (IOException e) {
             throw new BuildException("Unable to read manifest file"
@@ -210,9 +215,8 @@ public class Jar extends Zip {
     }
 
     public void setFilesetmanifest(FilesetManifestConfig config) {
-        String filesetManifestConfig = config.getValue();
-        mergeManifests = !("skip".equals(filesetManifestConfig));
-        mergeManifestsMain = "merge".equals(filesetManifestConfig);
+        filesetManifestConfig = config;
+        mergeManifestsMain = "merge".equals(config.getValue());
     }
 
     public void addMetainf(ZipFileSet fs) {
@@ -223,8 +227,16 @@ public class Jar extends Zip {
 
     protected void initZipOutputStream(ZipOutputStream zOut)
         throws IOException, BuildException {
-        String ls = System.getProperty("line.separator");
+        if (filesetManifestConfig == null
+            || filesetManifestConfig.getValue().equals("skip")) {
+            manifestOnFinalize = false;
+            createManifest(zOut);
+        }
+    }
 
+    private void createManifest(ZipOutputStream zOut)
+        throws IOException, BuildException {
+        String ls = System.getProperty("line.separator");
         try {
             Manifest finalManifest = Manifest.getDefaultManifest();
 
@@ -239,7 +251,7 @@ public class Jar extends Zip {
                 } else if (configuredManifest != null) {
                     // configuredManifest is the final merge
                     finalManifest.merge(filesetManifest);
-                    finalManifest.merge(configuredManifest, 
+                    finalManifest.merge(configuredManifest,
                                         !mergeManifestsMain);
                 } else if (filesetManifest != null) {
                     // filesetManifest is the final (and only) merge
@@ -252,9 +264,9 @@ public class Jar extends Zip {
                 finalManifest.merge(manifest, !mergeManifestsMain);
             }
 
-            for (Enumeration e = finalManifest.getWarnings(); 
+            for (Enumeration e = finalManifest.getWarnings();
                  e.hasMoreElements();) {
-                log("Manifest warning: " + (String) e.nextElement(), 
+                log("Manifest warning: " + (String) e.nextElement(),
                     Project.MSG_WARN);
             }
 
@@ -269,9 +281,9 @@ public class Jar extends Zip {
             finalManifest.write(writer);
             writer.flush();
 
-            ByteArrayInputStream bais = 
+            ByteArrayInputStream bais =
                 new ByteArrayInputStream(baos.toByteArray());
-            super.zipFile(bais, zOut, "META-INF/MANIFEST.MF", 
+            super.zipFile(bais, zOut, "META-INF/MANIFEST.MF",
                           System.currentTimeMillis(), null);
             super.initZipOutputStream(zOut);
         } catch (ManifestException e) {
@@ -284,6 +296,10 @@ public class Jar extends Zip {
 
     protected void finalizeZipOutputStream(ZipOutputStream zOut)
             throws IOException, BuildException {
+        if (manifestOnFinalize) {
+            createManifest(zOut);
+        }
+
         if (index) {
             createIndexList(zOut);
         }
@@ -302,7 +318,7 @@ public class Jar extends Zip {
     private void createIndexList(ZipOutputStream zOut) throws IOException {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         // encoding must be UTF8 as specified in the specs.
-        PrintWriter writer = new PrintWriter(new OutputStreamWriter(baos, 
+        PrintWriter writer = new PrintWriter(new OutputStreamWriter(baos,
                                                                     "UTF8"));
 
         // version-info blankline
@@ -338,7 +354,7 @@ public class Jar extends Zip {
         }
 
         writer.flush();
-        ByteArrayInputStream bais = 
+        ByteArrayInputStream bais =
             new ByteArrayInputStream(baos.toByteArray());
         super.zipFile(bais, zOut, INDEX_NAME, System.currentTimeMillis(), null);
     }
@@ -378,9 +394,10 @@ public class Jar extends Zip {
             } else {
                 manifest = getManifest(file);
             }
-        } else if (mergeManifests) {
+        } else if (filesetManifestConfig != null && 
+                   !filesetManifestConfig.getValue().equals("skip")) {
             // we add this to our group of fileset manifests
-            log("Found manifest to merge in file " + file, 
+            log("Found manifest to merge in file " + file,
                 Project.MSG_VERBOSE);
 
             try {
@@ -391,16 +408,20 @@ public class Jar extends Zip {
                     filesetManifest.merge(newManifest);
                 }
             } catch (ManifestException e) {
-                log("Manifest in file " + file + " is invalid: " 
+                log("Manifest in file " + file + " is invalid: "
                     + e.getMessage(), Project.MSG_ERR);
                 throw new BuildException("Invalid Manifest", e, getLocation());
             }
         } else {
             // assuming 'skip' otherwise
-            log("File " + file 
-                + " includes a META-INF/MANIFEST.MF which will be ignored. " 
+            // don't warn if skip has been requested explicitly, warn if user
+            // didn't set the attribute
+            int logLevel = filesetManifestConfig == null ?
+                Project.MSG_WARN : Project.MSG_VERBOSE;
+            log("File " + file
+                + " includes a META-INF/MANIFEST.MF which will be ignored. "
                 + "To include this file, set filesetManifest to a value other "
-                + "than 'skip'.", Project.MSG_WARN);
+                + "than 'skip'.", logLevel);
         }
     }
 
@@ -412,34 +433,34 @@ public class Jar extends Zip {
      *         already); false if archive creation should proceed
      * @exception BuildException if it likes
      */
-    protected boolean isUpToDate(FileScanner[] scanners, File zipFile) 
+    protected boolean isUpToDate(FileScanner[] scanners, File zipFile)
         throws BuildException {
         // need to handle manifest as a special check
         if (configuredManifest != null || manifestFile == null) {
             java.util.zip.ZipFile theZipFile = null;
             try {
                 theZipFile = new java.util.zip.ZipFile(zipFile);
-                java.util.zip.ZipEntry entry = 
+                java.util.zip.ZipEntry entry =
                     theZipFile.getEntry("META-INF/MANIFEST.MF");
                 if (entry == null) {
-                    log("Updating jar since the current jar has no manifest", 
+                    log("Updating jar since the current jar has no manifest",
                         Project.MSG_VERBOSE);
                     return false;
                 }
-                Manifest currentManifest = 
+                Manifest currentManifest =
                     new Manifest(new InputStreamReader(theZipFile
                                                        .getInputStream(entry)));
                 if (configuredManifest == null) {
                     configuredManifest = Manifest.getDefaultManifest();
                 }
                 if (!currentManifest.equals(configuredManifest)) {
-                    log("Updating jar since jar manifest has changed", 
+                    log("Updating jar since jar manifest has changed",
                         Project.MSG_VERBOSE);
                     return false;
                 }
             } catch (Exception e) {
                 // any problems and we will rebuild
-                log("Updating jar since cannot read current jar manifest: " 
+                log("Updating jar since cannot read current jar manifest: "
                     + e.getClass().getName() + " - " + e.getMessage(),
                     Project.MSG_VERBOSE);
                 return false;
@@ -487,7 +508,7 @@ public class Jar extends Zip {
     public void reset() {
         super.reset();
         configuredManifest = null;
-        mergeManifests = false;
+        filesetManifestConfig = null;
         mergeManifestsMain = false;
         manifestFile = null;
         index = false;
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
index 499c56cf3..548cd9ced 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -58,6 +58,8 @@ import java.io.PrintWriter;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.FilenameFilter;
+import java.net.URL;
+import java.net.MalformedURLException;
 import java.util.Locale;
 import java.util.Vector;
 import java.util.Enumeration;
@@ -710,6 +712,7 @@ public class Javadoc extends Task {
     public void setDoclet(String docletName) {
         if (doclet == null) {
             doclet = new DocletInfo();
+            doclet.setProject(getProject());
         }
         doclet.setName(docletName);
     }
@@ -722,6 +725,7 @@ public class Javadoc extends Task {
     public void setDocletPath(Path docletPath) {
         if (doclet == null) {
             doclet = new DocletInfo();
+            doclet.setProject(getProject());
         }
         doclet.setPath(docletPath);
     }
@@ -735,6 +739,7 @@ public class Javadoc extends Task {
     public void setDocletPathRef(Reference r) {
         if (doclet == null) {
             doclet = new DocletInfo();
+            doclet.setProject(getProject());
         }
         doclet.createPath().setRefid(r);
     }
@@ -1423,7 +1428,6 @@ public class Javadoc extends Task {
      * @since 1.5
      */
     public void addFileset(FileSet fs) {
-        fs.createInclude().setName("**/*.java");
         fileSets.addElement(fs);
     }
 
@@ -1434,6 +1438,11 @@ public class Javadoc extends Task {
 
         Vector packagesToDoc = new Vector();
         Path sourceDirs = new Path(getProject());
+
+        if (sourcePath != null) {
+            sourceDirs.addExisting(sourcePath);
+        }
+        
         parsePackages(packagesToDoc, sourceDirs);
 
         if (packagesToDoc.size() != 0 && sourceDirs.size() == 0) {
@@ -1550,21 +1559,32 @@ public class Javadoc extends Task {
                 for (Enumeration e = links.elements(); e.hasMoreElements();) {
                     LinkArgument la = (LinkArgument) e.nextElement();
 
-                    if (la.getHref() == null) {
-                        throw new BuildException("Links must provide the URL "
-                                                 + "to the external class "
-                                                 + "documentation.");
-                    }
+                    if (la.getHref() == null || la.getHref().length() == 0) {
+                        log("No href was given for the link - skipping", 
+                            Project.MSG_VERBOSE);
+                        continue;
+                    } else {
+                        // is the href a valid URL
+                        try {
+                            URL base = new URL("file://.");
+                            URL testHref = new URL(base, la.getHref());
+                        } catch (MalformedURLException mue) {
+                            // ok - just skip
+                            log("Link href \"" + la.getHref() 
+                                + "\" is not a valid url - skipping link", 
+                                Project.MSG_WARN);
+                            continue;
+                        }
+                    }                                
+                        
 
                     if (la.isLinkOffline()) {
                         File packageListLocation = la.getPackagelistLoc();
                         if (packageListLocation == null) {
                             throw new BuildException("The package list "
-                                                     + " location for link " 
-                                                     + la.getHref()
-                                                     + " must be provided "
-                                                     + "because the link is "
-                                                     + "offline");
+                                + " location for link " + la.getHref()
+                                + " must be provided because the link is "
+                                + "offline");
                         }
                         File packageList = 
                             new File(packageListLocation, "package-list");
@@ -1769,6 +1789,10 @@ public class Javadoc extends Task {
         Enumeration enum = fileSets.elements();
         while (enum.hasMoreElements()) {
             FileSet fs = (FileSet) enum.nextElement();
+            if (!fs.hasPatterns() && !fs.hasSelectors()) {
+                fs = (FileSet) fs.clone();
+                fs.createInclude().setName("**/*.java");
+            }
             File baseDir = fs.getDir(getProject());
             DirectoryScanner ds = fs.getDirectoryScanner(getProject());
             String[] files = ds.getIncludedFiles();
@@ -1858,6 +1882,8 @@ public class Javadoc extends Task {
                 }
             }
             if (containsPackages) {
+                // We don't need to care for duplicates here,
+                // Path.list does it for us.
                 sp.createPathElement().setLocation(baseDir);
             } else {
                 log(baseDir + " doesn\'t contain any packages, dropping it.",
diff --git a/src/main/org/apache/tools/ant/taskdefs/LoadFile.java b/src/main/org/apache/tools/ant/taskdefs/LoadFile.java
index 05435e2c3..da3bdf914 100644
--- a/src/main/org/apache/tools/ant/taskdefs/LoadFile.java
+++ b/src/main/org/apache/tools/ant/taskdefs/LoadFile.java
@@ -182,20 +182,25 @@ public final class LoadFile extends Task {
                 instream = new InputStreamReader(bis, encoding);
             }
 
-            ChainReaderHelper crh = new ChainReaderHelper();
-            crh.setBufferSize(size);
-            crh.setPrimaryReader(instream);
-            crh.setFilterChains(filterChains);
-            crh.setProject(project);
-            instream = crh.getAssembledReader();
-
-            String text = crh.readFully(instream);
+            String text = "";
+            if (size != 0) {
+                ChainReaderHelper crh = new ChainReaderHelper();
+                crh.setBufferSize(size);
+                crh.setPrimaryReader(instream);
+                crh.setFilterChains(filterChains);
+                crh.setProject(project);
+                instream = crh.getAssembledReader();
+    
+                text = crh.readFully(instream);
+            }
 
             if (text != null) {
-                project.setNewProperty(property, text);
-                log("loaded " + text.length() + " characters",
-                    Project.MSG_VERBOSE);
-                log(property + " := " + text, Project.MSG_DEBUG);
+                if (text.length() > 0) {
+                    project.setNewProperty(property, text);
+                    log("loaded " + text.length() + " characters",
+                        Project.MSG_VERBOSE);
+                    log(property + " := " + text, Project.MSG_DEBUG);
+                }
             }
 
         } catch (final IOException ioe) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java b/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
index 3e0d83262..cd0f52b93 100644
--- a/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
@@ -59,9 +59,11 @@ import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.PatternSet;
+import org.apache.tools.ant.types.selectors.*;
 
 import java.io.File;
 import java.util.StringTokenizer;
+import java.util.Enumeration;
 
 /**
  * This is an abstract task that should be used by all those tasks that 
@@ -74,10 +76,11 @@ import java.util.StringTokenizer;
  * @author Sam Ruby <a href="mailto:rubys@us.ibm.com">rubys@us.ibm.com</a>
  * @author Jon S. Stevens <a href="mailto:jon@clearink.com">jon@clearink.com</a>
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
+ * @author <a href="mailto:bruce@callenish.com">Bruce Atherton</a>
  * @since Ant 1.1
  */
 
-public abstract class MatchingTask extends Task {
+public abstract class MatchingTask extends Task implements SelectorContainer {
 
     protected boolean useDefaultExcludes = true;
     protected FileSet fileset = new FileSet();
@@ -137,7 +140,7 @@ public abstract class MatchingTask extends Task {
 
     /**
      * Set this to be the items in the base directory that you want to be
-     * included. You can also specify "*" for the items (ie: items="*") 
+     * included. You can also specify "*" for the items (ie: items="*")
      * and it will include all the items in the base directory.
      *
      * @param itemString the string containing the files to include.
@@ -177,29 +180,29 @@ public abstract class MatchingTask extends Task {
      * @param ignoreString the string containing the files to ignore.
      */
     public void XsetIgnore(String ignoreString) {
-        log("The ignore attribute is deprecated." + 
+        log("The ignore attribute is deprecated." +
             "Please use the excludes attribute.",
             Project.MSG_WARN);
         if (ignoreString != null && ignoreString.length() > 0) {
-            StringTokenizer tok = new StringTokenizer(ignoreString, ", ", 
+            StringTokenizer tok = new StringTokenizer(ignoreString, ", ",
                                                       false);
             while (tok.hasMoreTokens()) {
                 createExclude().setName("**/" + tok.nextToken().trim() + "/**");
             }
         }
     }
-    
+
     /**
      * Sets whether default exclusions should be used or not.
      *
-     * @param useDefaultExcludes "true"|"on"|"yes" when default exclusions 
+     * @param useDefaultExcludes "true"|"on"|"yes" when default exclusions
      *                           should be used, "false"|"off"|"no" when they
      *                           shouldn't be used.
      */
     public void setDefaultexcludes(boolean useDefaultExcludes) {
         this.useDefaultExcludes = useDefaultExcludes;
     }
-    
+
     /**
      * Returns the directory scanner needed to access the files to process.
      */
@@ -213,20 +216,165 @@ public abstract class MatchingTask extends Task {
      * Sets the name of the file containing the includes patterns.
      *
      * @param includesfile A string containing the filename to fetch
-     * the include patterns from.  
+     * the include patterns from.
      */
-     public void setIncludesfile(File includesfile) {
-         fileset.setIncludesfile(includesfile);
-     }
+    public void setIncludesfile(File includesfile) {
+        fileset.setIncludesfile(includesfile);
+    }
 
     /**
      * Sets the name of the file containing the includes patterns.
      *
      * @param excludesfile A string containing the filename to fetch
-     * the include patterns from.  
+     * the include patterns from.
+     */
+    public void setExcludesfile(File excludesfile) {
+        fileset.setExcludesfile(excludesfile);
+    }
+
+    /**
+     * Indicates whether there are any selectors here.
+     *
+     * @return whether any selectors are in this container
+     */
+    public boolean hasSelectors() {
+        return fileset.hasSelectors();
+    }
+
+    /**
+     * Gives the count of the number of selectors in this container
+     *
+     * @return the number of selectors in this container
+     */
+    public int selectorCount() {
+        return fileset.selectorCount();
+    }
+
+    /**
+     * Returns the set of selectors as an array.
+     *
+     * @return an array of selectors in this container
+     */
+    public FileSelector[] getSelectors(Project p) {
+        return fileset.getSelectors(p);
+    }
+
+    /**
+     * Returns an enumerator for accessing the set of selectors.
+     *
+     * @return an enumerator that goes through each of the selectors
+     */
+    public Enumeration selectorElements() {
+        return fileset.selectorElements();
+    }
+
+    /**
+     * Add a new selector into this container.
+     *
+     * @param selector the new selector to add
+     * @return the selector that was added
+     */
+    public void appendSelector(FileSelector selector) {
+        fileset.appendSelector(selector);
+    }
+
+    /* Methods below all add specific selectors */
+
+    /**
+     * add a "Select" selector entry on the selector list
+     */
+    public void addSelector(SelectSelector selector) {
+        fileset.addSelector(selector);
+    }
+
+    /**
+     * add an "And" selector entry on the selector list
      */
-     public void setExcludesfile(File excludesfile) {
-         fileset.setExcludesfile(excludesfile);
-     }
+    public void addAnd(AndSelector selector) {
+        fileset.addAnd(selector);
+    }
+
+    /**
+     * add an "Or" selector entry on the selector list
+     */
+    public void addOr(OrSelector selector) {
+        fileset.addOr(selector);
+    }
 
+    /**
+     * add a "Not" selector entry on the selector list
+     */
+    public void addNot(NotSelector selector) {
+        fileset.addNot(selector);
+    }
+
+    /**
+     * add a "None" selector entry on the selector list
+     */
+    public void addNone(NoneSelector selector) {
+        fileset.addNone(selector);
+    }
+
+    /**
+     * add a majority selector entry on the selector list
+     */
+    public void addMajority(MajoritySelector selector) {
+        fileset.addMajority(selector);
+    }
+
+    /**
+     * add a selector date entry on the selector list
+     */
+    public void addDate(DateSelector selector) {
+        fileset.addDate(selector);
+    }
+
+    /**
+     * add a selector size entry on the selector list
+     */
+    public void addSize(SizeSelector selector) {
+        fileset.addSize(selector);
+    }
+
+    /**
+     * add a selector filename entry on the selector list
+     */
+    public void addFilename(FilenameSelector selector) {
+        fileset.addFilename(selector);
+    }
+
+    /**
+     * add an extended selector entry on the selector list
+     */
+    public void addCustom(ExtendSelector selector) {
+        fileset.addCustom(selector);
+    }
+
+    /**
+     * add a contains selector entry on the selector list
+     */
+    public void addContains(ContainsSelector selector) {
+        fileset.addContains(selector);
+    }
+
+    /**
+     * add a present selector entry on the selector list
+     */
+    public void addPresent(PresentSelector selector) {
+        fileset.addPresent(selector);
+    }
+
+    /**
+     * add a depth selector entry on the selector list
+     */
+    public void addDepth(DepthSelector selector) {
+        fileset.addDepth(selector);
+    }
+
+    /**
+     * add a depends selector entry on the selector list
+     */
+    public void addDepend(DependSelector selector) {
+        fileset.addDepend(selector);
+    }
 }
diff --git a/src/main/org/apache/tools/ant/taskdefs/Move.java b/src/main/org/apache/tools/ant/taskdefs/Move.java
index 0a0b3af9b..c698b8dd1 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Move.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Move.java
@@ -306,7 +306,7 @@ public class Move extends Copy {
                     }
                 }
 
-                if (destFile.exists()) {
+                if (destFile.exists() && destFile.isFile()) {
                     if (!destFile.delete()) {
                         throw new BuildException("Unable to remove existing "
                                                  + "file " + destFile);
diff --git a/src/main/org/apache/tools/ant/taskdefs/Patch.java b/src/main/org/apache/tools/ant/taskdefs/Patch.java
index 34db7aab2..e82b16583 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Patch.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Patch.java
@@ -171,6 +171,7 @@ public class Patch extends Task {
         Execute exe = new Execute(new LogStreamHandler(this, Project.MSG_INFO,
                                                        Project.MSG_WARN), 
                                   null);
+        exe.setCommandline(toExecute.getCommandline());
 
         if (directory != null) {
             if (directory.exists() && directory.isDirectory()) {
@@ -186,6 +187,7 @@ public class Patch extends Task {
             exe.setWorkingDirectory(getProject().getBaseDir());
         }
 
+        log(toExecute.describeCommand(), Project.MSG_VERBOSE);
         try {
             exe.execute();
         } catch (IOException e) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/Property.java b/src/main/org/apache/tools/ant/taskdefs/Property.java
index f40ac7122..976e4d397 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Property.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Property.java
@@ -88,18 +88,27 @@ public class Property extends Task {
     protected String env;
     protected Reference ref;
     protected String prefix;
+    private Project fallback;
 
     protected boolean userProperty; // set read-only properties
 
     public Property() {
-        super();
+        this(false);
     }
 
     /**
      * @since Ant 1.5
      */
     protected Property(boolean userProperty) {
+        this(userProperty, null);
+    }
+
+    /**
+     * @since Ant 1.5
+     */
+    protected Property(boolean userProperty, Project fallback) {
         this.userProperty = userProperty;
+        this.fallback = fallback;
     }
 
     public void setName(String name) {
@@ -130,6 +139,9 @@ public class Property extends Task {
         return file;
     }
     
+    /**
+     * @since Ant 1.5
+     */
     public void setPrefix(String prefix) {
         this.prefix = prefix;
         if (!prefix.endsWith(".")) {
@@ -137,6 +149,13 @@ public class Property extends Task {
         }
     }
 
+    /**
+     * @since Ant 1.5
+     */
+    public String getPrefix() {
+        return prefix;
+    }
+
     public void setRefid(Reference ref) {
         this.ref = ref;
     }
@@ -157,6 +176,9 @@ public class Property extends Task {
         this.env = env;
     }
 
+    /**
+     * @since Ant 1.5
+     */
     public String getEnvironment() {
         return env;
     }
@@ -180,6 +202,13 @@ public class Property extends Task {
         createClasspath().setRefid(r);
     }
 
+    /**
+     * @since Ant 1.5
+     */
+    public Path getClasspath() {
+        return classpath;
+    }
+
     /**
      * @deprecated This was never a supported feature and has been
      * deprecated without replacement
@@ -230,10 +259,17 @@ public class Property extends Task {
         }
 
         if ((name != null) && (ref != null)) {
-            Object obj = ref.getReferencedObject(getProject());
-            if (obj != null) {
-                addProperty(name, obj.toString());
-            }
+            try {
+                addProperty(name, 
+                            ref.getReferencedObject(getProject()).toString());
+            } catch (BuildException be) {
+                if (fallback != null) {
+                    addProperty(name, 
+                                ref.getReferencedObject(fallback).toString());
+                } else {
+                    throw be;
+                }
+            }                
         }
     }
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Replace.java b/src/main/org/apache/tools/ant/taskdefs/Replace.java
index 29f371efd..1c0718044 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Replace.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Replace.java
@@ -413,8 +413,14 @@ public class Replace extends MatchingTask {
             // otherwise, delete the new one
             if (changes) {
                 ++fileCount;
-                src.delete();
-                temp.renameTo(src);
+                if (!src.delete()) {
+                    throw new BuildException("Couldn't delete " + src,
+                                             getLocation());
+                }
+                if (!temp.renameTo(src)) {
+                    throw new BuildException("Couldn't rename temporary file " 
+                                             + temp, getLocation());
+                }
                 temp = null;
             }
         } catch (IOException ioe) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
index 814f4c9ad..e07f6827a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Rmic.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
@@ -420,7 +420,7 @@ public class Rmic extends MatchingTask {
         }
 
         if (verify) {
-            log("Verify has been turned on.", Project.MSG_INFO);
+            log("Verify has been turned on.", Project.MSG_VERBOSE);
         }
 
         RmicAdapter adapter = RmicAdapterFactory.getRmic(getCompiler(), this);
diff --git a/src/main/org/apache/tools/ant/taskdefs/TempFile.java b/src/main/org/apache/tools/ant/taskdefs/TempFile.java
index e6e1c54e3..a9c386e65 100644
--- a/src/main/org/apache/tools/ant/taskdefs/TempFile.java
+++ b/src/main/org/apache/tools/ant/taskdefs/TempFile.java
@@ -63,8 +63,19 @@ import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.util.FileUtils;
 
 /**
- *  This task fills a proprerty with a temporary file
- *
+ *  This task sets a property to  the name of a temporary file. 
+ *  Unlike the Java1.2 method to create a temporary file, this task
+ *  does work on Java1.1. Also, it does not actually create the
+ *  temporary file, but it does guarantee that the file did not
+ *  exist when the task was executed. 
+ * <p>  
+ * Examples
+ * <pre>&lt;tempfile property="temp.file" /&gt;</pre>
+ * create a temporary file
+ * <pre>&lt;tempfile property="temp.file" suffix=".xml" /&gt;</pre>
+ * create a temporary file with the .xml suffix.
+ * <pre>&lt;tempfile property="temp.file" destDir="build"/&gt;</pre>
+ * create a temp file in the build subdir
  *@author      steve loughran
  *@since       Ant 1.5
  *@ant.task
@@ -94,7 +105,7 @@ public class TempFile extends Task {
 
 
     /**
-     *  Sets the property attribute of the TempFile object
+     *  The property you wish to assign the temporary file to
      *
      *@param  property  The property to set
      */
diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
index fe18b5328..0f2cab7eb 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
@@ -661,20 +661,31 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
                 Param p = (Param) e.nextElement();
                 liaison.addParam(p.getName(), p.getExpression());
             }
+        } catch (Exception ex) {
+            log("Failed to read stylesheet " + stylesheet, Project.MSG_INFO);
+            throw new BuildException(ex);
+        }
+
+        try {
             // if liaison is a TraxLiason, use XMLCatalog as the entity
-            // resolver
+            // resolver and URI resolver
             if (liaison.getClass().getName().equals(TRAX_LIAISON_CLASS) &&
                 xmlCatalog != null) {
-                log("Configuring TraxLiaison and calling entity resolver",
-                    Project.MSG_DEBUG);
+                log("Configuring TraxLiaison: setting entity resolver " +
+                    "and setting URI resolver", Project.MSG_DEBUG);
                 Method resolver = liaison.getClass()
-                                    .getDeclaredMethod("setEntityResolver", 
-                                        new Class[] {EntityResolver.class});
+                    .getDeclaredMethod("setEntityResolver", 
+                                       new Class[] {EntityResolver.class});
+                resolver.invoke(liaison, new Object[] {xmlCatalog});
+
+                resolver = liaison.getClass()
+                    .getDeclaredMethod("setURIResolver", 
+                                       new Class[] {loadClass("javax.xml.transform.URIResolver")});
                 resolver.invoke(liaison, new Object[] {xmlCatalog});
             }
-        } catch (Exception ex) {
-            log("Failed to read stylesheet " + stylesheet, Project.MSG_INFO);
-            throw new BuildException(ex);
+        } catch (Exception e) {
+            throw new BuildException("Failed to configure XMLCatalog for "
+                                     + "TraxLiaison", e);
         }
     }
     
diff --git a/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java b/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
index b7edacb4c..9f1e9db7b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
@@ -74,10 +74,10 @@ import java.util.Vector;
 /**
  * Task that gets property values from a valid xml file.
  * Example:
- *   <root-tag myattr="true">
- *     <inner-tag someattr="val">Text</inner-tag>
- *     <a2><a3><a4>false</a4></a3></a2>
- *   </root-tag>
+ *   &lt;root-tag myattr="true"&gt;
+ *     &lt;inner-tag someattr="val"&gt;Text&lt;/inner-tag&gt;
+ *     &lt;a2&gt;&lt;a3&gt;&lt;a4&gt;false&lt;/a4&gt;&lt;/a3&gt;&lt;/a2&gt;
+ *   &lt;/root-tag&gt;
  *
  *  root-tag(myattr)=true
  *  root-tag.inner-tag=Text
diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java b/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java
index af9951129..35c45a10d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java
@@ -115,11 +115,12 @@ public class CompilerAdapterFactory {
                 if (isClassicCompilerSupported) {
                     return new Javac12();
                 } else {
-                    throw new BuildException("This version of java does "
+                    task.log("This version of java does "
                                              + "not support the classic "
-                                             + "compiler");
+                                             + "compiler; upgrading to modern",
+                                             Project.MSG_WARN);
+                    compilerType="modern";
                 }
-
             }
             //on java<=1.3 the modern falls back to classic if it is not found
             //but on java>=1.4 we just bail out early
diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
index cd8426228..1e3105b99 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
@@ -397,7 +397,10 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter {
     /**
      * Do the compile with the specified arguments.
      * @param args - arguments to pass to process on command line
-     * @param firstFileName - index of the first source file in args
+     * @param firstFileName - index of the first source file in args,
+     * if the index is negative, no temporary file will ever be
+     * created, but this may hit the command line length limit on your
+     * system.
      */
     protected int executeExternalCompile(String[] args, int firstFileName) {
         String[] commandArray = null;
@@ -411,12 +414,13 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter {
              * POSIX seems to define a lower limit of 4k, so use a temporary
              * file if the total length of the command line exceeds this limit.
              */
-            if (Commandline.toString(args).length() > 4096) {
+            if (Commandline.toString(args).length() > 4096 
+                && firstFileName >= 0) {
                 PrintWriter out = null;
                 try {
                     String userDirName = System.getProperty("user.dir");
                     File userDir = new File(userDirName);
-                    tmpFile = fileUtils.createTempFile("jikes", "", userDir);
+                    tmpFile = fileUtils.createTempFile("files", "", userDir);
                     out = new PrintWriter(new FileWriter(tmpFile));
                     for (int i = firstFileName; i < args.length; i++) {
                         out.println(args[i]);
@@ -458,6 +462,13 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter {
         }
     }
 
+    /**
+     * @deprecated use org.apache.tools.ant.types.Path#addExtdirs instead
+     */
+    protected void addExtdirsToClasspath(Path classpath) {
+        classpath.addExtdirs(extdirs);
+    }
+
     /**
      * Adds the command line arguments specifc to the current implementation.
      */
diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java b/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java
index 66cc65194..66297763b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java
@@ -75,7 +75,7 @@ public class JavacExternal extends DefaultCompilerAdapter {
         Commandline cmd = new Commandline();
         cmd.setExecutable(getJavac().getJavacExecutable());
         setupModernJavacCommandlineSwitches(cmd);
-        int firstFileName = cmd.size();
+        int firstFileName = assumeJava11() ? -1 : cmd.size();
         logAndAddFilesToCompile(cmd);
 
         return 
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Http.java b/src/main/org/apache/tools/ant/taskdefs/condition/Http.java
index 3849dfb7e..5c63f9965 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/Http.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/Http.java
@@ -67,7 +67,7 @@ import java.net.URL;
 /**
  * Condition to wait for a HTTP request to succeed. Its attribute(s) are:
  *   url - the URL of the request.
- *
+ *   errorsBeginAt - number at which errors begin at; default=400. 
  * @author <a href="mailto:denis@network365.com">Denis Hennessy</a>
  * @since Ant 1.5
  */
@@ -78,6 +78,12 @@ public class Http extends ProjectComponent implements Condition {
         spec = url;
     }
 
+    private int errorsBeginAt=400;
+    
+    public void SetErrorsBeginAt(int errorsBeginAt) {
+        this.errorsBeginAt=errorsBeginAt;
+    }
+    
     public boolean eval() throws BuildException {
         if (spec == null) {
             throw new BuildException("No url specified in http condition");
@@ -92,7 +98,7 @@ public class Http extends ProjectComponent implements Condition {
                     int code = http.getResponseCode();
                     log("Result code for " + spec + " was " + code, 
                         Project.MSG_VERBOSE);
-                    if (code > 0 && code < 500) {
+                    if (code > 0 && code < errorsBeginAt) {
                         return true;
                     } else {
                         return false;
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
index 7e6d2548e..8ddd457af 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
@@ -99,6 +99,7 @@ public class Os implements Condition {
      *               <li>unix</li>
      *               <li>windows</li>
      *               <li>win9x</li>
+     *               <li>z/os</li>
      *               </ul>
      */
     public void setFamily(String f) {family = f.toLowerCase(Locale.US);}
@@ -221,6 +222,9 @@ public class Os implements Condition {
                         !(osName.indexOf("nt") >= 0 ||
                           osName.indexOf("2000") >= 0 ||
                           osName.indexOf("xp") >= 0);
+                } else if (family.equals("z/os")) {
+                    isFamily = osName.indexOf("z/os") > -1 
+                        || osName.indexOf("os/390") > -1;
                 } else {
                     throw new BuildException(
                         "Don\'t know how to detect os family \""
diff --git a/src/main/org/apache/tools/ant/taskdefs/defaults.properties b/src/main/org/apache/tools/ant/taskdefs/defaults.properties
index f13ae69c7..92a7d4805 100644
--- a/src/main/org/apache/tools/ant/taskdefs/defaults.properties
+++ b/src/main/org/apache/tools/ant/taskdefs/defaults.properties
@@ -69,6 +69,7 @@ cvschangelog=org.apache.tools.ant.taskdefs.cvslib.ChangeLogTask
 buildnumber=org.apache.tools.ant.taskdefs.BuildNumber
 concat=org.apache.tools.ant.taskdefs.Concat
 cvstagdiff=org.apache.tools.ant.taskdefs.cvslib.CvsTagDiff
+tempfile=org.apache.tools.ant.taskdefs.TempFile
 
 # optional tasks
 script=org.apache.tools.ant.taskdefs.optional.Script
@@ -113,6 +114,7 @@ telnet=org.apache.tools.ant.taskdefs.optional.net.TelnetTask
 csc=org.apache.tools.ant.taskdefs.optional.dotnet.CSharp
 ilasm=org.apache.tools.ant.taskdefs.optional.dotnet.Ilasm
 WsdlToDotnet=org.apache.tools.ant.taskdefs.optional.dotnet.WsdlToDotnet
+wsdltodotnet=org.apache.tools.ant.taskdefs.optional.dotnet.WsdlToDotnet
 stylebook=org.apache.tools.ant.taskdefs.optional.StyleBook
 test=org.apache.tools.ant.taskdefs.optional.Test
 pvcs=org.apache.tools.ant.taskdefs.optional.pvcs.Pvcs
@@ -163,6 +165,7 @@ jarlib-display=org.apache.tools.ant.taskdefs.optional.extension.JarLibDisplayTas
 jarlib-manifest=org.apache.tools.ant.taskdefs.optional.extension.JarLibManifestTask
 jarlib-available=org.apache.tools.ant.taskdefs.optional.extension.JarLibAvailableTask
 jarlib-resolve=org.apache.tools.ant.taskdefs.optional.extension.JarLibResolveTask
+setproxy=org.apache.tools.ant.taskdefs.optional.net.SetProxy
 
 # deprecated ant tasks (kept for back compatibility)
 starteam=org.apache.tools.ant.taskdefs.optional.scm.AntStarTeamCheckOut
diff --git a/src/main/org/apache/tools/ant/taskdefs/email/Message.java b/src/main/org/apache/tools/ant/taskdefs/email/Message.java
index b39243884..0bc3dc8ce 100644
--- a/src/main/org/apache/tools/ant/taskdefs/email/Message.java
+++ b/src/main/org/apache/tools/ant/taskdefs/email/Message.java
@@ -53,6 +53,8 @@
  */
 package org.apache.tools.ant.taskdefs.email;
 
+import org.apache.tools.ant.ProjectComponent;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
@@ -65,7 +67,7 @@ import java.io.PrintStream;
  * @author roxspring@yahoo.com Rob Oxspring
  * @since Ant 1.5
  */
-public class Message {
+public class Message extends ProjectComponent {
     private File messageSource = null;
     private StringBuffer buffer = new StringBuffer();
     private String mimeType = "text/plain";
@@ -155,19 +157,19 @@ public class Message {
                 String line = null;
 
                 while ((line = in.readLine()) != null) {
-                    out.println(line);
+                    out.println(getProject().replaceProperties(line));
                 }
             } finally {
                 freader.close();
             }
         } else {
-            out.println(buffer);
+            out.println(getProject().replaceProperties(buffer.toString()));
         }
     }
 
 
     /**
-     * Returns true iff the mimeType has been set.
+     * Returns true if the mimeType has been set.
      *
      * @return false if the default value is in use
      */
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java b/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
index 60030d6ff..187fc6159 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
@@ -310,9 +310,9 @@ public class EchoProperties extends Task {
                     }
                     return;
                 }
-                
+
                 if (destfile.exists() && !destfile.canWrite()) {
-                    String message = 
+                    String message =
                         "Can not write to the specified destfile!";
                     if (failonerror) {
                         throw new BuildException(message, location);
@@ -333,7 +333,7 @@ public class EchoProperties extends Task {
         } finally {
             if (os != null) {
                 try {
-                    os.close();                    
+                    os.close();
                 } catch (IOException e) {
                 }
             }
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java b/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
index d26702728..aef99650f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
@@ -437,14 +437,16 @@ public class PropertyFile extends Task {
                 newValue = currentValue;
             } else {
                 int operationValue = 1;
-                try {
-                    operationValue = fmt.parse(value).intValue();
-                } catch (NumberFormatException nfe) { 
-                    // swallow
-                } catch (ParseException pe)  { 
-                    // swallow
+                if (value != null) {
+                    try {
+                        operationValue = fmt.parse(value).intValue();
+                    } catch (NumberFormatException nfe) {
+                        // swallow
+                    } catch (ParseException pe)  {
+                        // swallow
+                    }
                 }
-                
+
                 if (operation == Operation.INCREMENT_OPER) {
                     newValue = currentValue + operationValue;
                 } else if (operation == Operation.DECREMENT_OPER) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
index d8103a9ab..f0531ff4b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
@@ -186,7 +186,8 @@ public class ReplaceRegExp extends Task {
 
     public void setReplace(String replace) {
         if (subs != null) {
-            throw new BuildException("Only one substitution expression is allowed");
+            throw new BuildException("Only one substitution expression is "
+                                     + "allowed");
         }
 
         subs = new Substitution();
@@ -226,7 +227,8 @@ public class ReplaceRegExp extends Task {
 
     public Substitution createSubstitution() {
         if (subs != null) {
-            throw new BuildException("Only one substitution expression is allowed");
+            throw new BuildException("Only one substitution expression is "
+                                     + "allowed");
         }
 
         subs = new Substitution();
@@ -252,7 +254,7 @@ public class ReplaceRegExp extends Task {
     /** Perform the replace on the entire file  */
     protected void doReplace(File f, int options)
          throws IOException {
-        File parentDir = new File(new File(f.getAbsolutePath()).getParent());
+        File parentDir = fileUtils.getParentFile(f);
         File temp = fileUtils.createTempFile("replace", ".txt", parentDir);
 
         FileReader r = null;
@@ -268,12 +270,13 @@ public class ReplaceRegExp extends Task {
 
             boolean changes = false;
 
-            log("Replacing pattern '" + regex.getPattern(project) + "' with '" + subs.getExpression(project) +
+            log("Replacing pattern '" + regex.getPattern(project) + 
+                "' with '" + subs.getExpression(project) +
                 "' in '" + f.getPath() + "'" +
                 (byline ? " by line" : "") +
                 (flags.length() > 0 ? " with flags: '" + flags + "'" : "") +
                 ".",
-                Project.MSG_WARN);
+                Project.MSG_VERBOSE);
 
             if (byline) {
                 LineNumberReader lnr = new LineNumberReader(br);
@@ -318,10 +321,15 @@ public class ReplaceRegExp extends Task {
             w = null;
 
             if (changes) {
-                f.delete();
-                temp.renameTo(f);
-            } else {
-                temp.delete();
+                if (!f.delete()) {
+                    throw new BuildException("Couldn't delete " + f,
+                                             getLocation());
+                }
+                if (!temp.renameTo(f)) {
+                    throw new BuildException("Couldn't rename temporary file " 
+                                             + temp, getLocation());
+                }
+                temp = null;
             }
         } finally {
             try {
@@ -330,15 +338,16 @@ public class ReplaceRegExp extends Task {
                 }
             } catch (Exception e) {
             }
-            ;
 
             try {
                 if (w != null) {
-                    r.close();
+                    w.close();
                 }
             } catch (Exception e) {
             }
-            ;
+            if (temp != null) {
+                temp.delete();
+            }
         }
     }
 
@@ -353,7 +362,8 @@ public class ReplaceRegExp extends Task {
         }
 
         if (file != null && filesets.size() > 0) {
-            throw new BuildException("You cannot supply the 'file' attribute and filesets at the same time.");
+            throw new BuildException("You cannot supply the 'file' attribute "
+                                     + "and filesets at the same time.");
         }
 
         int options = 0;
@@ -378,12 +388,13 @@ public class ReplaceRegExp extends Task {
             try {
                 doReplace(file, options);
             } catch (IOException e) {
-                log("An error occurred processing file: '" + file.getAbsolutePath() + "': " + e.toString(),
+                log("An error occurred processing file: '" 
+                    + file.getAbsolutePath() + "': " + e.toString(),
                     Project.MSG_ERR);
             }
         } else if (file != null) {
-            log("The following file is missing: '" + file.getAbsolutePath() + "'",
-                Project.MSG_ERR);
+            log("The following file is missing: '" 
+                + file.getAbsolutePath() + "'", Project.MSG_ERR);
         }
 
         int sz = filesets.size();
@@ -395,18 +406,19 @@ public class ReplaceRegExp extends Task {
             String files[] = ds.getIncludedFiles();
 
             for (int j = 0; j < files.length; j++) {
-                File f = new File(files[j]);
+                File f = new File(fs.getDir(getProject()), files[j]);
 
                 if (f.exists()) {
                     try {
                         doReplace(f, options);
                     } catch (Exception e) {
-                        log("An error occurred processing file: '" + f.getAbsolutePath() + "': " + e.toString(),
+                        log("An error occurred processing file: '" 
+                            + f.getAbsolutePath() + "': " + e.toString(),
                             Project.MSG_ERR);
                     }
                 } else {
-                    log("The following file is missing: '" + file.getAbsolutePath() + "'",
-                        Project.MSG_ERR);
+                    log("The following file is missing: '" 
+                        + f.getAbsolutePath() + "'", Project.MSG_ERR);
                 }
             }
         }
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Script.java b/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
index afe553307..e384fdbe1 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
@@ -73,7 +73,17 @@ public class Script extends Task {
     private String language;
     private String script = "";
     private Hashtable beans = new Hashtable();
-    
+
+    // Register BeanShell ourselves, since BSF does not
+    // natively support it (yet).
+    // This "hack" can be removed once BSF has been
+    // modified to support BeanShell or more dynamic
+    // registration.
+    static {
+        BSFManager.registerScriptingEngine( "beanshell",
+            "bsh.util.BeanShellBSFEngine", new String [] { "bsh" } );
+    }
+
     /**
      * Add a list of named objects to the list to be exported to the script
      */
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
index 18c20a866..6875b9fbc 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
@@ -80,6 +80,7 @@ import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Source;
+import javax.xml.transform.URIResolver;
 
 import javax.xml.transform.sax.SAXSource;
 
@@ -108,7 +109,10 @@ public class TraXLiaison implements XSLTLiaison, ErrorListener, XSLTLoggerAware
     private XSLTLogger logger;
     
     /** possible resolver for publicIds */
-    private EntityResolver resolver;
+    private EntityResolver entityResolver;
+
+    /** possible resolver for URIs */
+    private URIResolver uriResolver;
 
     public TraXLiaison() throws Exception {
         tfactory = TransformerFactory.newInstance();
@@ -145,12 +149,12 @@ public class TraXLiaison implements XSLTLiaison, ErrorListener, XSLTLoggerAware
             // FIXME: need to use a SAXSource as the source for the transform
             // so we can plug in our own entity resolver
             Source src = null;
-            if (resolver != null) {
+            if (entityResolver != null) {
                 if (tfactory.getFeature(SAXSource.FEATURE)) {
                     SAXParserFactory spFactory = SAXParserFactory.newInstance();
                     spFactory.setNamespaceAware(true); 
                     XMLReader reader = spFactory.newSAXParser().getXMLReader();
-                    reader.setEntityResolver(resolver);
+                    reader.setEntityResolver(entityResolver);
                     src = new SAXSource(reader, new InputSource(fis));
                 } else {
                     throw new IllegalStateException("xcatalog specified, but " +
@@ -164,6 +168,9 @@ public class TraXLiaison implements XSLTLiaison, ErrorListener, XSLTLoggerAware
             // not sure what could be the need of this...
             res.setSystemId(getSystemId(outfile));
 
+            if (uriResolver != null)
+                transformer.setURIResolver(uriResolver);
+
             transformer.transform(src, res);
         } finally {
             // make sure to close all handles, otherwise the garbage
@@ -263,7 +270,13 @@ public class TraXLiaison implements XSLTLiaison, ErrorListener, XSLTLoggerAware
     /** Set the class to resolve entities during the transformation
      */
     public void setEntityResolver(EntityResolver aResolver) throws Exception {
-        resolver = aResolver;
+        entityResolver = aResolver;
+    }
+
+    /** Set the class to resolve URIs during the transformation
+     */
+    public void setURIResolver(URIResolver aResolver) throws Exception {
+        uriResolver = aResolver;
     }
     
 } //-- TraXLiaison
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
index 7a0996a58..e9ec062b2 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
@@ -261,17 +261,7 @@ public class CSharp
             "Accessibility.dll;" +
             "cscompmgd.dll;" +
             "CustomMarshalers.dll;" +
-            "IEExecRemote.dll;" +
-            "IEHost.dll;" +
-            "IIEHost.dll;" +
-            "ISymWrapper.dll;" +
-            "Microsoft.JScript.dll;" +
-            "Microsoft.VisualBasic.dll;" +
-            "Microsoft.VisualC.dll;" +
-            "Microsoft.Vsa.dll;" +
             "Mscorcfg.dll;" +
-            "office.dll;" +
-            "RegCode.dll;" +
             "System.Configuration.Install.dll;" +
             "System.Data.dll;" +
             "System.Design.dll;" +
@@ -753,7 +743,8 @@ public class CSharp
                 targetType.equals("module") || targetType.equals("winexe")) {
             targetType = targetType;
         } else {
-            throw new BuildException("targetType " + targetType + " is not a valid type");
+            throw new BuildException("targetType " + targetType 
+                    + " is not one of 'exe', 'module', 'winexe' or 'library'" );
         }
     }
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java
index 717b19cb7..043eb37f2 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java
@@ -63,7 +63,7 @@ import java.io.File;
  * the framework SDK docos
  * @author      Steve Loughran steve_l@iseran.com
  * @version     0.5
- * @ant.task    name="csc" category="dotnet"
+ * @ant.task    name="wsdltodotnet" category="dotnet"
  * @since       ant 1.5
  */
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
index bc9839f42..14e1998a4 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
@@ -97,6 +97,9 @@ public class GenericDeploymentTool implements EJBDeploymentTool {
     /** The standard META-INF directory in jar files */
     protected static final String META_DIR  = "META-INF/";
 
+    /** The standard MANIFEST file */
+    protected static final String MANIFEST  = META_DIR + "MANIFEST.MF";
+
     /** Name for EJB Deployment descriptor within EJB jars */
     protected static final String EJB_DD    = "ejb-jar.xml";
 
@@ -110,10 +113,10 @@ public class GenericDeploymentTool implements EJBDeploymentTool {
     /** The default analyzer */
     public static final String DEFAULT_ANALYZER = ANALYZER_SUPER;
 
-    /** The analyzer class for the super analyzer */    
+    /** The analyzer class for the super analyzer */
     public static final String ANALYZER_CLASS_SUPER
         = "org.apache.tools.ant.util.depend.bcel.AncestorAnalyzer";
-    /** The analyzer class for the super analyzer */    
+    /** The analyzer class for the super analyzer */
     public static final String ANALYZER_CLASS_FULL
         = "org.apache.tools.ant.util.depend.bcel.FullAnalyzer";
 
@@ -293,11 +296,11 @@ public class GenericDeploymentTool implements EJBDeploymentTool {
         if (analyzer == null) {
             analyzer = DEFAULT_ANALYZER;
         }
-        
+
         if (analyzer.equals(ANALYZER_NONE)) {
             return;
         }
-        
+
         String analyzerClassName = null;
         if (analyzer.equals(ANALYZER_SUPER)) {
             analyzerClassName = ANALYZER_CLASS_SUPER;
@@ -306,10 +309,10 @@ public class GenericDeploymentTool implements EJBDeploymentTool {
         } else {
             analyzerClassName = analyzer;
         }
-        
+
         try {
             Class analyzerClass = Class.forName(analyzerClassName);
-            dependencyAnalyzer 
+            dependencyAnalyzer
                 = (DependencyAnalyzer) analyzerClass.newInstance();
             dependencyAnalyzer.addClassPath(new Path(task.getProject(),
                 config.srcDir.getPath()));
@@ -324,8 +327,8 @@ public class GenericDeploymentTool implements EJBDeploymentTool {
                 Project.MSG_WARN);
         }
     }
-    
-    
+
+
     /**
      * Configure this tool for use in the ejbjar task.
      *
@@ -429,6 +432,13 @@ public class GenericDeploymentTool implements EJBDeploymentTool {
 
             String ddPrefix = getVendorDDPrefix(baseName, descriptorFileName);
 
+            File manifestFile = getManifestFile(ddPrefix);
+            if (manifestFile != null) {
+                ejbFiles.put(MANIFEST, manifestFile);
+            }
+
+
+
             // First the regular deployment descriptor
             ejbFiles.put(META_DIR + EJB_DD,
                          new File(config.descriptorDir, descriptorFileName));
@@ -613,13 +623,13 @@ public class GenericDeploymentTool implements EJBDeploymentTool {
             if (endBaseName != -1) {
                 baseName = descriptorFileName.substring(0, endBaseName);
             } else {
-                throw new BuildException("Unable to determine jar name " 
+                throw new BuildException("Unable to determine jar name "
                     + "from descriptor \"" + descriptorFileName + "\"");
             }
         } else if (config.namingScheme.getValue().equals(EjbJar.NamingScheme.DIRECTORY)) {
             File descriptorFile = new File(config.descriptorDir, descriptorFileName);
             String path = descriptorFile.getAbsolutePath();
-            int lastSeparatorIndex 
+            int lastSeparatorIndex
                 = path.lastIndexOf(File.separator);
             if (lastSeparatorIndex == -1) {
                 throw new BuildException("Unable to determine directory name holding descriptor");
@@ -698,14 +708,6 @@ public class GenericDeploymentTool implements EJBDeploymentTool {
         if (jarFile.exists()) {
             long lastBuild = jarFile.lastModified();
 
-            if (config.manifest != null && config.manifest.exists() &&
-                config.manifest.lastModified() > lastBuild) {
-                log("Build needed because manifest " + config.manifest + " is out of date",
-                    Project.MSG_VERBOSE);
-                return true;
-            }
-
-
             Iterator fileIter = ejbFiles.values().iterator();
 
             // Loop through the files seeing if any has been touched
@@ -735,6 +737,30 @@ public class GenericDeploymentTool implements EJBDeploymentTool {
         return handler.getPublicId();
     }
 
+    /**
+     * Get the manifets file to use for building the generic jar.
+     *
+     * If the file does not exist the global manifest from the config is used
+     * otherwise the default Ant manifest will be used.
+     *
+     * @param prefix the prefix where to llook for the manifest file based on
+     *        the naming convention.
+     *
+     * @return the manifest file or null if the manifest file does not exist
+     */
+    protected File getManifestFile(String prefix) {
+        File manifestFile
+            = new File(getConfig().descriptorDir, prefix + "manifest.mf");
+        if (manifestFile.exists()) {
+            return manifestFile;
+        }
+
+        if (config.manifest != null) {
+            return config.manifest;
+        }
+        return null;
+    }
+
     /**
      * Method used to encapsulate the writing of the JAR file. Iterates over the
      * filenames/java.io.Files in the Hashtable stored on the instance variable
@@ -762,15 +788,9 @@ public class GenericDeploymentTool implements EJBDeploymentTool {
             InputStream in = null;
             Manifest manifest = null;
             try {
-                File manifestFile = new File(getConfig().descriptorDir, baseName + "-manifest.mf");
-                if (manifestFile.exists()) {
+                File manifestFile = (File) files.get(MANIFEST);
+                if (manifestFile != null && manifestFile.exists()) {
                     in = new FileInputStream(manifestFile);
-                } else if (config.manifest != null) {
-                    in = new FileInputStream(config.manifest);
-                    if (in == null) {
-                        throw new BuildException("Could not find manifest file: " + config.manifest,
-                                                  getLocation());
-                    }
                 } else {
                     String defaultManifest = "/org/apache/tools/ant/defaultManifest.mf";
                     in = this.getClass().getResourceAsStream(defaultManifest);
@@ -797,6 +817,10 @@ public class GenericDeploymentTool implements EJBDeploymentTool {
             // Loop through all the class files found and add them to the jar
             for (Iterator entryIterator = files.keySet().iterator(); entryIterator.hasNext();) {
                 String entryName = (String) entryIterator.next();
+                if (entryName.equals(MANIFEST)) {
+                    continue;
+                }
+
                 File entryFile = (File) files.get(entryName);
 
                 log("adding file '" + entryName + "'",
@@ -855,7 +879,7 @@ public class GenericDeploymentTool implements EJBDeploymentTool {
         if (dependencyAnalyzer == null) {
             return;
         }
-        
+
         dependencyAnalyzer.reset();
 
         Iterator i = checkEntries.keySet().iterator();
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
index 5f388bce9..4068957ac 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
@@ -492,10 +492,14 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool {
                     javaTask.createArg().setLine(compiler);
                 }
             }
-            
-            javaTask.createArg().setValue("-classpath");
-            javaTask.createArg().setPath(getCombinedClasspath());
-            
+
+            Path combinedClasspath = getCombinedClasspath();
+            if (combinedClasspath != null
+                 && combinedClasspath.toString().trim().length() > 0) {
+                javaTask.createArg().setValue("-classpath");
+                javaTask.createArg().setPath(combinedClasspath);
+            }
+
             javaTask.createArg().setValue(sourceJar.getPath());
             javaTask.createArg().setValue(destJar.getPath());
 
@@ -616,7 +620,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool {
                 }
 
                 //Cycle Through generic and make sure its in weblogic
-                ClassLoader genericLoader 
+                ClassLoader genericLoader
                     = getClassLoaderFromJar(genericJarFile);
 
                 for (Enumeration e = genericEntries.keys(); e.hasMoreElements();) {
@@ -711,7 +715,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool {
                     log("Weblogic Jar rebuild needed due to changed "
                          + "interface or XML", Project.MSG_VERBOSE);
                 }
-                
+
                 if (genericLoader instanceof AntClassLoader) {
                     AntClassLoader loader = (AntClassLoader)genericLoader;
                     loader.cleanup();
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatibility.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatibility.java
new file mode 100644
index 000000000..9f3560e5d
--- /dev/null
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatibility.java
@@ -0,0 +1,98 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+package org.apache.tools.ant.taskdefs.optional.extension;
+
+/**
+ * Enum used in (@link Extension) to indicate the compatibility
+ * of one extension to another. See (@link Extension) for instances
+ * of object.
+ *
+ * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+ *  This file is from excalibur.extension package. Dont edit this file
+ * directly as there is no unit tests to make sure it is operational
+ * in ant. Edit file in excalibur and run tests there before changing
+ * ants file.
+ * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+ *
+ * @author <a href="mailto:peter@apache.org">Peter Donald</a>
+ * @version $Revision$ $Date$
+ * @see Extension
+ */
+public final class Compatibility
+{
+    /**
+     * A string representaiton of compatibility level.
+     */
+    private final String m_name;
+
+    /**
+     * Create a compatibility enum with specified name.
+     *
+     * @param name the name of compatibility level
+     */
+    Compatibility( final String name )
+    {
+        m_name = name;
+    }
+
+    /**
+     * Return name of compatibility level.
+     *
+     * @return the name of compatibility level
+     */
+    public String toString()
+    {
+        return m_name;
+    }
+}
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java
index cb7fd4aa2..7f0490c45 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java
@@ -87,7 +87,8 @@ public final class Extension
      * Manifest Attribute Name object for EXTENSION_LIST.
      * @see Attributes.Name#EXTENSION_LIST
      */
-    public static final Attributes.Name EXTENSION_LIST = Attributes.Name.EXTENSION_LIST;
+    public static final Attributes.Name EXTENSION_LIST = 
+        new Attributes.Name( "Extension-List" );//Attributes.Name.EXTENSION_LIST;
 
     /**
      * <code>Name</code> object for <code>Optional-Extension-List</code>
@@ -99,14 +100,15 @@ public final class Extension
      * @see <a href="http://java.sun.com/j2se/1.3/docs/guide/extensions/spec.html#dependnecy">
      *      Installed extension dependency</a>
      */
-    public static final Attributes.Name OPTIONAL_EXTENSION_LIST = new Attributes.Name( "Optional-Extension-List" );
+    public static final Attributes.Name OPTIONAL_EXTENSION_LIST = 
+        new Attributes.Name( "Optional-Extension-List" );
 
     /**
      * Manifest Attribute Name object for EXTENSION_NAME.
      * @see Attributes.Name#EXTENSION_NAME
      */
-    public static final Attributes.Name EXTENSION_NAME = Attributes.Name.EXTENSION_NAME;
-
+    public static final Attributes.Name EXTENSION_NAME = 
+        new Attributes.Name( "Extension-Name" );//Attributes.Name.EXTENSION_NAME;
     /**
      * Manifest Attribute Name object for SPECIFICATION_VERSION.
      * @see Attributes.Name#SPECIFICATION_VERSION
@@ -135,40 +137,42 @@ public final class Extension
      * Manifest Attribute Name object for IMPLEMENTATION_URL.
      * @see Attributes.Name#IMPLEMENTATION_URL
      */
-    public static final Attributes.Name IMPLEMENTATION_URL = Attributes.Name.IMPLEMENTATION_URL;
+    public static final Attributes.Name IMPLEMENTATION_URL =
+        new Attributes.Name( "Implementation-URL" );//Attributes.Name.IMPLEMENTATION_URL;
 
     /**
      * Manifest Attribute Name object for IMPLEMENTATION_VENDOR_ID.
      * @see Attributes.Name#IMPLEMENTATION_VENDOR_ID
      */
-    public static final Attributes.Name IMPLEMENTATION_VENDOR_ID = Attributes.Name.IMPLEMENTATION_VENDOR_ID;
+    public static final Attributes.Name IMPLEMENTATION_VENDOR_ID =
+        new Attributes.Name( "Implementation-Vendor-Id" );//Attributes.Name.IMPLEMENTATION_VENDOR_ID;
 
     /**
      * Enum indicating that extension is compatible with other extension.
      */
-    public static final Compatability COMPATIBLE =
-        new Compatability( "COMPATIBLE" );
+    public static final Compatibility COMPATIBLE =
+        new Compatibility( "COMPATIBLE" );
 
     /**
      * Enum indicating that extension requires an upgrade
      * of specification to be compatible with other extension.
      */
-    public static final Compatability REQUIRE_SPECIFICATION_UPGRADE =
-        new Compatability( "REQUIRE_SPECIFICATION_UPGRADE" );
+    public static final Compatibility REQUIRE_SPECIFICATION_UPGRADE =
+        new Compatibility( "REQUIRE_SPECIFICATION_UPGRADE" );
 
     /**
      * Enum indicating that extension requires a vendor
      * switch to be compatible with other extension.
      */
-    public static final Compatability REQUIRE_VENDOR_SWITCH =
-        new Compatability( "REQUIRE_VENDOR_SWITCH" );
+    public static final Compatibility REQUIRE_VENDOR_SWITCH =
+        new Compatibility( "REQUIRE_VENDOR_SWITCH" );
 
     /**
      * Enum indicating that extension requires an upgrade
      * of implementation to be compatible with other extension.
      */
-    public static final Compatability REQUIRE_IMPLEMENTATION_UPGRADE =
-        new Compatability( "REQUIRE_IMPLEMENTATION_UPGRADE" );
+    public static final Compatibility REQUIRE_IMPLEMENTATION_UPGRADE =
+        new Compatibility( "REQUIRE_IMPLEMENTATION_UPGRADE" );
 
     /**
      * Enum indicating that extension is incompatible with
@@ -176,8 +180,8 @@ public final class Extension
      * indicate). ie For example the other extension may have
      * a different ID.
      */
-    public static final Compatability INCOMPATIBLE =
-        new Compatability( "INCOMPATIBLE" );
+    public static final Compatibility INCOMPATIBLE =
+        new Compatibility( "INCOMPATIBLE" );
 
     /**
      * The name of the optional package being made available, or required.
@@ -499,10 +503,10 @@ public final class Extension
      * <code>Extension</code> with the specified <code>Extension</code>.
      *
      * @param required Description of the required optional package
-     * @return the enum indicating the compatability (or lack thereof)
+     * @return the enum indicating the compatibility (or lack thereof)
      *         of specifed extension
      */
-    public Compatability getCompatibilityWith( final Extension required )
+    public Compatibility getCompatibilityWith( final Extension required )
     {
         // Extension Name must match
         if( !m_extensionName.equals( required.getExtensionName() ) )
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionResolver.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionResolver.java
index e9214b25c..d288f6ee2 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionResolver.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionResolver.java
@@ -61,6 +61,7 @@ import org.apache.tools.ant.Project;
  * Interface to locate a File that satisfies extension.
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
+ * @author <a href="mailto:jeff@socialchange.net.au">Jeff Turner</>
  * @version $Revision$ $Date$
  */
 public interface ExtensionResolver
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java
index d4845da6f..6c16665e8 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java
@@ -61,12 +61,14 @@ import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.taskdefs.optional.extension.resolvers.LocationResolver;
 import org.apache.tools.ant.taskdefs.optional.extension.resolvers.URLResolver;
+import org.apache.tools.ant.taskdefs.optional.extension.resolvers.AntResolver;
 
 /**
  * Try to locate a jar to satisfy an extension and place
  * location of jar into property.
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
+ * @author <a href="mailto:jeff@socialchange.net.au">Jeff Turner</a>
  * @ant.task name="jarlib-resolver"
  */
 public class JarLibResolveTask
@@ -135,6 +137,11 @@ public class JarLibResolveTask
         m_resolvers.add( url );
     }
 
+    public void addConfiguredAnt( final AntResolver ant )
+    {
+        m_resolvers.add( ant );
+    }
+
     /**
      * Set the Extension looking for.
      *
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java
index 0d277093f..97c339c21 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java
@@ -123,29 +123,29 @@ public final class Specification
      * Enum indicating that extension is compatible with other Package
      * Specification.
      */
-    public static final Compatability COMPATIBLE =
-        new Compatability( "COMPATIBLE" );
+    public static final Compatibility COMPATIBLE =
+        new Compatibility( "COMPATIBLE" );
 
     /**
      * Enum indicating that extension requires an upgrade
      * of specification to be compatible with other Package Specification.
      */
-    public static final Compatability REQUIRE_SPECIFICATION_UPGRADE =
-        new Compatability( "REQUIRE_SPECIFICATION_UPGRADE" );
+    public static final Compatibility REQUIRE_SPECIFICATION_UPGRADE =
+        new Compatibility( "REQUIRE_SPECIFICATION_UPGRADE" );
 
     /**
      * Enum indicating that extension requires a vendor
      * switch to be compatible with other Package Specification.
      */
-    public static final Compatability REQUIRE_VENDOR_SWITCH =
-        new Compatability( "REQUIRE_VENDOR_SWITCH" );
+    public static final Compatibility REQUIRE_VENDOR_SWITCH =
+        new Compatibility( "REQUIRE_VENDOR_SWITCH" );
 
     /**
      * Enum indicating that extension requires an upgrade
      * of implementation to be compatible with other Package Specification.
      */
-    public static final Compatability REQUIRE_IMPLEMENTATION_CHANGE =
-        new Compatability( "REQUIRE_IMPLEMENTATION_CHANGE" );
+    public static final Compatibility REQUIRE_IMPLEMENTATION_CHANGE =
+        new Compatibility( "REQUIRE_IMPLEMENTATION_CHANGE" );
 
     /**
      * Enum indicating that extension is incompatible with
@@ -153,8 +153,8 @@ public final class Specification
      * indicate). ie For example the other Package Specification
      * may have a different ID.
      */
-    public static final Compatability INCOMPATIBLE =
-        new Compatability( "INCOMPATIBLE" );
+    public static final Compatibility INCOMPATIBLE =
+        new Compatibility( "INCOMPATIBLE" );
 
     /**
      * The name of the Package Specification.
@@ -395,10 +395,10 @@ public final class Specification
      * <code>Package Specification</code> with the specified <code>Extension</code>.
      *
      * @param other the other specification
-     * @return the enum indicating the compatability (or lack thereof)
+     * @return the enum indicating the compatibility (or lack thereof)
      *         of specifed Package Specification
      */
-    public Compatability getCompatibilityWith( final Specification other )
+    public Compatibility getCompatibilityWith( final Specification other )
     {
         // Specification Name must match
         if( !m_specificationTitle.equals( other.getSpecificationTitle() ) )
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.java
new file mode 100644
index 000000000..ca30157a2
--- /dev/null
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.java
@@ -0,0 +1,143 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+package org.apache.tools.ant.taskdefs.optional.extension.resolvers;
+
+import java.io.File;
+import java.io.IOException;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.Ant;
+import org.apache.tools.ant.taskdefs.optional.extension.Extension;
+import org.apache.tools.ant.taskdefs.optional.extension.ExtensionResolver;
+
+/**
+ * Resolver that just returns s specified location.
+ *
+ * @author <a href="mailto:peter@apache.org">Peter Donald</a>
+ * @author <a href="mailto:jeff@socialchange.net.au">Jeff Turner</>
+ * @version $Revision$ $Date$
+ */
+public class AntResolver
+    implements ExtensionResolver
+{
+    private File m_antfile;
+    private File m_destfile;
+    private String m_target;
+
+    public void setAntfile( File antfile )
+    {
+        m_antfile = antfile;
+    }
+
+    public void setDestfile( File destfile )
+    {
+        m_destfile = destfile;
+    }
+
+    public void setTarget( final String target )
+    {
+        m_target = target;
+    }
+
+    public File resolve( final Extension extension,
+                         final Project project )
+        throws BuildException
+    {
+        validate();
+
+        final Ant ant = (Ant)project.createTask( "ant" );
+        ant.setInheritAll( false );
+        ant.setAntfile( m_antfile.getName() );
+
+        try
+        {
+            final File dir =
+                m_antfile.getParentFile().getCanonicalFile();
+            ant.setDir( dir );
+        }
+        catch( final IOException ioe )
+        {
+            throw new BuildException( ioe.getMessage(), ioe );
+        }
+
+        if( null != m_target )
+        {
+            ant.setTarget( m_target );
+        }
+
+        ant.execute();
+
+        return m_destfile;
+    }
+
+    private void validate()
+    {
+        if( null == m_antfile )
+        {
+            final String message = "Must specify Buildfile";
+            throw new BuildException( message );
+        }
+
+        if( null == m_destfile )
+        {
+            final String message = "Must specify destination file";
+            throw new BuildException( message );
+        }
+    }
+
+    public String toString()
+    {
+        return "Ant[" + m_antfile + "==>" + m_destfile + "]";
+    }
+}
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/LocationResolver.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/LocationResolver.java
index 119679d36..dbc30e120 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/LocationResolver.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/LocationResolver.java
@@ -63,6 +63,7 @@ import org.apache.tools.ant.taskdefs.optional.extension.ExtensionResolver;
  * Resolver that just returns s specified location.
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
+ * @author <a href="mailto:jeff@socialchange.net.au">Jeff Turner</>
  * @version $Revision$ $Date$
  */
 public class LocationResolver
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.java
index b3d204792..f4e1b8628 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.java
@@ -65,6 +65,7 @@ import org.apache.tools.ant.taskdefs.optional.extension.ExtensionResolver;
  * Resolver that just returns s specified location.
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
+ * @author <a href="mailto:jeff@socialchange.net.au">Jeff Turner</>
  * @version $Revision$ $Date$
  */
 public class URLResolver
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java b/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
index 9b125616e..6a5d26da3 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
@@ -74,7 +74,7 @@ import org.apache.tools.ant.taskdefs.MatchingTask;
 /**
  * Translates text embedded in files using Resource Bundle files.
  *
- * @author <a href="mailto:umagesh@rediffmail.com">Magesh Umasankar</a>
+ * @author Magesh Umasankar
  */
 public class Translate extends MatchingTask {
 
@@ -228,8 +228,8 @@ public class Translate extends MatchingTask {
     }
 
     /**
-     * Whether or not to overwrite existing file irrespective of 
-     * whether it is newer than the source file as well as the 
+     * Whether or not to overwrite existing file irrespective of
+     * whether it is newer than the source file as well as the
      * resource bundle file.
      * Defaults to false.
      */
@@ -503,7 +503,8 @@ public class Translate extends MatchingTask {
                             Project.MSG_DEBUG);
                     }
                     destLastModified = dest.lastModified();
-                    srcLastModified = new File(srcFiles[i]).lastModified();
+                    File src = fileUtils.resolveFile(ds.getBasedir(), srcFiles[j]);
+                    srcLastModified = src.lastModified();
                     //Check to see if dest file has to be recreated
                     if (forceOverwrite
                         || destLastModified < srcLastModified
@@ -517,10 +518,10 @@ public class Translate extends MatchingTask {
                         log("Processing " + srcFiles[j],
                             Project.MSG_DEBUG);
                         FileOutputStream fos = new FileOutputStream(dest);
-                        BufferedWriter out 
+                        BufferedWriter out
                             = new BufferedWriter(new OutputStreamWriter(fos, destEncoding));
-                        FileInputStream fis = new FileInputStream(srcFiles[j]);
-                        BufferedReader in 
+                        FileInputStream fis = new FileInputStream(src);
+                        BufferedReader in
                             = new BufferedReader(new InputStreamReader(fis, srcEncoding));
                         String line;
                         while ((line = in.readLine()) != null) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
index 78668ed8c..df024f813 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
@@ -120,7 +120,7 @@ public class JspC extends MatchingTask {
     private String compilerName = "jasper";
 
     /**
-     *  -ieplugin <clsid>Java Plugin classid for Internet Explorer
+     *  -ieplugin &lt;clsid&gt; Java Plugin classid for Internet Explorer
      */
     private String iepluginid ;
     private boolean mapped ;
@@ -134,25 +134,25 @@ public class JspC extends MatchingTask {
     protected boolean failOnError = true;
         
     /**
-     *  -uribase <dir>The uri directory compilations should be relative to
+     *  -uribase &lt;dir&gt; The uri directory compilations should be relative to
      *  (Default is "/")
      */
 
     private File uribase;
 
     /**
-     *  -uriroot <dir>The root directory that uri files should be resolved
+     *  -uriroot &lt;dir&gt; The root directory that uri files should be resolved
      *  against, 
      */
     private File uriroot;
 
     /**
-     *  -webinc <file>Creates partial servlet mappings for the -webapp option
+     *  -webinc &lt;file&gt; Creates partial servlet mappings for the -webapp option
      */
     private File webinc;
 
     /**
-     *  -webxml <file>Creates a complete web.xml when using the -webapp option.
+     *  -webxml &lt;file&gt; Creates a complete web.xml when using the -webapp option.
      */
 
     private File webxml;
@@ -298,7 +298,7 @@ public class JspC extends MatchingTask {
     }
 
     /**
-     *  -webxml <file>Creates a complete web.xml when using the -webapp option.
+     *  -webxml &lt;file&gt; Creates a complete web.xml when using the -webapp option.
      *
      * @param  webxml  The new Webxml value
      */
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java
index 2b11f7543..34a854e06 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java
@@ -57,7 +57,7 @@ package org.apache.tools.ant.taskdefs.optional.jsp.compilers;
 import org.apache.tools.ant.Project;
 
 import org.apache.tools.ant.taskdefs.optional.jsp.JspC;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.ant.types.CommandlineJava;
 
 import java.util.Vector;
 import java.util.Enumeration;
@@ -83,8 +83,8 @@ public abstract class DefaultJspCompilerAdapter
      */
     protected void logAndAddFilesToCompile(JspC jspc,
                                            Vector compileList,
-                                           Commandline cmd) {
-        jspc.log("Compilation " + cmd.describeArguments(), 
+                                           CommandlineJava cmd) {
+        jspc.log("Compilation " + cmd.describeJavaCommand(),
                  Project.MSG_VERBOSE);
 
         StringBuffer niceSourceList = new StringBuffer("File");
@@ -130,7 +130,7 @@ public abstract class DefaultJspCompilerAdapter
      *
      * @param  argument  The argument
      */
-    protected void addArg(Commandline cmd, String argument) {
+    protected void addArg(CommandlineJava cmd, String argument) {
         if (argument != null && argument.length() != 0) {
            cmd.createArgument().setValue(argument);
         }
@@ -143,7 +143,7 @@ public abstract class DefaultJspCompilerAdapter
      * @param  argument  The argument
      * @param  value     the parameter
      */
-    protected void addArg(Commandline cmd, String argument, String value) {
+    protected void addArg(CommandlineJava cmd, String argument, String value) {
         if (value != null) {
             cmd.createArgument().setValue(argument);
             cmd.createArgument().setValue(value);
@@ -156,7 +156,7 @@ public abstract class DefaultJspCompilerAdapter
      * @param  argument  The argument
      * @param  file     the parameter
      */
-    protected void addArg(Commandline cmd, String argument, File file) {
+    protected void addArg(CommandlineJava cmd, String argument, File file) {
         if (file != null) {
             cmd.createArgument().setValue(argument);
             cmd.createArgument().setFile(file);
@@ -171,5 +171,13 @@ public abstract class DefaultJspCompilerAdapter
     public boolean implementsOwnDependencyChecking() {
         return false;
     }
+
+    /**
+     * get our project
+     * @return owner project data
+     */
+    public Project getProject() {
+        return getJspc().getProject();
+    }
 }
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java
index 78a233fd0..c6d1ca206 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java
@@ -56,12 +56,13 @@ package org.apache.tools.ant.taskdefs.optional.jsp.compilers;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.ant.types.CommandlineJava;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.taskdefs.optional.jsp.JspC;
 import org.apache.tools.ant.taskdefs.optional.jsp.JspMangler;
 import org.apache.tools.ant.taskdefs.optional.jsp.JspNameMangler;
 import org.apache.tools.ant.taskdefs.Java;
+import org.apache.tools.ant.taskdefs.ExecuteJava;
 
 import java.io.File;
 
@@ -80,20 +81,41 @@ public class JasperC extends DefaultJspCompilerAdapter {
     public boolean execute()
         throws BuildException {
         getJspc().log("Using jasper compiler", Project.MSG_VERBOSE);
-        Commandline cmd = setupJasperCommand();
+        CommandlineJava cmd = setupJasperCommand();
+        /*
+        Path classpath=cmd.createClasspath(getProject());
+        if (getJspc().getClasspath() != null) {
+            classpath=getJspc().getClasspath();
+        } else {
+            classpath.concatSystemClasspath();
+        }
+        ExecuteJava exec=new ExecuteJava();
+        exec.execute(getProject());
+        if ((err = executeJava()) != 0) {
+            if (failOnError) {
+                throw new BuildException("Java returned: " + err, location);
+            } else {
+                log("Java Result: " + err, Project.MSG_ERR);
+            }
+        */
+
 
         try {
             // Create an instance of the compiler, redirecting output to
             // the project log
             // REVISIT. ugly. 
-            Java java = (Java) (getJspc().getProject()).createTask("java");
+            Java java = (Java) (getProject().createTask("java"));
             if (getJspc().getClasspath() != null) {
                 java.setClasspath(getJspc().getClasspath());
             } else {
-                java.setClasspath(Path.systemClasspath);
+                Path classpath=new Path(getProject());
+                classpath.concatSystemClasspath();
+                java.setClasspath(classpath);
             }
+            java.setDir(getProject().getBaseDir());
             java.setClassname("org.apache.jasper.JspC");
-            String args[] = cmd.getArguments();
+            //this is really irritating; we need a way to set stuff
+            String args[] = cmd.getJavaCommand().getArguments();
             for (int i = 0; i < args.length; i++) {
                 java.createArg().setValue(args[i]);
             }
@@ -104,7 +126,6 @@ public class JasperC extends DefaultJspCompilerAdapter {
             java.execute();
             return true;
         } catch (Exception ex) {
-            //@todo implement failonerror support here?
             if (ex instanceof BuildException) {
                 throw (BuildException) ex;
             } else {
@@ -122,8 +143,8 @@ public class JasperC extends DefaultJspCompilerAdapter {
      * build up a command line
      * @return a command line for jasper
      */
-    private Commandline setupJasperCommand() {
-        Commandline cmd = new Commandline();
+    private CommandlineJava setupJasperCommand() {
+        CommandlineJava cmd = new CommandlineJava();
         JspC jspc = getJspc();
         addArg(cmd, "-d", jspc.getDestdir());
         addArg(cmd, "-p", jspc.getPackage());
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
index 6d4f63c17..80fa156a7 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
@@ -611,17 +611,8 @@ public class FTP
             if (!dirCache.contains(dir)) {
                 log("creating remote directory " + resolveFile(dir.getPath()),
                     Project.MSG_VERBOSE);
-                ftp.makeDirectory(resolveFile(dir.getPath()));
-                // Both codes 550 and 553 can be produced by FTP Servers
-                //  to indicate that an attempt to create a directory has
-                //  failed because the directory already exists.
-                int result = ftp.getReplyCode();
-
-                if (!FTPReply.isPositiveCompletion(result) &&
-                    (result != 550) && (result != 553) &&
-                    !ignoreNoncriticalErrors) {
-                    throw new BuildException("could not create directory: " +
-                        ftp.getReplyString());
+                if(!ftp.makeDirectory(resolveFile(dir.getPath()))) {
+                    handleMkDirFailure(ftp);
                 }
                 dirCache.addElement(dir);
             }
@@ -880,15 +871,7 @@ public class FTP
             // codes 521, 550 and 553 can be produced by FTP Servers
             //  to indicate that an attempt to create a directory has
             //  failed because the directory already exists.
-
-            int rc = ftp.getReplyCode();
-
-            if (!(ignoreNoncriticalErrors
-                 && (rc == 550 || rc == 553 || rc == 521))) {
-                throw new BuildException("could not create directory: " +
-                    ftp.getReplyString());
-            }
-
+            handleMkDirFailure(ftp);
             if (verbose) {
                 log("directory already exists");
             }
@@ -899,6 +882,21 @@ public class FTP
         }
     }
 
+    /**
+     * look at the response for a failed mkdir action, decide whether
+     * it matters or not. If it does, we throw an exception
+     * @param ftp current ftp connection
+     * @throws BuildException if this is an error to signal
+     */
+    private void handleMkDirFailure(FTPClient ftp) 
+            throws BuildException {
+        int rc=ftp.getReplyCode();
+        if (!(ignoreNoncriticalErrors
+             && (rc == 550 || rc == 553 || rc == 521))) {
+            throw new BuildException("could not create directory: " +
+                ftp.getReplyString());
+        }
+    }
 
     /** Runs the task.  */
     public void execute()
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java
index 11528fded..d4f98d54b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java
@@ -62,11 +62,32 @@ import org.apache.tools.ant.*;
 import org.apache.tools.ant.util.JavaEnvUtils;
 
 /**
- * proxy definition task. This allows all tasks in the build file
- * executed after this task to access the web through a proxy server
+ * Sets Java's web proxy properties, so that tasks and code run in
+ * the same JVM can have through-the-firewall access to remote web sites,
+ * and remote ftp sites.
+ * You can nominate an http and ftp proxy, or a socks server, reset the server 
+ * settings, or do nothing at all.
+ * <p> 
+ * Examples
+ * <pre>&lt;setproxy/&gt;</pre>
+ * do nothing
+ * <pre>&lt;setproxy proxyhost="firewall"/&gt;</pre>
+ * set the proxy to firewall:80
+ * <pre>&lt;setproxy proxyhost="firewall" proxyport="81"/&gt;</pre>
+ * set the proxy to firewall:81
+ * <pre>&lt;setproxy proxyhost=""/&gt;</pre>
+ * stop using the http proxy; don't change the socks settings
+ * <pre>&lt;setproxy socksproxyhost="socksy"/&gt;</pre>
+ * use socks via socksy:1080
+ * <pre>&lt;setproxy socksproxyhost=""/&gt;</pre>
+ * stop using the socks server
+ 
+ 
+ 
  * @see <a href="http://java.sun.com/j2se/1.4/docs/guide/net/properties.html">
  *  java 1.4 network property list</a>
  * @author Steve Loughran
+  *@since       Ant 1.5
  * @ant.task
  */
 public class SetProxy extends Task {
@@ -98,7 +119,8 @@ public class SetProxy extends Task {
     private String nonProxyHosts = null;
 
     /**
-     * Set a proxy host. The port should be defined too.
+     * the HTTP/ftp proxy host. Set this to "" for the http proxy
+     * option to be disabled
      *
      * @param hostname the new proxy hostname
      */
@@ -108,7 +130,7 @@ public class SetProxy extends Task {
 
 
     /**
-     * set the proxy port number.
+     * the HTTP/ftp proxy port number; default is 80
      *
      * @param port port number of the proxy
      */
@@ -117,7 +139,8 @@ public class SetProxy extends Task {
     }
 
     /**
-     * Set the SocksProxyHost attribute
+     * The name of a Socks server. Set to "" to turn socks
+     * proxying off.
      *
      * @param host The new SocksProxyHost value
      */
@@ -127,7 +150,7 @@ public class SetProxy extends Task {
 
 
     /**
-     * Set the SocksProxyPort attribute
+     * Set the ProxyPort for socks connections. The default value is 1080
      *
      * @param port The new SocksProxyPort value
      */
@@ -136,8 +159,9 @@ public class SetProxy extends Task {
     }
 
     /**
-     * Specify a list of hosts to bypass the proxy on. These should be separated
-     * with the vertical bar character '|'.
+     * A list of hosts to bypass the proxy on. These should be separated
+     * with the vertical bar character '|'. Only in Java 1.4 does ftp use
+     * this list.
      * e.g. fozbot.corp.sun.com|*.eng.sun.com
      * @param nonProxyHosts lists of hosts to talk direct to
      */ 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
index c702262ca..6204afc19 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
@@ -327,7 +327,9 @@ public class TelnetTask extends Task {
                             Thread.sleep(250);
                         }
                         if (is.available() == 0) {
-                            throw new BuildException("Response Timed-Out", getLocation());
+                            throw new BuildException(
+                                "Response timed-out waiting for \""+s+'\"', 
+                                getLocation());
                         }
                         sb.append((char) is.read());
                     }
diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java b/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
index 0b5f71f94..2f06f3850 100644
--- a/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
@@ -116,7 +116,7 @@ public abstract class DefaultRmicAdapter implements RmicAdapter {
      *   <li>for JRMP it will return *_getStubClassSuffix (and
      *   *_getSkelClassSuffix if JDK 1.1 is used)</li>
      *
-     *   <li>for IDL it will return a random name, causing <rmic> to
+     *   <li>for IDL it will return a random name, causing &lt;rmic&gt; to
      *     always recompile.</li>
      *
      *   <li>for IIOP it will return _*_getStubClassSuffix for
diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
index 00b4a4bb6..31af72392 100644
--- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java
+++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
@@ -89,7 +89,7 @@ public abstract class AbstractFileSet extends DataType implements Cloneable,
     private File dir;
     private boolean useDefaultExcludes = true;
     private boolean isCaseSensitive = true;
-
+    private boolean followSymlinks = true;
 
     public AbstractFileSet() {
         super();
@@ -101,6 +101,7 @@ public abstract class AbstractFileSet extends DataType implements Cloneable,
         this.additionalPatterns = fileset.additionalPatterns;
         this.useDefaultExcludes = fileset.useDefaultExcludes;
         this.isCaseSensitive = fileset.isCaseSensitive;
+        this.followSymlinks = fileset.followSymlinks;
         setProject(fileset.getProject());
     }
 
@@ -111,12 +112,15 @@ public abstract class AbstractFileSet extends DataType implements Cloneable,
      * this element if you make it a reference.</p>
      */
     public void setRefid(Reference r) throws BuildException {
-        if (dir != null || defaultPatterns.hasPatterns()) {
+        if (dir != null || defaultPatterns.hasPatterns(getProject())) {
             throw tooManyAttributes();
         }
         if (!additionalPatterns.isEmpty()) {
             throw noChildrenAllowed();
         }
+        if (!selectors.isEmpty()) {
+            throw noChildrenAllowed();
+        }
         super.setRefid(r);
     }
 
@@ -276,7 +280,14 @@ public abstract class AbstractFileSet extends DataType implements Cloneable,
         this.isCaseSensitive = isCaseSensitive;
     }
 
-
+    /**
+     * Sets whether or not symbolic links should be followed.
+     *
+     * @param followSymlinks whether or not symbolic links should be followed
+     */
+    public void setFollowSymlinks(boolean followSymlinks) {
+        this.followSymlinks = followSymlinks;
+    }
 
     /**
      * sets the name used for this datatype instance.
@@ -327,6 +338,7 @@ public abstract class AbstractFileSet extends DataType implements Cloneable,
 
         DirectoryScanner ds = new DirectoryScanner();
         setupDirectoryScanner(ds, p);
+        ds.setFollowSymlinks(followSymlinks);
         ds.scan();
         return ds;
     }
@@ -392,6 +404,27 @@ public abstract class AbstractFileSet extends DataType implements Cloneable,
         return !(selectors.isEmpty());
     }
 
+    /**
+     * Indicates whether there are any patterns here.
+     *
+     * @return whether any patterns are in this container
+     */
+    public boolean hasPatterns() {
+        if (defaultPatterns.hasPatterns(getProject())) {
+            return true;
+        }
+
+        Enumeration enum = additionalPatterns.elements();
+        while (enum.hasMoreElements()) {
+            PatternSet ps = (PatternSet) enum.nextElement();
+            if (ps.hasPatterns(getProject())) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * Gives the count of the number of selectors in this container
      *
@@ -437,7 +470,14 @@ public abstract class AbstractFileSet extends DataType implements Cloneable,
         selectors.addElement(selector);
     }
 
-    /* Methods below all implement the static selectors */
+    /* Methods below all add specific selectors */
+
+    /**
+     * add a "Select" selector entry on the selector list
+     */
+    public void addSelector(SelectSelector selector) {
+        appendSelector(selector);
+    }
 
     /**
      * add an "And" selector entry on the selector list
@@ -477,56 +517,56 @@ public abstract class AbstractFileSet extends DataType implements Cloneable,
     /**
      * add a selector date entry on the selector list
      */
-    public void addDateselect(DateSelector selector) {
+    public void addDate(DateSelector selector) {
         appendSelector(selector);
     }
 
     /**
      * add a selector size entry on the selector list
      */
-    public void addSizeselect(SizeSelector selector) {
+    public void addSize(SizeSelector selector) {
         appendSelector(selector);
     }
 
     /**
      * add a selector filename entry on the selector list
      */
-    public void addFilenameselect(FilenameSelector selector) {
+    public void addFilename(FilenameSelector selector) {
         appendSelector(selector);
     }
 
     /**
      * add an extended selector entry on the selector list
      */
-    public void addExtendSelect(ExtendSelector selector) {
+    public void addCustom(ExtendSelector selector) {
         appendSelector(selector);
     }
 
     /**
      * add a contains selector entry on the selector list
      */
-    public void addContainsSelect(ContainsSelector selector) {
+    public void addContains(ContainsSelector selector) {
         appendSelector(selector);
     }
 
     /**
      * add a present selector entry on the selector list
      */
-    public void addPresentSelect(PresentSelector selector) {
+    public void addPresent(PresentSelector selector) {
         appendSelector(selector);
     }
 
     /**
      * add a depth selector entry on the selector list
      */
-    public void addDepthSelect(DepthSelector selector) {
+    public void addDepth(DepthSelector selector) {
         appendSelector(selector);
     }
 
     /**
      * add a depends selector entry on the selector list
      */
-    public void addDependSelect(DependSelector selector) {
+    public void addDepend(DependSelector selector) {
         appendSelector(selector);
     }
 
diff --git a/src/main/org/apache/tools/ant/types/Commandline.java b/src/main/org/apache/tools/ant/types/Commandline.java
index e19b9e985..23eeab308 100644
--- a/src/main/org/apache/tools/ant/types/Commandline.java
+++ b/src/main/org/apache/tools/ant/types/Commandline.java
@@ -488,7 +488,7 @@ public class Commandline implements Cloneable {
     /**
      * Returns a String that describes the command and arguments
      * suitable for verbose output before a call to
-     * <code>Runtime.exec(String[])<code>
+     * <code>Runtime.exec(String[])<code>.
      *
      * <p>This method assumes that the first entry in the array is the
      * executable to run.</p>
diff --git a/src/main/org/apache/tools/ant/types/CommandlineJava.java b/src/main/org/apache/tools/ant/types/CommandlineJava.java
index 12e5bc337..8ea71bf7e 100644
--- a/src/main/org/apache/tools/ant/types/CommandlineJava.java
+++ b/src/main/org/apache/tools/ant/types/CommandlineJava.java
@@ -72,8 +72,17 @@ import org.apache.tools.ant.util.JavaEnvUtils;
  */
 public class CommandlineJava implements Cloneable {
 
+    /**
+     * commands to the JVM
+     */
     private Commandline vmCommand = new Commandline();
+    /**
+     * actual java commands
+     */
     private Commandline javaCommand = new Commandline();
+    /**
+     * properties to add using -D
+     */
     private SysProperties sysProperties = new SysProperties();
     private Path classpath = null;
     private String vmVersion;
@@ -151,6 +160,9 @@ public class CommandlineJava implements Cloneable {
 
     }
 
+    /**
+     * constructor uses the VM we are running on now.
+     */
     public CommandlineJava() {
         setVm(JavaEnvUtils.getJreExecutable("java"));
         setVmversion(JavaEnvUtils.getJavaVersion());
@@ -178,7 +190,7 @@ public class CommandlineJava implements Cloneable {
 
     /**
      * set a jar file to execute via the -jar option.
-     * @param the pathname of the jar to execute
+     * @param jarpathname the pathname of the jar to execute
      */
     public void setJar(String jarpathname){
         javaCommand.setExecutable(jarpathname);
@@ -272,6 +284,7 @@ public class CommandlineJava implements Cloneable {
     }
 
     /**
+     * Specify max memory of the JVM
      * -mx or -Xmx depending on VM version
      */
     public void setMaxmemory(String max){
@@ -279,6 +292,10 @@ public class CommandlineJava implements Cloneable {
     }
 
 
+    /**
+     * get a string description
+     * @return the command line as a string
+     */
     public String toString() {
         return Commandline.toString(getCommandline());
     }
@@ -361,6 +378,10 @@ public class CommandlineJava implements Cloneable {
         return sysProperties;
     }
 
+    /**
+     * clone the object; do a deep clone of all fields in the class
+     * @return a CommandlineJava object
+     */
     public Object clone() {
         CommandlineJava c = new CommandlineJava();
         c.vmCommand = (Commandline) vmCommand.clone();
diff --git a/src/main/org/apache/tools/ant/types/Path.java b/src/main/org/apache/tools/ant/types/Path.java
index 97cc61e17..3d528d263 100644
--- a/src/main/org/apache/tools/ant/types/Path.java
+++ b/src/main/org/apache/tools/ant/types/Path.java
@@ -240,7 +240,7 @@ public class Path extends DataType implements Cloneable {
      */
     public void append(Path other) {
         if (other == null) {
-          return;
+            return;
         }
         String[] l = other.list();
         for (int i = 0; i < l.length; i++) {
diff --git a/src/main/org/apache/tools/ant/types/PatternSet.java b/src/main/org/apache/tools/ant/types/PatternSet.java
index d5d0d2a16..e223aeef9 100644
--- a/src/main/org/apache/tools/ant/types/PatternSet.java
+++ b/src/main/org/apache/tools/ant/types/PatternSet.java
@@ -382,9 +382,13 @@ public class PatternSet extends DataType {
     /**
      * helper for FileSet.
      */
-    boolean hasPatterns() {
-        return includesFileList.size() > 0 || excludesFileList.size() > 0 
-            || includeList.size() > 0 || excludeList.size() > 0;
+    boolean hasPatterns(Project p) {
+        if (isReference()) {
+            return getRef(p).hasPatterns(p);
+        } else {
+            return includesFileList.size() > 0 || excludesFileList.size() > 0 
+                || includeList.size() > 0 || excludeList.size() > 0;
+        }
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/types/XMLCatalog.java b/src/main/org/apache/tools/ant/types/XMLCatalog.java
index c03f3d64d..cb996ae24 100644
--- a/src/main/org/apache/tools/ant/types/XMLCatalog.java
+++ b/src/main/org/apache/tools/ant/types/XMLCatalog.java
@@ -58,57 +58,111 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.IOException;
+import java.io.FileNotFoundException;
 import java.net.URL;
+import java.net.MalformedURLException;
 import java.util.Enumeration;
+import java.util.Stack;
 import java.util.Vector;
+import javax.xml.transform.Source;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.URIResolver;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.AntClassLoader;
+import org.apache.tools.ant.util.FileUtils;
+
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
-import org.apache.tools.ant.util.LoaderUtils;
-import org.apache.tools.ant.util.FileUtils;
+import org.xml.sax.XMLReader;
+
+
 
 /**
- * This data type provides a catalog of DTD locations.
- * <p>
+ * <p>This data type provides a catalog of resource locations (such as
+ * DTDs and XML entities), based on the <a
+ * href="http://oasis-open.org/committees/entity/spec-2001-08-06.html">
+ * OASIS "Open Catalog" standard</a>.  The catalog entries are used
+ * both for Entity resolution and URI resolution, in accordance with
+ * the {@link org.xml.sax.EntityResolver EntityResolver} and {@link
+ * javax.xml.transform.URIResolver URIResolver} interfaces as defined
+ * in the <a href="http://java.sun.com/xml/jaxp">Java API for XML
+ * Processing Specification</a>.</p>
+ *
+ * <p>Currently, only <code>&lt;dtd&gt;</code> and
+ * <code>&lt;entity&gt;</code> elements may be specified inline; these
+ * correspond to OASIS catalog entry types <code>PUBLIC</code> and
+ * <code>URI</code> respectively.</p>
+ *
+ * <p>The following is a usage example:</p>
+ *
  * <code>
- * &lt;catalog&gt;<br>
+ * &lt;xmlcatalog&gt;<br>
  * &nbsp;&nbsp;&lt;dtd publicId="" location="/path/to/file.jar" /&gt;<br>
- * &nbsp;&nbsp;&lt;dtd publicId location="/path/to/file2.jar" /gt;<br>
+ * &nbsp;&nbsp;&lt;dtd publicId="" location="/path/to/file2.jar" /&gt;<br>
  * &nbsp;&nbsp;&lt;entity publicId="" location="/path/to/file3.jar" /&gt;<br>
  * &nbsp;&nbsp;&lt;entity publicId="" location="/path/to/file4.jar" /&gt;<br>
- * &lt;/catalog&gt;<br>
+ * &lt;/xmlcatalog&gt;<br>
  * </code>
  * <p>
  * The object implemention <code>sometask</code> must provide a method called
- * <code>createCatalog</code> which returns an instance of 
+ * <code>createXMLCatalog</code> which returns an instance of
  * <code>XMLCatalog</code>. Nested DTD and entity definitions are handled by
  * the XMLCatalog object and must be labeled <code>dtd</code> and
  * <code>entity</code> respectively.</p>
  *
- * <p>Possible future extension could allow a catalog file instead of nested
- * elements, or use Norman Walsh's entity resolver from xml-commons</p>
+ * <p>The following is a description of the resolution algorithm:
+ * entities/URIs/dtds are looked up in each of the following contexts,
+ * stopping when a valid and readable resource is found:
+ * <ol>
+ * <li>In the local filesystem</li>
+ * <li>In the classpath</li>
+ * <li>In URL-space</li>
+ * </ol>
+ * </p>
+ *
+ * <p>See {@link
+ * org.apache.tools.ant.taskdefs.optional.XMLValidateTask
+ * XMLValidateTask} for an example of a task that has integrated
+ * support for XMLCatalogs.</p>
+ *
+ * <p>Possible future extension could provide for additional OASIS
+ * entry types to be specified inline, and external catalog files
+ * using the xml-commons resolver library</p>
  *
  * @author dIon Gillard
  * @author Erik Hatcher
+ * @author <a href="mailto:cstrong@arielpartners.com">Craeg Strong</a>
  * @version $Id$
  */
-public class XMLCatalog extends DataType implements Cloneable, EntityResolver {
+public class XMLCatalog extends DataType implements Cloneable, EntityResolver, URIResolver {
     /** File utilities instance */
     private FileUtils fileUtils = FileUtils.newFileUtils();
-    
+
     //-- Fields ----------------------------------------------------------------
-    
+
     /** holds dtd/entity objects until needed */
     private Vector elements = new Vector();
 
+    /**
+     * Classpath in which to attempt to resolve resources.
+     */
     private Path classpath;
 
     //-- Methods ---------------------------------------------------------------
-    
+
+    public XMLCatalog() {
+        checked = false;
+    }
+
     /**
+     * Returns the elements of the catalog - DTDLocation objects.
+     *
      * @return the elements of the catalog - DTDLocation objects
      */
     private Vector getElements() {
@@ -116,6 +170,8 @@ public class XMLCatalog extends DataType implements Cloneable, EntityResolver {
     }
 
     /**
+     * Returns the classpath in which to attempt to resolve resources.
+     *
      * @return the classpath
      */
     private Path getClasspath() {
@@ -123,25 +179,22 @@ public class XMLCatalog extends DataType implements Cloneable, EntityResolver {
     }
 
     /**
-     * Set the list of DTDLocation object sin the catalog
+     * Set the list of DTDLocation objects in the catalog.  Not
+     * allowed if this catalog is itself a reference to another
+     * catalog -- that is, a catalog cannot both refer to another
+     * <em>and</em> contain elements or other attributes.
      *
      * @param aVector the new list of DTD Locations to use in the catalog.
      */
     private void setElements(Vector aVector) {
         elements = aVector;
     }
-    
-    /**
-     * Add a DTD Location to the catalog
-     *
-     * @param aDTD the DTDLocation instance to be aded to the catalog
-     */
-    private void addElement(DTDLocation aDTD) {
-        getElements().addElement(aDTD);
-    }
 
     /**
-     * Allows nested classpath elements
+     * Allows nested classpath elements. Not allowed if this catalog
+     * is itself a reference to another catalog -- that is, a catalog
+     * cannot both refer to another <em>and</em> contain elements or
+     * other attributes.
      */
     public Path createClasspath() {
         if (isReference()) {
@@ -150,11 +203,15 @@ public class XMLCatalog extends DataType implements Cloneable, EntityResolver {
         if (this.classpath == null) {
             this.classpath = new Path(getProject());
         }
+        checked = false;
         return this.classpath.createPath();
     }
 
     /**
-     * Allows simple classpath string
+     * Allows simple classpath string.  Not allowed if this catalog is
+     * itself a reference to another catalog -- that is, a catalog
+     * cannot both refer to another <em>and</em> contain elements or
+     * other attributes.
      */
     public void setClasspath(Path classpath) {
         if (isReference()) {
@@ -165,23 +222,32 @@ public class XMLCatalog extends DataType implements Cloneable, EntityResolver {
         } else {
             this.classpath.append(classpath);
         }
+        checked = false;
     }
 
     /**
-     * Allows classpath reference
+     * Allows classpath reference.  Not allowed if this catalog is
+     * itself a reference to another catalog -- that is, a catalog
+     * cannot both refer to another <em>and</em> contain elements or
+     * other attributes.
      */
     public void setClasspathRef(Reference r) {
         if (isReference()) {
             throw tooManyAttributes();
         }
         createClasspath().setRefid(r);
+        checked = false;
     }
 
     /**
-     * Creates the nested <code>&lt;dtd&gt;</code> element.
+     * Creates the nested <code>&lt;dtd&gt;</code> element.  Not
+     * allowed if this catalog is itself a reference to another
+     * catalog -- that is, a catalog cannot both refer to another
+     * <em>and</em> contain elements or other attributes.
      *
-     * @param dtd the infromation about the DTD to be added to the catalog
-     * @exception BuildException if this is a reference and no nested 
+     * @param dtd the information about the PUBLIC resource mapping to
+     *            be added to the catalog
+     * @exception BuildException if this is a reference and no nested
      *       elements are allowed.
      */
     public void addDTD(DTDLocation dtd) throws BuildException {
@@ -190,13 +256,18 @@ public class XMLCatalog extends DataType implements Cloneable, EntityResolver {
         }
 
         getElements().addElement(dtd);
+        checked = false;
     }
-    
+
     /**
-     * Creates the nested <code>&lt;entity&gt;</code> element
+     * Creates the nested <code>&lt;entity&gt;</code> element.    Not
+     * allowed if this catalog is itself a reference to another
+     * catalog -- that is, a catalog cannot both refer to another
+     * <em>and</em> contain elements or other attributes.
      *
-     * @param dtd the infromation about the DTD to be added to the catalog
-     * @exception BuildException if this is a reference and no nested 
+     * @param dtd the information about the URI resource mapping to be
+     *       added to the catalog
+     * @exception BuildException if this is a reference and no nested
      *       elements are allowed.
      */
     public void addEntity(DTDLocation dtd) throws BuildException {
@@ -204,7 +275,10 @@ public class XMLCatalog extends DataType implements Cloneable, EntityResolver {
     }
 
     /**
-     * Loads a nested XMLCatalog into our definition
+     * Loads a nested <code>&lt;xmlcatalog&gt;</code> into our
+     * definition.  Not allowed if this catalog is itself a reference
+     * to another catalog -- that is, a catalog cannot both refer to
+     * another <em>and</em> contain elements or other attributes.
      *
      * @param catalog Nested XMLCatalog
      */
@@ -224,15 +298,19 @@ public class XMLCatalog extends DataType implements Cloneable, EntityResolver {
         // Append the classpath of the nested catalog
         Path nestedClasspath = catalog.getClasspath();
         createClasspath().append(nestedClasspath);
+        checked = false;
     }
 
     /**
-     * Makes this instance in effect a reference to another XCatalog instance.
+     * Makes this instance in effect a reference to another XMLCatalog
+     * instance.
      *
      * <p>You must not set another attribute or nest elements inside
-     * this element if you make it a reference.</p>
+     * this element if you make it a reference.  That is, a catalog
+     * cannot both refer to another <em>and</em> contain elements or
+     * attributes.</p>
      *
-     * @param r the reference to which this catalogi instance is associated
+     * @param r the reference to which this catalog instance is associated
      * @exception BuildException if this instance already has been configured.
      */
     public void setRefid(Reference r) throws BuildException {
@@ -241,7 +319,7 @@ public class XMLCatalog extends DataType implements Cloneable, EntityResolver {
         }
         // change this to get the objects from the other reference
         Object o = r.getReferencedObject(getProject());
-        // we only support references to other XCatalogs
+        // we only support references to other XMLCatalogs
         if (o instanceof XMLCatalog) {
             // set all elements from referenced catalog to this one
             XMLCatalog catalog = (XMLCatalog) o;
@@ -250,81 +328,81 @@ public class XMLCatalog extends DataType implements Cloneable, EntityResolver {
             String msg = r.getRefId() + " does not refer to an XMLCatalog";
             throw new BuildException(msg);
         }
-
         super.setRefid(r);
     }
 
     /**
+     * Implements the EntityResolver.resolveEntity() interface method.
+     *
      * @see org.xml.sax.EntityResolver#resolveEntity
      */
     public InputSource resolveEntity(String publicId, String systemId)
         throws SAXException, IOException {
-        InputSource source = null;
-        DTDLocation matchingDTD = findMatchingDTD(publicId);
-        if (matchingDTD != null) {
-            // check if publicId is mapped to a file
-            log("Matching DTD found for publicId: '" + publicId +
-                "' location: '" + matchingDTD.getLocation() + "'",
-                Project.MSG_DEBUG);
-            File dtdFile = project.resolveFile(matchingDTD.getLocation());
-            if (dtdFile.exists() && dtdFile.canRead()) {
-                source = new InputSource(new FileInputStream(dtdFile));
-                URL dtdFileURL = fileUtils.getFileURL(dtdFile);
-                source.setSystemId(dtdFileURL.toExternalForm());
-                log("matched a readable file", Project.MSG_DEBUG);
-            } else {
-                // check if publicId is a resource
-
-                AntClassLoader loader = null;
-                if (classpath != null) {
-                    loader = new AntClassLoader(project, classpath);
-                } else {
-                    loader = new AntClassLoader(project, Path.systemClasspath);
-                }
 
-                InputStream is
-                    = loader.getResourceAsStream(matchingDTD.getLocation());
-                if (is != null) {
-                    source = new InputSource(is);
-                    source.setSystemId(loader.getResource(
-                        matchingDTD.getLocation()).toExternalForm());
-                    log("matched a resource", Project.MSG_DEBUG);
-                } else {
-                    // check if it's a URL
-                    try {
-                        URL dtdUrl = new URL(matchingDTD.getLocation());
-                        InputStream dtdIs = dtdUrl.openStream();
-                        if (dtdIs != null) {
-                            source = new InputSource(dtdIs);
-                            source.setSystemId(dtdUrl.toExternalForm());
-                            log("matched as a URL", Project.MSG_DEBUG);
-                        } else {
-                            log("No match, parser will use: '" + systemId + "'",
-                                Project.MSG_DEBUG);
-                        }
-                    } catch (IOException ioe) {
-                        //ignore
-                    }
-                }
-            }
-        } else {
-            log("No match, parser will use: '" + systemId + "'",
-                Project.MSG_DEBUG);
+       if (!checked) {
+          // make sure we don't have a circular reference here
+          Stack stk = new Stack();
+          stk.push(this);
+          dieOnCircularReference(stk, getProject());
+       }
+
+        log("resolveEntity: '" + publicId + "': '" + systemId + "'",
+            Project.MSG_DEBUG);
+
+        InputSource inputSource = resolveEntityImpl(publicId, systemId);
+
+        if (inputSource == null) {
+            log("No matching catalog entry found, parser will use: '" +
+                systemId + "'", Project.MSG_DEBUG);
         }
-        // else let the parser handle it as a URI as we don't know what to
-        // do with it
+
+        return inputSource;
+    }
+
+    /**
+     * Implements the URIResolver.resolve() interface method.
+     *
+     * @see javax.xml.transform.URIResolver#resolve
+     */
+    public Source resolve(String href, String base)
+        throws TransformerException {
+
+       if (!checked) {
+          // make sure we don't have a circular reference here
+          Stack stk = new Stack();
+          stk.push(this);
+          dieOnCircularReference(stk, getProject());
+       }
+
+        SAXSource source = null;
+        InputSource inputSource = null;
+
+        String uri = removeFragment(href);
+
+        log("resolve: '" + uri + "' with base: '" + base + "'", Project.MSG_DEBUG);
+
+        source = resolveImpl(uri, base);
+
+        if (source == null) {
+            log("No matching catalog entry found, parser will use: '" +
+                href + "'", Project.MSG_DEBUG);
+        }
+        else {
+            setEntityResolver(source);
+        }
+
         return source;
     }
-    
+
     /**
      * Find a DTDLocation instance for the given publicId.
      *
-     * @param publicId the publicId of the DTD for which local information is 
-     *        required
-     * @return a DTDLocation instance with information on the local location 
-     *         of the DTD or null if no such information is available
+     * @param publicId the publicId of the Resource for which local information
+     *        is required
+     * @return a DTDLocation instance with information on the local location
+     *         of the Resource or null if no such information is available
      */
-    private DTDLocation findMatchingDTD(String publicId) {
+    private DTDLocation findMatchingEntry(String publicId) {
         Enumeration elements = getElements().elements();
         DTDLocation element = null;
         while (elements.hasMoreElements()) {
@@ -335,6 +413,246 @@ public class XMLCatalog extends DataType implements Cloneable, EntityResolver {
         }
         return null;
     }
-      
-}
 
+    /**
+     * <p>This is called from the URIResolver to set an EntityResolver
+     * on the SAX parser to be used for new XML documents that are
+     * encountered as a result of the document() function, xsl:import,
+     * or xsl:include.  This is done because the XSLT processor calls
+     * out to the SAXParserFactory itself to create a new SAXParser to
+     * parse the new document.  The new parser does not automatically
+     * inherit the EntityResolver of the original (although arguably
+     * it should).  See below:</p>
+     *
+     * <tt>"If an application wants to set the ErrorHandler or
+     * EntityResolver for an XMLReader used during a transformation,
+     * it should use a URIResolver to return the SAXSource which
+     * provides (with getXMLReader) a reference to the XMLReader"</tt>
+     *
+     * <p>...quoted from page 118 of the Java API for XML
+     * Processing 1.1 specification</p>
+     *
+     */
+    private void setEntityResolver(SAXSource source) throws TransformerException {
+
+        XMLReader reader = source.getXMLReader();
+        if (reader == null) {
+            SAXParserFactory spFactory = SAXParserFactory.newInstance();
+            spFactory.setNamespaceAware(true);
+            try {
+                reader = spFactory.newSAXParser().getXMLReader();
+            }
+            catch (ParserConfigurationException ex) {
+                throw new TransformerException(ex);
+            }
+            catch (SAXException ex) {
+                throw new TransformerException(ex);
+            }
+        }
+        reader.setEntityResolver(this);
+        source.setXMLReader(reader);
+    }
+
+    /**
+     * Utility method to remove trailing fragment from a URI.
+     * For example,
+     * <code>http://java.sun.com/index.html#chapter1</code>
+     * would return <code>http://java.sun.com/index.html</code>.
+     *
+     * @param uri The URI to process.  It may or may not contain a
+     *            fragment.
+     * @return The URI sans fragment.
+     */
+    private String removeFragment(String uri) {
+        String result = uri;
+        String fragment = null;
+        int hashPos = uri.indexOf("#");
+        if (hashPos >= 0) {
+            result = uri.substring(0, hashPos);
+            fragment = uri.substring(hashPos+1);
+        }
+        return result;
+    }
+
+    /**
+     * Utility method to lookup a DTDLocation in the filesystem.
+     *
+     * @return An InputSource for reading the file, or <code>null</code>
+     *     if the file does not exist or is not readable.
+     */
+    private InputSource filesystemLookup(DTDLocation matchingEntry) {
+
+        String uri = matchingEntry.getLocation();
+        File basedir = null;
+
+        //
+        // The DTDLocation may specify a relative path for its
+        // location attribute.  This is resolved using the appropriate
+        // base.
+        //
+        File resFile = project.resolveFile(uri);
+        InputSource source = null;
+
+        if (resFile.exists() && resFile.canRead()) {
+            try {
+                source = new InputSource(new FileInputStream(resFile));
+                URL resFileURL = fileUtils.getFileURL(resFile);
+                String sysid = resFileURL.toExternalForm();
+                source.setSystemId(sysid);
+                log("catalog entry matched a readable file: '" +
+                    sysid + "'", Project.MSG_DEBUG);
+            } catch(FileNotFoundException ex) {
+                // ignore
+            } catch(MalformedURLException ex) {
+                // ignore
+            } catch(IOException ex) {
+                // ignore
+            }
+        }
+
+        return source;
+    }
+
+    /**
+     * Utility method to lookup a DTDLocation in the classpath.
+     *
+     * @return An InputSource for reading the resource, or <code>null</code>
+     *    if the resource does not exist in the classpath or is not readable.
+     */
+    private InputSource classpathLookup(DTDLocation matchingEntry) {
+
+        InputSource source = null;
+
+        AntClassLoader loader = null;
+        if (classpath != null) {
+            loader = new AntClassLoader(project, classpath);
+        } else {
+            loader = new AntClassLoader(project, Path.systemClasspath);
+        }
+
+        //
+        // for classpath lookup we ignore the base directory
+        //
+        InputStream is
+            = loader.getResourceAsStream(matchingEntry.getLocation());
+
+        if (is != null) {
+            source = new InputSource(is);
+            URL entryURL = loader.getResource(matchingEntry.getLocation());
+            String sysid = entryURL.toExternalForm();
+            source.setSystemId(sysid);
+            log("catalog entry matched a resource in the classpath: '" +
+                sysid + "'", Project.MSG_DEBUG);
+        }
+
+        return source;
+    }
+
+    /**
+     * Utility method to lookup a DTDLocation in URL-space.
+     *
+     * @return An InputSource for reading the resource, or <code>null</code>
+     *    if the resource does not identify a valid URL or is not readable.
+     */
+    private InputSource urlLookup(String uri, String base) {
+
+        InputSource source = null;
+        URL url = null;
+
+        try {
+            if (base == null) {
+                url = new URL(uri);
+            }
+            else {
+                URL baseURL = new URL(base);
+                url = (uri.length() == 0 ? baseURL : new URL(baseURL, uri));
+            }
+        }
+        catch (MalformedURLException ex) {
+            // ignore
+        }
+
+        if (url != null) {
+            try {
+                InputStream is = url.openStream();
+                if (is != null) {
+                    source = new InputSource(is);
+                    String sysid = url.toExternalForm();
+                    source.setSystemId(sysid);
+                    log("catalog entry matched as a URL: '" +
+                        sysid + "'", Project.MSG_DEBUG);
+                }
+            } catch(IOException ex) {
+                // ignore
+            }
+        }
+
+        return source;
+
+    }
+
+    /**
+     * Implements the guts of the resolveEntity() lookup strategy.
+     */
+    private InputSource resolveEntityImpl(String publicId,
+                                          String systemId) {
+
+        InputSource result = null;
+
+        DTDLocation matchingEntry = findMatchingEntry(publicId);
+
+        if (matchingEntry != null) {
+
+            log("Matching catalog entry found for publicId: '" +
+                matchingEntry.getPublicId() + "' location: '" +
+                matchingEntry.getLocation() + "'",
+                Project.MSG_DEBUG);
+
+            result = filesystemLookup(matchingEntry);
+
+            if (result == null) {
+                result = classpathLookup(matchingEntry);
+            }
+
+            if (result == null) {
+                result = urlLookup(matchingEntry.getLocation(), null);
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Implements the guts of the resolve() lookup strategy.
+     */
+    private SAXSource resolveImpl(String href, String base)
+        throws TransformerException {
+
+        SAXSource result = null;
+        InputSource source = null;
+
+        DTDLocation matchingEntry = findMatchingEntry(href);
+
+        if (matchingEntry != null) {
+
+            log("Matching catalog entry found for uri: '" +
+                matchingEntry.getPublicId() + "' location: '" +
+                matchingEntry.getLocation() + "'",
+                Project.MSG_DEBUG);
+
+            source = filesystemLookup(matchingEntry);
+
+            if (source == null) {
+                source = classpathLookup(matchingEntry);
+            }
+
+            if (source == null) {
+                source = urlLookup(matchingEntry.getLocation(), base);
+            }
+
+            if (source != null) {
+                result = new SAXSource(source);
+            }
+        }
+        return result;
+    }
+}
diff --git a/src/main/org/apache/tools/ant/types/defaults.properties b/src/main/org/apache/tools/ant/types/defaults.properties
index fbaed1781..10b34082a 100644
--- a/src/main/org/apache/tools/ant/types/defaults.properties
+++ b/src/main/org/apache/tools/ant/types/defaults.properties
@@ -14,4 +14,5 @@ substitution=org.apache.tools.ant.types.Substitution
 xmlcatalog=org.apache.tools.ant.types.XMLCatalog
 extensionSet=org.apache.tools.ant.taskdefs.optional.extension.ExtensionSet
 extension=org.apache.tools.ant.taskdefs.optional.extension.ExtensionAdapter
-libfileset=org.apache.tools.ant.taskdefs.optional.extension.LibFileSet
\ No newline at end of file
+libfileset=org.apache.tools.ant.taskdefs.optional.extension.LibFileSet
+selector=org.apache.tools.ant.types.selectors.SelectSelector
diff --git a/src/main/org/apache/tools/ant/types/selectors/BaseExtendSelector.java b/src/main/org/apache/tools/ant/types/selectors/BaseExtendSelector.java
index 73095f8d3..c155130ac 100644
--- a/src/main/org/apache/tools/ant/types/selectors/BaseExtendSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/BaseExtendSelector.java
@@ -83,7 +83,7 @@ public abstract class BaseExtendSelector extends BaseSelector implements
     }
 
     /**
-     * Set all the Parameters for this dynamic selector, collected by
+     * Set all the Parameters for this custom selector, collected by
      * the ExtendSelector class.
      *
      * @param parameters the complete set of parameters for this selector
@@ -94,7 +94,7 @@ public abstract class BaseExtendSelector extends BaseSelector implements
 
     /**
      * Allows access to the parameters gathered and set within the
-     * <extendselect> tag.
+     * &lt;custom&gt; tag.
      *
      * @return the set of parameters defined for this selector
      */
diff --git a/src/main/org/apache/tools/ant/types/selectors/BaseSelector.java b/src/main/org/apache/tools/ant/types/selectors/BaseSelector.java
index b1e0a0f3f..a69b799ce 100644
--- a/src/main/org/apache/tools/ant/types/selectors/BaseSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/BaseSelector.java
@@ -118,7 +118,9 @@ public abstract class BaseSelector extends DataType implements FileSelector {
      * in isSelected() in the case of an error condition.
      */
     public void validate() {
-        verifySettings();
+        if (getError() == null) {
+            verifySettings();
+        }
         if (getError() != null) {
             throw new BuildException(errmsg);
         }
diff --git a/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java b/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java
index ac3a97f6c..a783a7999 100644
--- a/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java
+++ b/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java
@@ -98,13 +98,9 @@ public abstract class BaseSelectorContainer extends BaseSelector
      * Returns the set of selectors as an array.
      */
     public FileSelector[] getSelectors(Project p) {
-        if (isReference()) {
-            return getRef(p).getSelectors(p);
-        } else {
-            FileSelector[] result = new FileSelector[selectorsList.size()];
-            selectorsList.copyInto(result);
-            return result;
-        }
+        FileSelector[] result = new FileSelector[selectorsList.size()];
+        selectorsList.copyInto(result);
+        return result;
     }
 
     /**
@@ -114,26 +110,6 @@ public abstract class BaseSelectorContainer extends BaseSelector
         return selectorsList.elements();
     }
 
-    /**
-     * Performs the check for circular references and returns the
-     * referenced SelectorContainer.
-     */
-    private SelectorContainer getRef(Project p) {
-        if (!checked) {
-            Stack stk = new Stack();
-            stk.push(this);
-            dieOnCircularReference(stk, p);
-        }
-
-        Object o = ref.getReferencedObject(p);
-        if (!(o instanceof SelectorContainer)) {
-            throw new BuildException(ref.getRefId() +
-                " doesn\'t denote a selector type");
-        } else {
-            return (SelectorContainer) o;
-        }
-    }
-
     /**
      * Convert the Selectors within this container to a string. This will
      * just be a helper class for the subclasses that put their own name
@@ -163,9 +139,6 @@ public abstract class BaseSelectorContainer extends BaseSelector
      * @return the selector that was added
      */
     public void appendSelector(FileSelector selector) {
-        if (isReference()) {
-            throw noChildrenAllowed();
-        }
         selectorsList.addElement(selector);
     }
 
@@ -215,7 +188,14 @@ public abstract class BaseSelectorContainer extends BaseSelector
                                        File file);
 
 
-    /* Methods below all implement the static selectors */
+    /* Methods below all add specific selectors */
+
+    /**
+     * add a "Select" selector entry on the selector list
+     */
+    public void addSelector(SelectSelector selector) {
+        appendSelector(selector);
+    }
 
     /**
      * add an "And" selector entry on the selector list
@@ -255,56 +235,56 @@ public abstract class BaseSelectorContainer extends BaseSelector
     /**
      * add a selector date entry on the selector list
      */
-    public void addDateselect(DateSelector selector) {
+    public void addDate(DateSelector selector) {
         appendSelector(selector);
     }
 
     /**
      * add a selector size entry on the selector list
      */
-    public void addSizeselect(SizeSelector selector) {
+    public void addSize(SizeSelector selector) {
         appendSelector(selector);
     }
 
     /**
      * add a selector filename entry on the selector list
      */
-    public void addFilenameselect(FilenameSelector selector) {
+    public void addFilename(FilenameSelector selector) {
         appendSelector(selector);
     }
 
     /**
      * add an extended selector entry on the selector list
      */
-    public void addExtendSelect(ExtendSelector selector) {
+    public void addCustom(ExtendSelector selector) {
         appendSelector(selector);
     }
 
     /**
      * add a contains selector entry on the selector list
      */
-    public void addContainsSelect(ContainsSelector selector) {
+    public void addContains(ContainsSelector selector) {
         appendSelector(selector);
     }
 
     /**
      * add a present selector entry on the selector list
      */
-    public void addPresentSelect(PresentSelector selector) {
+    public void addPresent(PresentSelector selector) {
         appendSelector(selector);
     }
 
     /**
      * add a depth selector entry on the selector list
      */
-    public void addDepthSelect(DepthSelector selector) {
+    public void addDepth(DepthSelector selector) {
         appendSelector(selector);
     }
 
     /**
      * add a depends selector entry on the selector list
      */
-    public void addDependSelect(DependSelector selector) {
+    public void addDepend(DependSelector selector) {
         appendSelector(selector);
     }
 
diff --git a/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java b/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java
index e7b505b44..dfe5b04b0 100644
--- a/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java
@@ -75,7 +75,7 @@ public class ContainsSelector extends BaseExtendSelector {
 
     private String contains = null;
     private boolean casesensitive = true;
-    public final static String CONTAINS_KEY = "contains";
+    public final static String CONTAINS_KEY = "text";
     public final static String CASE_KEY = "casesensitive";
 
 
@@ -83,7 +83,7 @@ public class ContainsSelector extends BaseExtendSelector {
     }
 
     public String toString() {
-        StringBuffer buf = new StringBuffer("{containsselector contains: ");
+        StringBuffer buf = new StringBuffer("{containsselector text: ");
         buf.append(contains);
         buf.append(" casesensitive: ");
         if (casesensitive) {
@@ -100,7 +100,7 @@ public class ContainsSelector extends BaseExtendSelector {
      *
      * @param contains the string that a file must contain to be selected.
      */
-    public void setContains(String contains) {
+    public void setText(String contains) {
         this.contains = contains;
     }
 
@@ -114,7 +114,7 @@ public class ContainsSelector extends BaseExtendSelector {
     }
 
     /**
-     * When using this as a dynamic selector, this method will be called.
+     * When using this as a custom selector, this method will be called.
      * It translates each parameter into the appropriate setXXX() call.
      *
      * @param parameters the complete set of parameters for this selector
@@ -125,7 +125,7 @@ public class ContainsSelector extends BaseExtendSelector {
             for (int i = 0; i < parameters.length; i++) {
                 String paramname = parameters[i].getName();
                 if (CONTAINS_KEY.equalsIgnoreCase(paramname)) {
-                    setContains(parameters[i].getValue());
+                    setText(parameters[i].getValue());
                 }
                 else if (CASE_KEY.equalsIgnoreCase(paramname)) {
                     setCasesensitive(Project.toBoolean(
@@ -145,7 +145,7 @@ public class ContainsSelector extends BaseExtendSelector {
      */
     public void verifySettings() {
         if (contains == null) {
-            setError("The contains attribute is required");
+            setError("The text attribute is required");
         }
     }
 
@@ -167,13 +167,20 @@ public class ContainsSelector extends BaseExtendSelector {
             return true;
         }
 
+        String userstr = contains;
+        if (!casesensitive) {
+            userstr = contains.toLowerCase();
+        }
         BufferedReader in = null;
         try {
             in = new BufferedReader(new InputStreamReader(
                     new FileInputStream(file)));
             String teststr = in.readLine();
             while (teststr != null) {
-                if (teststr.indexOf(contains) > -1) {
+                if (!casesensitive) {
+                    teststr = teststr.toLowerCase();
+                }
+                if (teststr.indexOf(userstr) > -1) {
                     return true;
                 }
                 teststr = in.readLine();
diff --git a/src/main/org/apache/tools/ant/types/selectors/DateSelector.java b/src/main/org/apache/tools/ant/types/selectors/DateSelector.java
index d72e45893..215253aa1 100644
--- a/src/main/org/apache/tools/ant/types/selectors/DateSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/DateSelector.java
@@ -62,6 +62,7 @@ import java.util.Locale;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.apache.tools.ant.types.Parameter;
+import org.apache.tools.ant.taskdefs.condition.Os;
 
 /**
  * Selector that chooses files based on their last modified date.
@@ -74,19 +75,24 @@ public class DateSelector extends BaseExtendSelector {
     private long millis = -1;
     private String dateTime = null;
     private boolean includeDirs = false;
-    private int cmp = 0;
+    private int granularity = 0;
+    private int cmp = 2;
     public final static String MILLIS_KEY = "millis";
     public final static String DATETIME_KEY = "datetime";
     public final static String CHECKDIRS_KEY = "checkdirs";
+    public final static String GRANULARITY_KEY = "granularity";
     public final static String WHEN_KEY = "when";
 
     public DateSelector() {
+        if (Os.isFamily("dos")) {
+            granularity = 2000;
+        }
     }
 
     public String toString() {
         StringBuffer buf = new StringBuffer("{dateselector date: ");
         buf.append(dateTime);
-        buf.append("compare: ");
+        buf.append(" compare: ");
         if (cmp == 0) {
             buf.append("before");
         }
@@ -95,6 +101,8 @@ public class DateSelector extends BaseExtendSelector {
         } else {
             buf.append("equal");
         }
+        buf.append(" granularity: ");
+        buf.append(granularity);
         buf.append("}");
         return buf.toString();
     }
@@ -109,6 +117,13 @@ public class DateSelector extends BaseExtendSelector {
         this.millis = millis;
     }
 
+    /**
+     * Returns the millisecond value the selector is set for.
+     */
+    public long getMillis() {
+        return millis;
+    }
+
     /**
      * Sets the date. The user must supply it in MM/DD/YYYY HH:MM AM_PM
      * format
@@ -146,6 +161,14 @@ public class DateSelector extends BaseExtendSelector {
         this.includeDirs = includeDirs;
     }
 
+    /**
+     * Sets the number of milliseconds leeway we will give before we consider
+     * a file not to have matched a date.
+     */
+    public void setGranularity(int granularity) {
+        this.granularity = granularity;
+    }
+
     /**
      * Sets the type of comparison to be done on the file's last modified
      * date.
@@ -157,7 +180,7 @@ public class DateSelector extends BaseExtendSelector {
     }
 
     /**
-     * When using this as a dynamic selector, this method will be called.
+     * When using this as a custom selector, this method will be called.
      * It translates each parameter into the appropriate setXXX() call.
      *
      * @param parameters the complete set of parameters for this selector
@@ -182,6 +205,15 @@ public class DateSelector extends BaseExtendSelector {
                 else if (CHECKDIRS_KEY.equalsIgnoreCase(paramname)) {
                     setCheckdirs(Project.toBoolean(parameters[i].getValue()));
                 }
+                else if (GRANULARITY_KEY.equalsIgnoreCase(paramname)) {
+                    try {
+                        setGranularity(new Integer(parameters[i].getValue()
+                                ).intValue());
+                    } catch (NumberFormatException nfe) {
+                        setError("Invalid granularity setting " +
+                            parameters[i].getValue());
+                    }
+                }
                 else if (WHEN_KEY.equalsIgnoreCase(paramname)) {
                     TimeComparisons cmp = new TimeComparisons();
                     cmp.setValue(parameters[i].getValue());
@@ -225,13 +257,13 @@ public class DateSelector extends BaseExtendSelector {
             return true;
         }
         if (cmp == 0) {
-            return (file.lastModified() < millis);
+            return ((file.lastModified() - granularity) < millis);
         }
         else if (cmp == 1) {
-            return (file.lastModified() > millis);
+            return ((file.lastModified() + granularity) > millis);
         }
         else {
-            return (file.lastModified() == millis);
+            return (Math.abs(file.lastModified() -  millis) <= granularity);
         }
     }
 
diff --git a/src/main/org/apache/tools/ant/types/selectors/DependSelector.java b/src/main/org/apache/tools/ant/types/selectors/DependSelector.java
index ceefdd7f9..f4d92a4a2 100644
--- a/src/main/org/apache/tools/ant/types/selectors/DependSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/DependSelector.java
@@ -61,6 +61,7 @@ import org.apache.tools.ant.types.Mapper;
 import org.apache.tools.ant.util.IdentityMapper;
 import org.apache.tools.ant.util.FileNameMapper;
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.taskdefs.condition.Os;
 
 /**
  * Selector that filters files based on whether they are newer than
@@ -80,6 +81,9 @@ public class DependSelector extends BaseSelector {
     private int granularity = 0;
 
     public DependSelector() {
+        if (Os.isFamily("dos")) {
+            granularity = 2000;
+        }
     }
 
     public String toString() {
@@ -171,6 +175,11 @@ public class DependSelector extends BaseSelector {
 
         // Determine file whose out-of-dateness is to be checked
         String[] destfiles = map.mapFileName(filename);
+        // If filename does not match the To attribute of the mapper
+        // then filter it out of the files we are considering
+        if (destfiles == null) {
+            return false;
+        }
         // Sanity check
         if (destfiles.length != 1 || destfiles[0] == null) {
             throw new BuildException("Invalid destination file results for "
diff --git a/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java b/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java
index 1b2002216..0742521cf 100644
--- a/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java
@@ -106,7 +106,7 @@ public class DepthSelector extends BaseExtendSelector {
     }
 
     /**
-     * When using this as a dynamic selector, this method will be called.
+     * When using this as a custom selector, this method will be called.
      * It translates each parameter into the appropriate setXXX() call.
      *
      * @param parameters the complete set of parameters for this selector
@@ -150,7 +150,7 @@ public class DepthSelector extends BaseExtendSelector {
             setError("You must set at least one of the min or the " +
                     "max levels.");
         }
-        if (max < min) {
+        if (max < min && max > -1) {
             setError("The maximum depth is lower than the minimum.");
         }
     }
diff --git a/src/main/org/apache/tools/ant/types/selectors/ExtendFileSelector.java b/src/main/org/apache/tools/ant/types/selectors/ExtendFileSelector.java
index 25d968c9b..0d7fd10bc 100644
--- a/src/main/org/apache/tools/ant/types/selectors/ExtendFileSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/ExtendFileSelector.java
@@ -59,12 +59,12 @@ import java.io.File;
 import org.apache.tools.ant.types.Parameterizable;
 
 /**
- * This is the interface to be used by all dynamic selectors, those that are
- * called through the <extendselect> tag. It is the amalgamation of two
+ * This is the interface to be used by all custom selectors, those that are
+ * called through the &lt;custom&gt; tag. It is the amalgamation of two
  * interfaces, the FileSelector and the Paramterizable interface. Note that
  * you will almost certainly want the default behaviour for handling
  * Parameters, so you probably want to use the BaseExtendSelector class
- * as the base class for your dynamic selector rather than implementing
+ * as the base class for your custom selector rather than implementing
  * this interface from scratch.
  *
  * @author <a href="mailto:bruce@callenish.com">Bruce Atherton</a>
diff --git a/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java b/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java
index 9925fe971..46533c31f 100644
--- a/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java
@@ -58,6 +58,7 @@ import java.io.File;
 import java.util.Vector;
 
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.types.DataType;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Parameter;
@@ -72,7 +73,7 @@ import org.apache.tools.ant.types.Reference;
 public class ExtendSelector extends BaseSelector {
 
     private String classname = null;
-    private ExtendFileSelector dynselector = null;
+    private FileSelector dynselector = null;
     private Vector paramVec = new Vector();
     private Path classpath = null;
 
@@ -83,7 +84,7 @@ public class ExtendSelector extends BaseSelector {
     }
 
     /**
-     * Sets the classname of the dynamic selector.
+     * Sets the classname of the custom selector.
      *
      * @param classname is the class which implements this selector
      */
@@ -92,13 +93,21 @@ public class ExtendSelector extends BaseSelector {
     }
 
     /**
-     * Instantiates the identified dynamic selector class.
+     * Instantiates the identified custom selector class.
      */
     public void selectorCreate() {
         if (classname != null && classname.length() > 0) {
             try {
-                dynselector = (ExtendFileSelector)
-                        Class.forName(classname).newInstance();
+                Class c = null;
+                if (classpath == null) {
+                    c = Class.forName(classname);
+                } else {
+                    AntClassLoader al = new AntClassLoader(getProject(),
+                                                           classpath);
+                    c = al.loadClass(classname);
+                    AntClassLoader.initializeClass(c);
+                }
+                dynselector = (FileSelector) c.newInstance();
             }
             catch (ClassNotFoundException cnfexcept) {
                 setError("Selector " + classname +
@@ -118,7 +127,7 @@ public class ExtendSelector extends BaseSelector {
     }
 
     /**
-     * Create new parameters to pass to dynamic selector.
+     * Create new parameters to pass to custom selector.
      *
      * @param p The new Parameter object
      */
@@ -162,7 +171,7 @@ public class ExtendSelector extends BaseSelector {
     }
 
     /**
-     * Set the classpath to use for loading a dynamic selector by using
+     * Set the classpath to use for loading a custom selector by using
      * a reference.
      */
     public void setClasspathref(Reference r) {
@@ -174,37 +183,45 @@ public class ExtendSelector extends BaseSelector {
 
     /**
      * These are errors specific to ExtendSelector only. If there are
-     * errors in the dynamic selector, it should throw a BuildException
+     * errors in the custom selector, it should throw a BuildException
      * when isSelected() is called.
      */
     public void verifySettings() {
+        // Creation is done here rather than in isSelected() because some
+        // containers may do a validation pass before running isSelected(),
+        // but we need to check for the existence of the created class.
+        if (dynselector == null) {
+            selectorCreate();
+        }
         if (classname == null || classname.length() < 1) {
             setError("The classname attribute is required");
         }
         else if (dynselector == null) {
-            setError("Internal Error: The dynamic selector is not set");
+            setError("Internal Error: The custom selector was not created");
+        }
+        else if (!(dynselector instanceof ExtendFileSelector) &&
+                (paramVec.size() > 0)) {
+            setError("Cannot set parameters on custom selector that does not "
+                    + "implement ExtendFileSelector");
         }
     }
 
 
     /**
-     * Allows the dynamic selector to choose whether to select a file. This
-     * is also where the Parameters are passed to the dynamic selector,
+     * Allows the custom selector to choose whether to select a file. This
+     * is also where the Parameters are passed to the custom selector,
      * since we know we must have them all by now. And since we must know
      * both classpath and classname, creating the class is deferred to here
      * as well.
      */
     public boolean isSelected(File basedir, String filename, File file)
             throws BuildException {
-        if (dynselector == null) {
-            selectorCreate();
-        }
         validate();
-        if (paramVec.size() > 0) {
+        if (paramVec.size() > 0 && dynselector instanceof ExtendFileSelector) {
             Parameter[] paramArray = new Parameter[paramVec.size()];
             paramVec.copyInto(paramArray);
             // We know that dynselector must be non-null if no error message
-            dynselector.setParameters(paramArray);
+            ((ExtendFileSelector)dynselector).setParameters(paramArray);
         }
         return dynselector.isSelected(basedir,filename,file);
     }
diff --git a/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java b/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java
index 1706790bb..3c8b2b4f5 100644
--- a/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java
@@ -123,9 +123,9 @@ public class FilenameSelector extends BaseExtendSelector {
 
     /**
      * You can optionally reverse the selection of this selector,
-     * thereby emulating an <exclude> tag, by setting the attribute
+     * thereby emulating an &lt;exclude&gt; tag, by setting the attribute
      * negate to true. This is identical to surrounding the selector
-     * with <not></not>.
+     * with &lt;not&gt;&lt;/not&gt;.
      *
      * @param negated whether to negate this selection
      */
@@ -134,7 +134,7 @@ public class FilenameSelector extends BaseExtendSelector {
     }
 
     /**
-     * When using this as a dynamic selector, this method will be called.
+     * When using this as a custom selector, this method will be called.
      * It translates each parameter into the appropriate setXXX() call.
      *
      * @param parameters the complete set of parameters for this selector
@@ -187,8 +187,8 @@ public class FilenameSelector extends BaseExtendSelector {
     public boolean isSelected(File basedir, String filename, File file) {
         validate();
 
-        return SelectorUtils.matchPath(pattern,filename,
-                casesensitive);
+        return (SelectorUtils.matchPath(pattern,filename,
+                casesensitive) == !(negated));
     }
 
 }
diff --git a/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java b/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java
index 9efab0f0a..eba5848ed 100644
--- a/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java
@@ -184,6 +184,11 @@ public class PresentSelector extends BaseSelector {
 
         // Determine file whose existence is to be checked
         String[] destfiles = map.mapFileName(filename);
+        // If filename does not match the To attribute of the mapper
+        // then filter it out of the files we are considering
+        if (destfiles == null) {
+            return false;
+        }
         // Sanity check
         if (destfiles.length != 1 || destfiles[0] == null) {
             throw new BuildException("Invalid destination file results for "
diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java b/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java
new file mode 100644
index 000000000..535b537e0
--- /dev/null
+++ b/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java
@@ -0,0 +1,169 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+package org.apache.tools.ant.types.selectors;
+
+import java.io.File;
+import java.util.Enumeration;
+
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.BuildException;
+import  org.apache.tools.ant.types.Reference;
+
+/**
+ * This selector just holds one other selector and forwards all
+ * requests to it. It exists so that there is a single selector
+ * type that can exist outside of any targets, as an element of
+ * project. It overrides all of the reference stuff so that it
+ * works as expected. Note that this is the only selector you
+ * can reference.
+ *
+ * @author <a href="mailto:bruce@callenish.com">Bruce Atherton</a>
+ * @since 1.5
+ */
+public class SelectSelector extends AndSelector {
+
+    /**
+     * Default constructor.
+     */
+    public SelectSelector() {
+    }
+
+    public String toString() {
+        StringBuffer buf = new StringBuffer();
+        if (hasSelectors()) {
+            buf.append("{select: ");
+            buf.append(super.toString());
+            buf.append("}");
+        }
+        return buf.toString();
+    }
+
+    /**
+     * Performs the check for circular references and returns the
+     * referenced Selector.
+     */
+    private SelectSelector getRef() {
+        Object o = getCheckedRef(this.getClass(), "SelectSelector");
+        return (SelectSelector) o;
+    }
+
+    /**
+     * Indicates whether there are any selectors here.
+     */
+    public boolean hasSelectors() {
+        if (isReference()) {
+            return getRef().hasSelectors();
+        }
+        return super.hasSelectors();
+    }
+
+    /**
+     * Gives the count of the number of selectors in this container
+     */
+    public int selectorCount() {
+        if (isReference()) {
+            return getRef().selectorCount();
+        }
+        return super.selectorCount();
+    }
+
+    /**
+     * Returns the set of selectors as an array.
+     */
+    public FileSelector[] getSelectors(Project p) {
+        if (isReference()) {
+            return getRef().getSelectors(p);
+        }
+        return super.getSelectors(p);
+    }
+
+    /**
+     * Returns an enumerator for accessing the set of selectors.
+     */
+    public Enumeration selectorElements() {
+        if (isReference()) {
+            return getRef().selectorElements();
+        }
+        return super.selectorElements();
+    }
+
+    /**
+     * Add a new selector into this container.
+     *
+     * @param selector the new selector to add
+     * @return the selector that was added
+     */
+    public void appendSelector(FileSelector selector) {
+        if (isReference()) {
+            throw noChildrenAllowed();
+        }
+        super.appendSelector(selector);
+    }
+
+
+
+    /**
+     * Makes sure that there is only one entry, sets an error message if
+     * not.
+     */
+    public void verifySettings() {
+        if (selectorCount() != 1) {
+            setError("One and only one selector is allowed within the " +
+                    "<select> tag");
+        }
+    }
+
+}
+
diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java b/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java
index 819e88fa9..66382d811 100644
--- a/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java
+++ b/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java
@@ -64,7 +64,7 @@ import java.util.Stack;
 import java.util.Vector;
 
 /**
- * This is the base class for selectors that can contain other selectors.
+ * This is the interface for selectors that can contain other selectors.
  *
  * @author <a href="mailto:bruce@callenish.com">Bruce Atherton</a>
  * @since 1.5
@@ -107,7 +107,12 @@ public interface SelectorContainer {
      */
     public void appendSelector(FileSelector selector);
 
-    /* Methods below all implement the static selectors */
+    /* Methods below all add specific selectors */
+
+    /**
+     * add a "Select" selector entry on the selector list
+     */
+    public void addSelector(SelectSelector selector);
 
     /**
      * add an "And" selector entry on the selector list
@@ -137,42 +142,42 @@ public interface SelectorContainer {
     /**
      * add a selector date entry on the selector list
      */
-    public void addDateselect(DateSelector selector);
+    public void addDate(DateSelector selector);
 
     /**
      * add a selector size entry on the selector list
      */
-    public void addSizeselect(SizeSelector selector);
+    public void addSize(SizeSelector selector);
 
     /**
      * add a selector filename entry on the selector list
      */
-    public void addFilenameselect(FilenameSelector selector);
+    public void addFilename(FilenameSelector selector);
 
     /**
      * add an extended selector entry on the selector list
      */
-    public void addExtendSelect(ExtendSelector selector);
+    public void addCustom(ExtendSelector selector);
 
     /**
      * add a contains selector entry on the selector list
      */
-    public void addContainsSelect(ContainsSelector selector);
+    public void addContains(ContainsSelector selector);
 
     /**
      * add a present selector entry on the selector list
      */
-    public void addPresentSelect(PresentSelector selector);
+    public void addPresent(PresentSelector selector);
 
     /**
      * add a depth selector entry on the selector list
      */
-    public void addDepthSelect(DepthSelector selector);
+    public void addDepth(DepthSelector selector);
 
     /**
      * add a depends selector entry on the selector list
      */
-    public void addDependSelect(DependSelector selector);
+    public void addDepend(DependSelector selector);
 
 }
 
diff --git a/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java b/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java
index 3ed87a44b..52e883da3 100644
--- a/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java
@@ -71,16 +71,16 @@ public class SizeSelector extends BaseExtendSelector {
     private long size = -1;
     private long multiplier = 1;
     private long sizelimit = -1;
-    private int cmp = 0;
-    public final static String SIZE_KEY = "millis";
-    public final static String UNITS_KEY = "datetime";
+    private int cmp = 2;
+    public final static String SIZE_KEY = "value";
+    public final static String UNITS_KEY = "units";
     public final static String WHEN_KEY = "when";
 
     public SizeSelector() {
     }
 
     public String toString() {
-        StringBuffer buf = new StringBuffer("{sizeselector size: ");
+        StringBuffer buf = new StringBuffer("{sizeselector value: ");
         buf.append(sizelimit);
         buf.append("compare: ");
         if (cmp == 0) {
@@ -102,7 +102,7 @@ public class SizeSelector extends BaseExtendSelector {
      *
      * @param size the size to select against expressed in units
      */
-    public void setSize(long size) {
+    public void setValue(long size) {
         this.size = size;
         if ((multiplier != 0) && (size > -1)) {
             sizelimit = size * multiplier;
@@ -179,7 +179,7 @@ public class SizeSelector extends BaseExtendSelector {
     }
 
     /**
-     * When using this as a dynamic selector, this method will be called.
+     * When using this as a custom selector, this method will be called.
      * It translates each parameter into the appropriate setXXX() call.
      *
      * @param parameters the complete set of parameters for this selector
@@ -191,7 +191,7 @@ public class SizeSelector extends BaseExtendSelector {
                 String paramname = parameters[i].getName();
                 if (SIZE_KEY.equalsIgnoreCase(paramname)) {
                     try {
-                        setSize(new Long(parameters[i].getValue()
+                        setValue(new Long(parameters[i].getValue()
                                 ).longValue());
                     } catch (NumberFormatException nfe) {
                         setError("Invalid size setting "
@@ -227,7 +227,7 @@ public class SizeSelector extends BaseExtendSelector {
      */
     public void verifySettings() {
         if (size < 0) {
-            setError("The size attribute is required, and must be positive");
+            setError("The value attribute is required, and must be positive");
         }
         else if (multiplier < 1) {
             setError("Invalid Units supplied, must be K,Ki,M,Mi,G,Gi,T,or Ti");
diff --git a/src/main/org/apache/tools/ant/util/FileUtils.java b/src/main/org/apache/tools/ant/util/FileUtils.java
index cb8acbbab..b6a5dc8ae 100644
--- a/src/main/org/apache/tools/ant/util/FileUtils.java
+++ b/src/main/org/apache/tools/ant/util/FileUtils.java
@@ -781,6 +781,10 @@ public class FileUtils {
      * Read from reader till EOF
      */
     public static final String readFully(Reader rdr, int bufferSize) throws IOException {
+        if (bufferSize <= 0) {
+            throw new IllegalArgumentException("Buffer size must be greater " 
+                + "than 0");
+        }
         final char[] buffer = new char[bufferSize];
         int bufferLength = 0;
         String text = null;
@@ -831,5 +835,48 @@ public class FileUtils {
         return false;
     }
 
+    /**
+     * Checks whether a given file is a symbolic link.
+     *
+     * <p>It doesn't really test for symbolic links but whether the
+     * canonical and absolute paths of the file are identical - this
+     * may lead to false positives on some platforms.</p>
+     *
+     * @param parent the parent directory of the file to test
+     * @param name the name of the file to test.
+     *
+     * @since Ant 1.5
+     */
+    public boolean isSymbolicLink(File parent, String name)
+        throws IOException {
+        File resolvedParent = new File(parent.getCanonicalPath());
+        File toTest = new File(resolvedParent, name);
+        return !toTest.getAbsolutePath().equals(toTest.getCanonicalPath());
+    }
+
+    /**
+     * Removes a leading path from a second path.
+     *
+     * @param leading The leading path, must not be null, must be absolute.
+     * @param path The path to remove from, must not be null, must be absolute.
+     *
+     * @return path's normalized absolute if it doesn't start with
+     * leading, path's path with leading's path removed otherwise.
+     *
+     * @since Ant 1.5
+     */
+    public String removeLeadingPath(File leading, File path) {
+        String l = normalize(leading.getAbsolutePath()).getAbsolutePath();
+        String p = normalize(path.getAbsolutePath()).getAbsolutePath();
+        if (p.startsWith(l)) {
+            String result = p.substring(l.length());
+            if (result.startsWith(File.separator)) {
+                result = result.substring(File.separator.length());
+            }
+            return result;
+        } else {
+            return p;
+        }
+    }
 }
 
diff --git a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
index 549212fd9..2db98cb16 100644
--- a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
+++ b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
@@ -164,14 +164,18 @@ public class JavaEnvUtils {
             return command;
         }
 
-        File jExecutable = findInDir(javaHome + "/bin", command);
+        File jExecutable = null;
 
-        if (jExecutable == null && isAix) {
+        if (isAix) {
             // On IBM's JDK 1.2 the directory layout is different, 1.3 follows
             // Sun's layout.
             jExecutable = findInDir(javaHome + "/sh", command);
         }
 
+        if (jExecutable == null) { 
+            jExecutable = findInDir(javaHome + "/bin", command);
+        }
+
         if (jExecutable != null) {
             return jExecutable.getAbsolutePath();
         } else {
@@ -200,19 +204,24 @@ public class JavaEnvUtils {
             return command;
         }
 
-        File jExecutable = findInDir(javaHome + "/../bin", command);
+        File jExecutable = null;
 
-        if (jExecutable == null && isAix) {
+        if (isAix) {
             // On IBM's JDK 1.2 the directory layout is different, 1.3 follows
             // Sun's layout.
             jExecutable = findInDir(javaHome + "/../sh", command);
         }
 
+        if (jExecutable == null) { 
+            jExecutable = findInDir(javaHome + "/../bin", command);
+        }
+
         if (jExecutable != null) {
             return jExecutable.getAbsolutePath();
         } else {
             // fall back to JRE bin directory, also catches JDK 1.0 and 1.1
-            // where java.home points to the root of the JDK
+            // where java.home points to the root of the JDK and Mac OS X where
+            // the whole directory layout is different from Sun's
             return getJreExecutable(command);
         }
     }
diff --git a/src/script/ant b/src/script/ant
index 3609e8196..3d00feb69 100644
--- a/src/script/ant
+++ b/src/script/ant
@@ -110,7 +110,7 @@ if $rpm_mode; then
     if [ -z "$LOCALCLASSPATH" ] ; then
       LOCALCLASSPATH=$JAVALIBDIR/$i.jar
     else
-      LOCALCLASSPATH="$i.jar":"$LOCALCLASSPATH"
+      LOCALCLASSPATH="$JAVALIBDIR/$i.jar":"$LOCALCLASSPATH"
     fi
   done
 else
@@ -175,6 +175,7 @@ if $cygwin; then
   JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
   CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
   LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
+  ANT_OPTS="$ANT_OPTS -Dcygwin.user.home="`cygpath --path --windows "$HOME"`
 fi
 
 "$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" $ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS "$@"
diff --git a/src/script/runant.pl b/src/script/runant.pl
index f4e506786..9b7257ed3 100644
--- a/src/script/runant.pl
+++ b/src/script/runant.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-#   Copyright (c) 2001 The Apache Software Foundation.  All rights
+#   Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
 #   reserved.
 #
 #######################################################################
@@ -55,11 +55,18 @@ if ($HOME eq "")
 my $JAVACMD = $ENV{JAVACMD};
 $JAVACMD = "java" if $JAVACMD eq "";
 
+my $onnetware = 0;
+if ($^O eq "NetWare")
+{
+  $onnetware = 1;
+}
+
 #ISSUE: what java wants to split up classpath varies from platform to platform 
 #and perl is not too hot at hinting which box it is on.
-#here I assume ":" 'cept on win32 and dos. Add extra tests here as needed.
+#here I assume ":" 'cept on win32, dos, and netware. Add extra tests here as needed.
 my $s=":";
-if(($^O eq "MSWin32") || ($^O eq "dos") || ($^O eq "cygwin"))
+if(($^O eq "MSWin32") || ($^O eq "dos") || ($^O eq "cygwin") ||
+   ($onnetware == 1))
         {
         $s=";";
         }
@@ -71,6 +78,13 @@ if ($localpath eq "")
         print "warning: no initial classpath\n" if ($debug);
         $localpath="";
         }
+if ($onnetware == 1)
+{
+# avoid building a command line bigger than 512 characters - make localpath
+# only include the "extra" stuff, and add in the system classpath as an expanded
+# variable. 
+  $localpath="";
+} 
 
 #add jar files. I am sure there is a perl one liner to do this.
 my $jarpattern="$HOME/lib/*.jar";
@@ -117,7 +131,18 @@ if($ENV{JIKESPATH} ne "")
 
 #construct arguments to java
 my @ARGS;
-push @ARGS, "-classpath", "$localpath", "-Dant.home=$HOME";
+if ($onnetware == 1)
+{
+# make classpath literally $CLASSPATH; and then the contents of $localpath
+# this is to avoid pushing us over the 512 character limit
+# even skip the ; - that is already in $localpath
+  push @ARGS, "-classpath", "\$CLASSPATH$localpath";
+}
+else
+{
+  push @ARGS, "-classpath", "$localpath";
+}
+push @ARGS, "-Dant.home=$HOME";
 push @ARGS, @ANT_OPTS;
 push @ARGS, "org.apache.tools.ant.Main", @ANT_ARGS;
 push @ARGS, @ARGV;
diff --git a/src/testcases/org/apache/tools/ant/AntClassLoaderTest.java b/src/testcases/org/apache/tools/ant/AntClassLoaderTest.java
new file mode 100644
index 000000000..8fddd349a
--- /dev/null
+++ b/src/testcases/org/apache/tools/ant/AntClassLoaderTest.java
@@ -0,0 +1,112 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+package org.apache.tools.ant;
+import org.apache.tools.ant.types.Path;
+import junit.framework.TestCase;
+
+/**
+ * Test case for ant class loader
+ *
+ * @author Conor MacNeill</a> 
+ */
+public class AntClassLoaderTest extends TestCase {
+
+    private Project p;
+
+    public AntClassLoaderTest(String name) {
+        super(name);
+    }
+
+    public void setUp() {
+        p = new Project();
+        p.init();
+    }
+
+    public void testCleanup() throws BuildException {
+        Path path = new Path(p, ".");
+        AntClassLoader loader = new AntClassLoader(p, path);
+        try {
+            // we don't expect to find this
+            loader.findClass("fubar");
+            fail("Did not expect to find fubar class");
+        } catch (ClassNotFoundException e) {
+            // ignore expected
+        }
+        
+        loader.cleanup();
+        try {
+            // we don't expect to find this
+            loader.findClass("fubar");
+            fail("Did not expect to find fubar class");
+        } catch (ClassNotFoundException e) {
+            // ignore expected
+        } catch (NullPointerException e) {
+            fail("loader should not fail even if cleaned up");
+        }
+        
+        // tell the build it is finished
+        p.fireBuildFinished(null);
+        try {
+            // we don't expect to find this
+            loader.findClass("fubar");
+            fail("Did not expect to find fubar class");
+        } catch (ClassNotFoundException e) {
+            // ignore expected
+        } catch (NullPointerException e) {
+            fail("loader should not fail even if project finished");
+        }
+    }
+}
+
diff --git a/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java b/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java
index 024e9a0d2..d31b6a7f3 100644
--- a/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java
+++ b/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2001 The Apache Software Foundation.  All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -54,9 +54,12 @@
 
 package org.apache.tools.ant;
 
+import org.apache.tools.ant.taskdefs.condition.Os;
+
 import junit.framework.TestCase;
 import junit.framework.AssertionFailedError;
 import java.io.File;
+import java.io.IOException;
 
 /**
  * JUnit 3 testcases for org.apache.tools.ant.DirectoryScanner
@@ -67,6 +70,95 @@ public class DirectoryScannerTest extends TestCase {
 
     public DirectoryScannerTest(String name) {super(name);}
 
+
+    // keep track of what operating systems are supported here.
+    private boolean supportsSymlinks = Os.isFamily("unix");
+
+    /**
+     * Test case for setFollowLinks() and associated funtionality.
+     * Only supports test on linux, at the moment because Java has
+     * no real notion of symlinks built in, so an os-specfic call
+     * to Runtime.exec() must be made to create a link to test against.
+     */
+
+    public void testSetFollowLinks() {
+        if (supportsSymlinks) {
+            try {
+                // add conditions and more commands as soon as the need arises
+                String[] command = new String[] {
+                    "ln", "-s", "ant", "src/main/org/apache/tools/ThisIsALink"
+                };
+                try {
+                    Runtime.getRuntime().exec(command);
+                    // give ourselves some time for the system call
+                    // to execute... tweak if you have a really over
+                    // loaded system.
+                    Thread.sleep(1000);    
+                } catch (IOException ioe) {
+                    fail("IOException making link "+ioe);
+                } catch (InterruptedException ie) {
+                }
+                
+                File dir = new File("src/main/org/apache/tools");
+                DirectoryScanner ds = new DirectoryScanner();
+
+                // followLinks should be true by default, but if this ever
+                // changes we will need this line.
+                ds.setFollowSymlinks(true);
+                
+                ds.setBasedir(dir);
+                ds.setExcludes(new String[] {"ant/**"});
+                ds.scan();
+            
+                boolean haveZipPackage = false;
+                boolean haveTaskdefsPackage = false;
+
+                String[] included = ds.getIncludedDirectories();
+                for (int i=0; i<included.length; i++) {
+                    if (included[i].equals("zip")) {
+                        haveZipPackage = true;
+                    } else if (included[i].equals("ThisIsALink"+File.separator+
+                                                  "taskdefs")) {
+                        haveTaskdefsPackage = true;
+                    }
+                }
+
+                // if we followed the symlink we just made we should
+                // bypass the excludes.
+                
+                assertTrue("(1) zip package included", haveZipPackage);
+                assertTrue("(1) taskdefs package included", 
+                           haveTaskdefsPackage);
+
+            
+                ds = new DirectoryScanner();
+                ds.setFollowSymlinks(false);
+                
+                ds.setBasedir(dir);
+                ds.setExcludes(new String[] {"ant/**"});
+                ds.scan();
+            
+                haveZipPackage = false;
+                haveTaskdefsPackage = false;
+                included = ds.getIncludedDirectories();
+                for (int i=0; i<included.length; i++) {
+                    if (included[i].equals("zip")) {
+                        haveZipPackage = true;
+                    } else if (included[i].equals("ThisIsALink"+File.separator+
+                                                  "taskdefs")) {
+                        haveTaskdefsPackage = true;
+                    }
+                }
+                assertTrue("(2) zip package included", haveZipPackage);
+                assertTrue("(2) taskdefs package not included", 
+                           !haveTaskdefsPackage);
+                
+            } finally {
+                (new File("src/main/org/apache/tools/ThisIsALink")).delete();
+            } 
+        }
+    }
+
     /**
      * Test inspired by Bug#1415.
      */
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/AntTest.java b/src/testcases/org/apache/tools/ant/taskdefs/AntTest.java
index d41970806..08775a5ad 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/AntTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/AntTest.java
@@ -161,6 +161,7 @@ public class AntTest extends BuildFileTest {
         if (ae != null) {
             throw ae;
         }
+        project.removeBuildListener(bc);
     }
 
     public void testReferenceInheritance() {
@@ -252,6 +253,22 @@ public class AntTest extends BuildFileTest {
         getProject().removeBuildListener(ic);
     }
 
+    public void testRefId() {
+        Path testPath = new Path(project);
+        testPath.createPath().setPath(System.getProperty("java.class.path"));
+        PropertyChecker pc = 
+            new PropertyChecker("testprop",
+                                new String[] {null, 
+                                              testPath.toString()});
+        project.addBuildListener(pc);
+        executeTarget("testRefid");
+        AssertionFailedError ae = pc.getError();
+        if (ae != null) {
+            throw ae;
+        }
+        project.removeBuildListener(pc);
+    }
+
     private class BasedirChecker implements BuildListener {
         private String[] expectedBasedirs;
         private int calls = 0;
@@ -271,13 +288,8 @@ public class AntTest extends BuildFileTest {
         public void targetStarted(BuildEvent event) {
             if (error == null) {
                 try {
-                    if (calls == expectedBasedirs.length) {
-                        assertEquals("cleanup",
-                                     event.getTarget().getName());
-                    } else {
-                        assertEquals(expectedBasedirs[calls++],
-                                     event.getProject().getBaseDir().getAbsolutePath());
-                    }
+                    assertEquals(expectedBasedirs[calls++],
+                                 event.getProject().getBaseDir().getAbsolutePath());
                 } catch (AssertionFailedError e) {
                     error = e;
                 }
@@ -404,4 +416,40 @@ public class AntTest extends BuildFileTest {
 
     }
 
+    private class PropertyChecker implements BuildListener {
+        private String[] expectedValues;
+        private String key;
+        private int calls = 0;
+        private AssertionFailedError error;
+
+        PropertyChecker(String key, String[] values) {
+            this.key = key;
+            this.expectedValues = values;
+        }
+
+        public void buildStarted(BuildEvent event) {}
+        public void buildFinished(BuildEvent event) {}
+        public void targetFinished(BuildEvent event){}
+        public void taskStarted(BuildEvent event) {}
+        public void taskFinished(BuildEvent event) {}
+        public void messageLogged(BuildEvent event) {}
+
+        public void targetStarted(BuildEvent event) {
+            if (error == null) {
+                try {
+                    assertEquals(expectedValues[calls++],
+                                 event.getProject().getProperty(key));
+                } catch (AssertionFailedError e) {
+                    error = e;
+                }
+            }
+        }
+
+        AssertionFailedError getError() {
+            return error;
+        }
+
+    }
+
+
 }
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java b/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java
index 2006590c1..737193ba4 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java
@@ -201,10 +201,6 @@ public class AvailableTest extends BuildFileTest {
 
     // Core class that exists in system classpath is ignored, but found in specified classpath
     public void test21() {
-        if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_1)) {
-            // java.* classes are not found in JDK 1.1 even if specified in classpath attribute; test24 shows correct operation
-            return;
-        }
         executeTarget("test21");
         assertEquals("true",project.getProperty("test"));
     }
@@ -226,4 +222,16 @@ public class AvailableTest extends BuildFileTest {
         executeTarget("test24");
         assertEquals("true",project.getProperty("test"));
     }
+
+    // File is not found in specified filepath
+    public void testSearchInPathNotThere() {
+        executeTarget("searchInPathNotThere");
+        assertNull(project.getProperty("test"));
+    }
+
+    // File is not found in specified filepath
+    public void testSearchInPathIsThere() {
+        executeTarget("searchInPathIsThere");
+        assertEquals("true",project.getProperty("test"));
+    }
 }
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ConditionTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ConditionTest.java
index 92a5c59c0..cecac4985 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/ConditionTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/ConditionTest.java
@@ -190,6 +190,15 @@ public class ConditionTest extends BuildFileTest {
         expectPropertySet("filesmatch-match","filesmatch-match"); 
     }   
     
+    public void testFilesmatchDifferentSizes() {
+        expectPropertyUnset("filesmatch-different-sizes",
+            "filesmatch-different-sizes"); 
+    } 
+
+    public void testFilesmatchDifferentOnemissing() {
+        expectPropertyUnset("filesmatch-different-onemissing",
+            "filesmatch-different-onemissing"); 
+    } 
     
     public void testContains() {
         expectPropertySet("contains","contains"); 
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/FilterTest.java b/src/testcases/org/apache/tools/ant/taskdefs/FilterTest.java
index a8ce9870c..dd3bff63b 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/FilterTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/FilterTest.java
@@ -119,6 +119,12 @@ public class FilterTest extends BuildFileTest {
                      getFilteredFile("8", "taskdefs.tmp/filter2.txt"));
     }
     
+    public void test9() {
+        executeTarget("test9");
+        assertEquals("included",
+                    getFilteredFile("9", "taskdefs.tmp/filter3.txt"));
+    }
+        
     private String getFilteredFile(String testNumber, String filteredFile) {
     
         String line = null;
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/EchoPropertiesTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/EchoPropertiesTest.java
index 8b31f1999..e30d64c36 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/EchoPropertiesTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/EchoPropertiesTest.java
@@ -80,6 +80,7 @@ public class EchoPropertiesTest extends BuildFileTest {
     private static final String GOOD_OUTFILE_XML = "test.xml";
     private static final String PREFIX_OUTFILE = "test-prefix.properties";
     private static final String TEST_VALUE = "isSet";
+    private static final String BAD_OUTFILE = ".";
 
     public EchoPropertiesTest(String name) {
         super(name);
@@ -230,6 +231,25 @@ public class EchoPropertiesTest extends BuildFileTest {
         props.list(System.out);
         assertEquals("test property not found ",
                      TEST_VALUE, props.getProperty("test.property"));
+/*
+        // read in the file
+        FileReader fr = new FileReader( f );
+        try {
+            BufferedReader br = new BufferedReader( fr );
+            String read = null;
+            while ( (read = br.readLine()) != null)
+            {
+                if (read.indexOf("test.property" + TEST_VALUE) >= 0)
+                {
+                    // found the property we set - it's good.
+                    return;
+                }
+            }
+            fail( "did not encounter set property in generated file." );
+        } finally {
+            try { fr.close(); } catch(IOException e) {}
+        }
+*/
     }
 
 
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java
index 95b2e179b..71b76cc80 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java
@@ -131,6 +131,7 @@ public class PropertyFileTest extends BuildFileTest {
         assertEquals("2003/01/21", project.getProperty("first.birthday"));
         assertEquals("0124", project.getProperty("olderThanAWeek"));
         assertEquals("37", project.getProperty("existing.prop"));
+        assertEquals("6",project.getProperty("int.without.value"));
     }
 
 /*
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/XmlValidateTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/XmlValidateTest.java
index ecb12a950..c532227e7 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/XmlValidateTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/XmlValidateTest.java
@@ -118,5 +118,11 @@ public class XmlValidateTest extends BuildFileTest {
     public void testXmlCatalog() {
         executeTarget("xmlcatalog");
     }
-}
 
+    /**
+     * Test nested xmlcatalog definitions
+     */
+    public void testXmlCatalogNested() {
+        executeTarget("xmlcatalognested");
+    }
+}
diff --git a/src/testcases/org/apache/tools/ant/types/PathTest.java b/src/testcases/org/apache/tools/ant/types/PathTest.java
index ea661bc5a..b18eaded0 100644
--- a/src/testcases/org/apache/tools/ant/types/PathTest.java
+++ b/src/testcases/org/apache/tools/ant/types/PathTest.java
@@ -282,6 +282,32 @@ public class PathTest extends TestCase {
             assertTrue("temp resolved relative to project\'s basedir", 
                    l[3].endsWith("\\temp"));
          }
+
+        // try a multi-part netware-volume length path with UNIX
+        // separator (this testcase if from an actual bug that was
+        // found, in AvailableTest, which uses PathTokenizer)
+        p = new Path(project, 
+                     "SYS:\\JAVA/lib/rt.jar:SYS:\\JAVA/lib/classes.zip");
+        l = p.list();
+        if (isUnixStyle) {
+            assertEquals("no drives on Unix", 3, l.length);
+            assertTrue("sys resolved relative to project\'s basedir", 
+                   l[0].endsWith("/SYS"));
+            assertEquals("/JAVA/lib/rt.jar", l[1]);
+            assertEquals("/JAVA/lib/classes.zip", l[2]);
+        } else if (isNetWare) {
+            assertEquals("volumes on NetWare", 2, l.length);
+            assertEquals("sys:\\java\\lib\\rt.jar", l[0].toLowerCase(Locale.US));
+            assertEquals("sys:\\java\\lib\\classes.zip", l[1].toLowerCase(Locale.US));
+        } else {
+            assertEquals("no multiple character-length volumes on Windows", 3, l.length);
+            assertTrue("sys resolved relative to project\'s basedir", 
+                   l[0].endsWith("\\SYS"));
+            assertTrue("java/lib/rt.jar resolved relative to project\'s basedir", 
+                   l[1].endsWith("\\JAVA\\lib\\rt.jar"));
+            assertTrue("java/lib/classes.zip resolved relative to project\'s basedir", 
+                   l[2].endsWith("\\JAVA\\lib\\classes.zip"));
+        }
     }
 
     public void testConstructorMixedStyle() {
diff --git a/src/testcases/org/apache/tools/ant/types/XMLCatalogTest.java b/src/testcases/org/apache/tools/ant/types/XMLCatalogTest.java
new file mode 100644
index 000000000..d0eb16e66
--- /dev/null
+++ b/src/testcases/org/apache/tools/ant/types/XMLCatalogTest.java
@@ -0,0 +1,425 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+package org.apache.tools.ant.types;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DefaultLogger;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.util.FileUtils;
+
+import junit.framework.TestCase;
+
+import java.io.File;
+
+import java.net.MalformedURLException;
+
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import javax.xml.transform.Source;
+import javax.xml.transform.TransformerException;
+
+/**
+ * JUnit testcases for org.apache.tools.ant.types.XMLCatalog
+ *
+ * @author <a href="mailto:cstrong@arielpartners.com">Craeg Strong</a> 
+ * @version $Id$
+ */
+public class XMLCatalogTest extends TestCase {
+
+    private Project project;
+    private XMLCatalog catalog;
+    private FileUtils fileUtils = FileUtils.newFileUtils();
+
+    private XMLCatalog newCatalog() {
+        XMLCatalog cat = new XMLCatalog();
+        cat.setProject(project);
+        return cat;
+    }
+
+    private String toURLString(File file) throws MalformedURLException {
+		  return fileUtils.getFileURL(file).toString();
+    }
+
+    public XMLCatalogTest(String name) {
+        super(name);
+    }
+
+    public void setUp() {
+        project = new Project();
+        project.setBasedir(".");
+
+        // This causes XMLCatalog to print out detailed logging
+        // messages for debugging
+        //
+        // DefaultLogger logger = new DefaultLogger();
+        // logger.setMessageOutputLevel(Project.MSG_DEBUG);
+        // logger.setOutputPrintStream(System.out);
+        // logger.setErrorPrintStream(System.err);
+        // project.addBuildListener(logger);
+        
+        catalog = newCatalog();
+    }
+
+   public void tearDown() {
+      project = null;
+      catalog = null;
+   }
+   
+   public void testEmptyCatalog() {
+       try {
+           InputSource result = catalog.resolveEntity("PUBLIC ID ONE", 
+                                                      "i/dont/exist.dtd");
+           assertNull("Empty catalog should return null", result);
+       } catch (Exception e) {
+           fail("resolveEntity() failed!" + e.toString());
+       }
+
+       try {
+           Source result = catalog.resolve("i/dont/exist.dtd", null);
+           assertNull("Empty catalog should return null", result);
+       } catch (Exception e) {
+           fail("resolve() failed!" + e.toString());
+       }
+   }
+
+    public void testNonExistentEntry() {
+
+        DTDLocation dtd = new DTDLocation();
+        dtd.setPublicId("PUBLIC ID ONE");
+        dtd.setLocation("i/dont/exist.dtd");
+
+        try {
+            InputSource result = catalog.resolveEntity("PUBLIC ID ONE", 
+                                                       "i/dont/exist.dtd");
+            assertNull("Nonexistent Catalog entry should not be returned", result);
+        } catch (Exception e) {
+            fail("resolveEntity() failed!" + e.toString());
+        }
+
+        try {
+            Source result = catalog.resolve("i/dont/exist.dtd", null);
+            assertNull("Nonexistent Catalog entry should not be returned", result);
+        } catch (Exception e) {
+            fail("resolve() failed!" + e.toString());
+        }
+    }
+
+    public void testEmptyElementIfIsReference() {
+        try {
+            catalog.setRefid(new Reference("dummyref"));
+            fail("Can add reference to nonexistent XMLCatalog");
+        } catch (BuildException be) {
+            assertEquals("Reference dummyref not found.",
+                         be.getMessage());
+        }
+
+        DTDLocation dtd = new DTDLocation();
+        dtd.setPublicId("PUBLIC ID ONE");
+        dtd.setLocation("i/dont/exist.dtd");
+        catalog.addDTD(dtd);
+        project.addReference("catalog", catalog);
+        
+        try {
+            catalog.setRefid(new Reference("dummyref"));
+            fail("Can add reference to nonexistent XMLCatalog");
+        } catch (BuildException be) {
+            assertEquals("You must not specify more than one " 
+                         + "attribute when using refid", be.getMessage());
+        }
+        
+        XMLCatalog catalog2 = newCatalog();
+        catalog2.setRefid(new Reference("catalog"));
+
+        try {
+            catalog2.addConfiguredXMLCatalog(catalog);
+            fail("Can add nested XMLCatalog to XMLCatalog that is a reference");
+        } catch (BuildException be) {
+            assertEquals("You must not specify nested elements when using refid",
+                         be.getMessage());
+        }
+    }
+
+    public void testCircularReferenceCheck() {
+
+        // catalog <--> catalog
+        project.addReference("catalog", catalog);
+        catalog.setRefid(new Reference("catalog"));
+
+        try {
+            InputSource result = catalog.resolveEntity("PUBLIC ID ONE", 
+                                                       "i/dont/exist.dtd");
+            fail("Can make XMLCatalog a Reference to itself.");
+        } catch (BuildException be) {
+            assertEquals("This data type contains a circular reference.",
+                         be.getMessage());
+        } catch (Exception e) {
+            fail("resolveEntity() failed!" + e.toString());
+        }
+
+        // catalog1 --> catalog2 --> catalog3 --> catalog1
+        XMLCatalog catalog1 = newCatalog();
+        project.addReference("catalog1", catalog1);
+        XMLCatalog catalog2 = newCatalog();
+        project.addReference("catalog2", catalog2);
+        XMLCatalog catalog3 = newCatalog();
+        project.addReference("catalog3", catalog3);
+
+        catalog3.setRefid(new Reference("catalog1"));
+        catalog2.setRefid(new Reference("catalog3"));
+        catalog1.setRefid(new Reference("catalog2"));
+
+        try {
+            InputSource result = catalog1.resolveEntity("PUBLIC ID ONE", 
+                                                        "i/dont/exist.dtd");
+            fail("Can make circular reference");
+        } catch (BuildException be) {
+            assertEquals("This data type contains a circular reference.",
+                         be.getMessage());
+        } catch (Exception e) {
+            fail("resolveEntity() failed!" + e.toString());
+        }
+    }
+
+    public void testSimpleEntry() {
+
+        DTDLocation dtd = new DTDLocation();
+        dtd.setPublicId("-//stevo//DTD doc 1.0//EN");
+        String sysid = "src/etc/testcases/taskdefs/optional/xml/doc.dtd";
+        dtd.setLocation(sysid);
+        catalog.addDTD(dtd);
+        File dtdFile = project.resolveFile(sysid);
+        
+        try {
+            InputSource result = catalog.resolveEntity("-//stevo//DTD doc 1.0//EN",
+                                                       "nap:chemical+brothers");
+            assertNotNull(result);
+            assertEquals(toURLString(dtdFile),
+                         result.getSystemId());
+        } catch (Exception e) {
+            fail("resolveEntity() failed!" + e.toString());
+        }
+    }
+
+    public void testEntryReference() {
+
+        String publicId = "-//stevo//DTD doc 1.0//EN";
+        String sysid = "src/etc/testcases/taskdefs/optional/xml/doc.dtd";
+
+        // catalog2 --> catalog1 --> catalog
+        DTDLocation dtd = new DTDLocation();
+        dtd.setPublicId(publicId);
+        dtd.setLocation(sysid);
+        catalog.addDTD(dtd);
+        File dtdFile = project.resolveFile(sysid);
+
+        String uri = "http://foo.com/bar/blah.xml";
+        String uriLoc = "src/etc/testcases/taskdefs/optional/xml/about.xml";
+
+        DTDLocation entity = new DTDLocation();
+        entity.setPublicId(uri);
+        entity.setLocation(uriLoc);
+        catalog.addEntity(entity);
+        File xmlFile = project.resolveFile(uriLoc);
+
+        project.addReference("catalog", catalog);
+
+        XMLCatalog catalog1 = newCatalog();
+        project.addReference("catalog1", catalog1);
+        XMLCatalog catalog2 = newCatalog();
+        project.addReference("catalog2", catalog1);
+
+        catalog1.setRefid(new Reference("catalog"));
+        catalog2.setRefid(new Reference("catalog1"));
+
+        try {
+            InputSource result = catalog2.resolveEntity(publicId,
+                                                        "nap:chemical+brothers");
+
+            assertNotNull(result);
+            assertEquals(toURLString(dtdFile),
+                         result.getSystemId());
+        } catch (Exception e) {
+            fail("resolveEntity() failed!" + e.toString());
+        }
+
+        try {
+            Source result = catalog.resolve(uri, null);
+            assertNotNull(result);
+            assertEquals(toURLString(xmlFile),
+                         result.getSystemId());
+        } catch (Exception e) {
+            fail("resolve() failed!" + e.toString());
+        }
+    }
+
+    public void testNestedCatalog() {
+
+        String publicId = "-//stevo//DTD doc 1.0//EN";
+        String dtdLoc = "src/etc/testcases/taskdefs/optional/xml/doc.dtd";
+
+        DTDLocation dtd = new DTDLocation();
+        dtd.setPublicId(publicId);
+        dtd.setLocation(dtdLoc);
+        catalog.addDTD(dtd);
+        File dtdFile = project.resolveFile(dtdLoc);
+
+        String uri = "http://foo.com/bar/blah.xml";
+        String uriLoc = "src/etc/testcases/taskdefs/optional/xml/about.xml";
+
+        DTDLocation entity = new DTDLocation();
+        entity.setPublicId(uri);
+        entity.setLocation(uriLoc);
+        catalog.addEntity(entity);
+        File xmlFile = project.resolveFile(uriLoc);
+
+        XMLCatalog catalog1 = newCatalog();
+        catalog1.addConfiguredXMLCatalog(catalog);
+
+        try {
+            InputSource result = catalog1.resolveEntity(publicId,
+                                                        "nap:chemical+brothers");
+            assertNotNull(result);
+            assertEquals(toURLString(dtdFile),
+                         result.getSystemId());
+        } catch (Exception e) {
+            fail("resolveEntity() failed!" + e.toString());
+        }
+
+        try {
+            Source result = catalog.resolve(uri, null);
+            assertNotNull(result);
+            assertEquals(toURLString(xmlFile),
+                         result.getSystemId());
+        } catch (Exception e) {
+            fail("resolve() failed!" + e.toString());
+        }
+
+    }
+
+    public void testResolverBase() {
+
+        String uri = "http://foo.com/bar/blah.xml";
+        String uriLoc = "etc/testcases/taskdefs/optional/xml/about.xml";
+        String base = null;
+        try {
+            base = toURLString(project.getBaseDir()) + "src/";
+        } catch (MalformedURLException ex) {
+            fail (ex.toString());
+        }
+
+        DTDLocation entity = new DTDLocation();
+        entity.setPublicId(uri);
+        entity.setLocation(uriLoc);
+        catalog.addEntity(entity);
+        File xmlFile = project.resolveFile("src/" + uriLoc);
+
+        try {
+            Source result = catalog.resolve(uri, base);
+            assertNotNull(result);
+            assertEquals(toURLString(xmlFile),
+                         result.getSystemId());
+        } catch (Exception e) {
+            fail("resolve() failed!" + e.toString());
+        }
+    }
+
+    public void testClasspath() {
+
+
+        String publicId = "-//stevo//DTD doc 1.0//EN";
+        String dtdLoc = "testcases/taskdefs/optional/xml/doc.dtd";
+        String path1 = project.getBaseDir().toString() + "/src/etc";
+
+        DTDLocation dtd = new DTDLocation();
+        dtd.setPublicId(publicId);
+        dtd.setLocation(dtdLoc);
+        catalog.addDTD(dtd);
+        File dtdFile = project.resolveFile("src/etc/" + dtdLoc);
+
+        String uri = "http://foo.com/bar/blah.xml";
+        String uriLoc = "etc/testcases/taskdefs/optional/xml/about.xml";
+        String path2 = project.getBaseDir().toString() + "/src";
+
+        DTDLocation entity = new DTDLocation();
+        entity.setPublicId(uri);
+        entity.setLocation(uriLoc);
+        catalog.addEntity(entity);
+        File xmlFile = project.resolveFile("src/" + uriLoc);
+
+        Path aPath = new Path(project, path1);
+        aPath.append(new Path(project, path2));
+        catalog.setClasspath(aPath);
+
+        try {
+            InputSource result = catalog.resolveEntity(publicId,
+                                                       "nap:chemical+brothers");
+            assertNotNull(result);
+            assertEquals(toURLString(dtdFile),
+                         result.getSystemId());
+        } catch (Exception e) {
+            fail("resolveEntity() failed!" + e.toString());
+        }
+
+        try {
+            Source result = catalog.resolve(uri, null);
+            assertNotNull(result);
+            assertEquals(toURLString(xmlFile),
+                         result.getSystemId());
+        } catch (Exception e) {
+            fail("resolve() failed!" + e.toString());
+        }
+    }
+}
diff --git a/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java
new file mode 100644
index 000000000..9cda505e1
--- /dev/null
+++ b/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java
@@ -0,0 +1,192 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+package org.apache.tools.ant.types.selectors;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.BuildFileTest;
+
+import junit.framework.TestCase;
+import junit.framework.AssertionFailedError;
+
+import java.io.File;
+
+/**
+ * Base test case for Selectors. Provides a shared test as well as
+ * a test bed for selecting on, and a helper method for determining
+ * whether selections are correct.
+ *
+ * @author <a href="mailto:bruce@callenish.com">Bruce Atherton</a>
+ */
+public abstract class BaseSelectorTest extends TestCase {
+
+    private Project project;
+    private TaskdefForMakingBed tbed = null;
+    protected String basedirname = "src/etc/testcases/types/selectortest";
+    protected File basedir = new File(basedirname);
+    protected String[] filenames = {".","asf-logo.gif.md5","asf-logo.gif.bz2",
+            "asf-logo.gif.gz","copy.filterset.filtered","zip/asf-logo.gif.zip",
+            "tar/asf-logo.gif.tar","tar/asf-logo-huge.tar",
+            "tar/gz/asf-logo.gif.tar.gz","tar/bz2/asf-logo.gif.tar.bz2",
+            "tar/bz2/asf-logo-huge.tar.bz2","tar/bz2"};
+    protected File[] files = new File[filenames.length];
+
+    public BaseSelectorTest(String name) {
+        super(name);
+    }
+
+    public void setUp() {
+        project = new Project();
+        project.setBasedir(".");
+        for (int x = 0; x < files.length; x++) {
+            files[x] = new File(basedir,filenames[x]);
+        }
+    }
+
+    /**
+     * Override this in child classes to return a specific Selector
+     */
+    public abstract BaseSelector getInstance();
+
+
+    /**
+     * This is a test that all Selectors derived from BaseSelector can
+     * use. It calls the setError() method and checks to ensure that a
+     * BuildException is thrown as a result.
+     */
+    public void testRespondsToError() {
+        BaseSelector s = getInstance();
+        if (s == null) {
+            return;
+        }
+        s.setError("test error");
+        try {
+            s.isSelected(basedir,filenames[0],files[0]);
+            fail("Cannot cause BuildException when setError() is called");
+        } catch (BuildException be) {
+            assertEquals("test error",
+                         be.getMessage());
+        }
+    }
+
+
+    /**
+     * This is a helper method that takes a selector and calls its
+     * isSelected() method on each file in the testbed. It returns
+     * a string of "T"s amd "F"s
+     */
+    public String selectionString(FileSelector selector) {
+        StringBuffer buf = new StringBuffer();
+        for (int x = 0; x < files.length; x++) {
+            if (selector.isSelected(basedir,filenames[x],files[x])) {
+                buf.append('T');
+            }
+            else {
+                buf.append('F');
+            }
+        }
+        return buf.toString();
+    }
+
+    /**
+     * <p>Creates a testbed. We avoid the dreaded "test" word so that we
+     * don't falsely identify this as a test to be run. The actual
+     * setting up of the testbed is done in the
+     * <code>src/etc/testcases/types/selectors.xml</code> build file.</p>
+     *
+     * <p>Note that the right way to call this is within a try block,
+     * with a finally clause that calls cleanupBed(). You place tests of
+     * the isSelected() method within the try block.</p>
+     */
+    protected void makeBed() {
+        tbed = new TaskdefForMakingBed("setupfiles");
+        tbed.setUp();
+        tbed.makeTestbed();
+    }
+
+    /**
+     * Cleans up the testbed by calling a target in the
+     * <code>src/etc/testcases/types/selectors.xml</code> file.
+     */
+    protected void cleanupBed() {
+        if (tbed != null) {
+            tbed.tearDown();
+            tbed = null;
+        }
+    }
+
+
+    private class TaskdefForMakingBed extends BuildFileTest {
+
+        TaskdefForMakingBed(String name) {
+            super(name);
+        }
+
+        public void setUp() {
+            configureProject("src/etc/testcases/types/selectors.xml");
+        }
+
+        public void tearDown() {
+            executeTarget("cleanup");
+        }
+
+        public void makeTestbed() {
+            executeTarget("setupfiles");
+        }
+    }
+
+
+
+}
diff --git a/src/testcases/org/apache/tools/ant/types/selectors/ContainsSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/ContainsSelectorTest.java
new file mode 100644
index 000000000..e7b670a7c
--- /dev/null
+++ b/src/testcases/org/apache/tools/ant/types/selectors/ContainsSelectorTest.java
@@ -0,0 +1,153 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+package org.apache.tools.ant.types.selectors;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.util.*;
+import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.types.Parameter;
+
+import junit.framework.TestCase;
+import junit.framework.AssertionFailedError;
+
+/**
+ * Tests Contains Selectors.
+ *
+ * @author <a href="mailto:bruce@callenish.com">Bruce Atherton</a>
+ */
+public class ContainsSelectorTest extends BaseSelectorTest {
+
+    private Project project;
+
+    public ContainsSelectorTest(String name) {
+        super(name);
+    }
+
+    /**
+     * Factory method from base class. This is overriden in child
+     * classes to return a specific Selector class.
+     */
+    public BaseSelector getInstance() {
+        return new ContainsSelector();
+    }
+
+    /**
+     * Test the code that validates the selector.
+     */
+    public void testValidate() {
+        ContainsSelector s = (ContainsSelector)getInstance();
+        try {
+            s.isSelected(basedir,filenames[0],files[0]);
+            fail("ContainsSelector did not check for required field 'text'");
+        } catch (BuildException be1) {
+            assertEquals("The text attribute is required", be1.getMessage());
+        }
+
+        s = (ContainsSelector)getInstance();
+        Parameter param = new Parameter();
+        param.setName("garbage in");
+        param.setValue("garbage out");
+        Parameter[] params = {param};
+        s.setParameters(params);
+        try {
+            s.isSelected(basedir,filenames[0],files[0]);
+            fail("ContainsSelector did not check for valid parameter element");
+        } catch (BuildException be2) {
+            assertEquals("Invalid parameter garbage in", be2.getMessage());
+        }
+
+    }
+
+    /**
+     * Tests to make sure that the selector is selecting files correctly.
+     */
+    public void testSelectionBehaviour() {
+        ContainsSelector s;
+        String results;
+
+        try {
+            makeBed();
+
+            s = (ContainsSelector)getInstance();
+            s.setText("no such string in test files");
+            results = selectionString(s);
+            assertEquals("TFFFFFFFFFFT", results);
+
+            s = (ContainsSelector)getInstance();
+            s.setText("Apache Ant");
+            results = selectionString(s);
+            assertEquals("TFFFTFFFFFFT", results);
+
+            s = (ContainsSelector)getInstance();
+            s.setText("apache ant");
+            s.setCasesensitive(true);
+            results = selectionString(s);
+            assertEquals("TFFFFFFFFFFT", results);
+
+            s = (ContainsSelector)getInstance();
+            s.setText("apache ant");
+            s.setCasesensitive(false);
+            results = selectionString(s);
+            assertEquals("TFFFTFFFFFFT", results);
+
+        }
+        finally {
+            cleanupBed();
+        }
+
+    }
+
+}
diff --git a/src/testcases/org/apache/tools/ant/types/selectors/DateSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/DateSelectorTest.java
new file mode 100644
index 000000000..e61d887a9
--- /dev/null
+++ b/src/testcases/org/apache/tools/ant/types/selectors/DateSelectorTest.java
@@ -0,0 +1,265 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+package org.apache.tools.ant.types.selectors;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.util.*;
+import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.types.Parameter;
+
+import junit.framework.TestCase;
+import junit.framework.AssertionFailedError;
+
+/**
+ * Tests Date Selectors.
+ *
+ * @author <a href="mailto:bruce@callenish.com">Bruce Atherton</a>
+ */
+public class DateSelectorTest extends BaseSelectorTest {
+
+    private Project project;
+
+    public DateSelectorTest(String name) {
+        super(name);
+    }
+
+    /**
+     * Factory method from base class. This is overriden in child
+     * classes to return a specific Selector class.
+     */
+    public BaseSelector getInstance() {
+        return new DateSelector();
+    }
+
+    /**
+     * Test the code that validates the selector.
+     */
+    public void testValidate() {
+        DateSelector s = (DateSelector)getInstance();
+        try {
+            s.isSelected(basedir,filenames[0],files[0]);
+            fail("DateSelector did not check for required fields");
+        } catch (BuildException be1) {
+            assertEquals("You must provide a datetime or the number of "
+                    + "milliseconds.", be1.getMessage());
+        }
+
+        s = (DateSelector)getInstance();
+        s.setDatetime("01/01/1969 01:01 AM");
+        try {
+            s.isSelected(basedir,filenames[0],files[0]);
+            fail("DateSelector did not check for Datetime being in the "
+                    + "allowable range");
+        } catch (BuildException be2) {
+            assertEquals("Date of 01/01/1969 01:01 AM results in negative "
+                    + "milliseconds value relative to epoch (January 1, "
+                    + "1970, 00:00:00 GMT).", be2.getMessage());
+        }
+
+        s = (DateSelector)getInstance();
+        s.setDatetime("this is not a date");
+        try {
+            s.isSelected(basedir,filenames[0],files[0]);
+            fail("DateSelector did not check for Datetime being in a "
+                    + "valid format");
+        } catch (BuildException be3) {
+            assertEquals("Date of this is not a date"
+                        + " Cannot be parsed correctly. It should be in"
+                        + " MM/DD/YYYY HH:MM AM_PM format.", be3.getMessage());
+        }
+
+        s = (DateSelector)getInstance();
+        Parameter param = new Parameter();
+        param.setName("garbage in");
+        param.setValue("garbage out");
+        Parameter[] params = new Parameter[1];
+        params[0] = param;
+        s.setParameters(params);
+        try {
+            s.isSelected(basedir,filenames[0],files[0]);
+            fail("DateSelector did not check for valid parameter element");
+        } catch (BuildException be4) {
+            assertEquals("Invalid parameter garbage in", be4.getMessage());
+        }
+
+        s = (DateSelector)getInstance();
+        param = new Parameter();
+        param.setName("millis");
+        param.setValue("garbage out");
+        params[0] = param;
+        s.setParameters(params);
+        try {
+            s.isSelected(basedir,filenames[0],files[0]);
+            fail("DateSelector did not check for valid millis parameter");
+        } catch (BuildException be5) {
+            assertEquals("Invalid millisecond setting garbage out",
+                    be5.getMessage());
+        }
+
+        s = (DateSelector)getInstance();
+        param = new Parameter();
+        param.setName("granularity");
+        param.setValue("garbage out");
+        params[0] = param;
+        s.setParameters(params);
+        try {
+            s.isSelected(basedir,filenames[0],files[0]);
+            fail("DateSelector did not check for valid granularity parameter");
+        } catch (BuildException be6) {
+            assertEquals("Invalid granularity setting garbage out",
+                    be6.getMessage());
+        }
+
+    }
+
+    /**
+     * Tests to make sure that the selector is selecting files correctly.
+     */
+    public void testSelectionBehaviour() {
+        DateSelector s;
+        String results;
+
+        DateSelector.TimeComparisons before = new
+                DateSelector.TimeComparisons();
+        before.setValue("before");
+        DateSelector.TimeComparisons equal = new
+                DateSelector.TimeComparisons();
+        equal.setValue("equal");
+        DateSelector.TimeComparisons after = new
+                DateSelector.TimeComparisons();
+        after.setValue("after");
+
+        try {
+            makeBed();
+
+            s = (DateSelector)getInstance();
+            s.setDatetime("10/10/1999 1:45 PM");
+            s.setWhen(before);
+            results = selectionString(s);
+            assertEquals("TFFFFFFFFFFT", results);
+
+            s = (DateSelector)getInstance();
+            s.setDatetime("10/10/1999 1:45 PM");
+            s.setWhen(before);
+            s.setCheckdirs(true);
+            results = selectionString(s);
+            assertEquals("FFFFFFFFFFFF", results);
+
+            s = (DateSelector)getInstance();
+            s.setDatetime("10/10/1999 1:45 PM");
+            s.setWhen(after);
+            results = selectionString(s);
+            assertEquals("TTTTTTTTTTTT", results);
+
+            s = (DateSelector)getInstance();
+            s.setDatetime("11/21/2001 4:54 AM");
+            s.setWhen(before);
+            results = selectionString(s);
+            assertEquals("TFTFFFFFFFFT", results);
+/*
+            s = (DateSelector)getInstance();
+            s.setDatetime("11/21/2001 4:55 AM");
+            java.util.Date d = new java.util.Date("11/21/2001 4:55 AM");
+            long milliseconds = s.getMillis();
+            s.setWhen(equal);
+            results = selectionString(s);
+            assertEquals("TTFFTFFFTTTT", results);
+
+            s = (DateSelector)getInstance();
+            s.setMillis(1006347300000L);
+            s.setWhen(equal);
+            results = selectionString(s);
+            assertEquals("TTFFTFFFTTTT", results);
+
+            s = (DateSelector)getInstance();
+            s.setMillis(milliseconds);
+            s.setWhen(equal);
+            results = selectionString(s);
+            assertEquals("TTFFTFFFTTTT", results);
+
+            s = (DateSelector)getInstance();
+            s.setMillis(1006347305000L);
+            s.setWhen(equal);
+            s.setGranularity(15000);
+            results = selectionString(s);
+            assertEquals("TTFFTFFFTTTT", results);
+*/
+            s = (DateSelector)getInstance();
+            s.setDatetime("11/21/2001 4:56 AM");
+            s.setWhen(after);
+            results = selectionString(s);
+            assertEquals("TFFTFTTTFFFT", results);
+
+            s = (DateSelector)getInstance();
+            Parameter param1 = new Parameter();
+            Parameter param2 = new Parameter();
+            param1.setName("datetime");
+            param1.setValue("11/21/2001 4:56 AM");
+            param2.setName("when");
+            param2.setValue("after");
+            Parameter[] params = {param1,param2};
+            s.setParameters(params);
+            results = selectionString(s);
+            assertEquals("TFFTFTTTFFFT", results);
+
+        }
+        finally {
+            cleanupBed();
+        }
+
+    }
+
+}
diff --git a/src/testcases/org/apache/tools/ant/types/selectors/DependSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/DependSelectorTest.java
new file mode 100644
index 000000000..ae4014b2f
--- /dev/null
+++ b/src/testcases/org/apache/tools/ant/types/selectors/DependSelectorTest.java
@@ -0,0 +1,176 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+package org.apache.tools.ant.types.selectors;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.util.*;
+import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.types.Mapper;
+import org.apache.tools.ant.util.FileNameMapper;
+import org.apache.tools.ant.util.IdentityMapper;
+import org.apache.tools.ant.util.GlobPatternMapper;
+
+import junit.framework.TestCase;
+import junit.framework.AssertionFailedError;
+
+/**
+ * Tests Depend Selectors
+ *
+ * @author <a href="mailto:bruce@callenish.com">Bruce Atherton</a>
+ */
+public class DependSelectorTest extends BaseSelectorTest {
+
+    private Project project;
+
+    public DependSelectorTest(String name) {
+        super(name);
+    }
+
+    /**
+     * Factory method from base class. This is overriden in child
+     * classes to return a specific Selector class.
+     */
+    public BaseSelector getInstance() {
+        return new DependSelector();
+    }
+
+    /**
+     * Test the code that validates the selector.
+     */
+    public void testValidate() {
+        DependSelector s = (DependSelector)getInstance();
+        try {
+            s.createMapper();
+            s.createMapper();
+            fail("DependSelector allowed more than one nested mapper.");
+        } catch (BuildException be1) {
+            assertEquals("Cannot define more than one mapper",
+                    be1.getMessage());
+        }
+
+        s = (DependSelector)getInstance();
+        try {
+            s.isSelected(basedir,filenames[0],files[0]);
+            fail("DependSelector did not check for required fields");
+        } catch (BuildException be2) {
+            assertEquals("The targetdir attribute is required.",
+                    be2.getMessage());
+        }
+
+    }
+
+    /**
+     * Tests to make sure that the selector is selecting files correctly.
+     */
+    public void testSelectionBehaviour() {
+        DependSelector s;
+        String results;
+        Mapper m;
+        Mapper.MapperType identity = new Mapper.MapperType();
+        identity.setValue("identity");
+        Mapper.MapperType glob = new Mapper.MapperType();
+        glob.setValue("glob");
+        Mapper.MapperType merge = new Mapper.MapperType();
+        merge.setValue("merge");
+
+        try {
+            makeBed();
+
+            s = (DependSelector)getInstance();
+            s.setTargetdir(basedirname);
+            results = selectionString(s);
+            assertEquals("FFFFFFFFFFFF", results);
+
+            s = (DependSelector)getInstance();
+            s.setTargetdir(basedirname);
+            m = s.createMapper();
+            m.setType(identity);
+            results = selectionString(s);
+            assertEquals("FFFFFFFFFFFF", results);
+
+            s = (DependSelector)getInstance();
+            s.setTargetdir(basedirname);
+            m = s.createMapper();
+            m.setType(merge);
+            m.setTo("asf-logo.gif.gz");
+            results = selectionString(s);
+            assertEquals("TFFFFTTTFFFF", results);
+
+            s = (DependSelector)getInstance();
+            s.setTargetdir(basedirname);
+            m = s.createMapper();
+            m.setType(merge);
+            m.setTo("asf-logo.gif.bz2");
+            results = selectionString(s);
+            assertEquals("TTFTTTTTTTTT", results);
+
+            s = (DependSelector)getInstance();
+            s.setTargetdir(basedirname + "/tar/bz2");
+            m = s.createMapper();
+            m.setType(glob);
+            m.setFrom("*.bz2");
+            m.setTo("*.tar.bz2");
+            results = selectionString(s);
+            assertEquals("FFFFFFFFFTTF", results);
+
+        }
+        finally {
+            cleanupBed();
+        }
+
+    }
+
+}
diff --git a/src/testcases/org/apache/tools/ant/types/selectors/DepthSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/DepthSelectorTest.java
new file mode 100644
index 000000000..621ca3c90
--- /dev/null
+++ b/src/testcases/org/apache/tools/ant/types/selectors/DepthSelectorTest.java
@@ -0,0 +1,200 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+package org.apache.tools.ant.types.selectors;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.util.*;
+import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.types.Parameter;
+
+import junit.framework.TestCase;
+import junit.framework.AssertionFailedError;
+
+/**
+ * Tests Depth Selectors
+ *
+ * @author <a href="mailto:bruce@callenish.com">Bruce Atherton</a>
+ */
+public class DepthSelectorTest extends BaseSelectorTest {
+
+    private Project project;
+
+    public DepthSelectorTest(String name) {
+        super(name);
+    }
+
+    /**
+     * Factory method from base class. This is overriden in child
+     * classes to return a specific Selector class.
+     */
+    public BaseSelector getInstance() {
+        return new DepthSelector();
+    }
+
+    /**
+     * Test the code that validates the selector.
+     */
+    public void testValidate() {
+        DepthSelector s = (DepthSelector)getInstance();
+        try {
+            s.isSelected(basedir,filenames[0],files[0]);
+            fail("DepthSelector did not check for required fields");
+        } catch (BuildException be1) {
+            assertEquals("You must set at least one of the min or the " +
+                    "max levels.", be1.getMessage());
+        }
+
+        s = (DepthSelector)getInstance();
+        s.setMin(5);
+        s.setMax(2);
+        try {
+            s.isSelected(basedir,filenames[0],files[0]);
+            fail("DepthSelector did not check for maximum being higher "
+                    + "than minimum");
+        } catch (BuildException be2) {
+            assertEquals("The maximum depth is lower than the minimum.",
+                    be2.getMessage());
+        }
+
+        s = (DepthSelector)getInstance();
+        Parameter param = new Parameter();
+        param.setName("garbage in");
+        param.setValue("garbage out");
+        Parameter[] params = new Parameter[1];
+        params[0] = param;
+        s.setParameters(params);
+        try {
+            s.isSelected(basedir,filenames[0],files[0]);
+            fail("DepthSelector did not check for valid parameter element");
+        } catch (BuildException be3) {
+            assertEquals("Invalid parameter garbage in", be3.getMessage());
+        }
+
+        s = (DepthSelector)getInstance();
+        param = new Parameter();
+        param.setName("min");
+        param.setValue("garbage out");
+        params[0] = param;
+        s.setParameters(params);
+        try {
+            s.isSelected(basedir,filenames[0],files[0]);
+            fail("DepthSelector accepted bad minimum as parameter");
+        } catch (BuildException be4) {
+            assertEquals("Invalid minimum value garbage out",
+                    be4.getMessage());
+        }
+
+        s = (DepthSelector)getInstance();
+        param = new Parameter();
+        param.setName("max");
+        param.setValue("garbage out");
+        params[0] = param;
+        s.setParameters(params);
+        try {
+            s.isSelected(basedir,filenames[0],files[0]);
+            fail("DepthSelector accepted bad maximum as parameter");
+        } catch (BuildException be5) {
+            assertEquals("Invalid maximum value garbage out",
+                    be5.getMessage());
+        }
+
+    }
+
+    /**
+     * Tests to make sure that the selector is selecting files correctly.
+     */
+    public void testSelectionBehaviour() {
+        DepthSelector s;
+        String results;
+
+        try {
+            makeBed();
+
+            s = (DepthSelector)getInstance();
+            s.setMin(20);
+            s.setMax(25);
+            results = selectionString(s);
+            assertEquals("FFFFFFFFFFFF", results);
+
+            s = (DepthSelector)getInstance();
+            s.setMin(0);
+            results = selectionString(s);
+            assertEquals("TTTTTTTTTTTT", results);
+
+            s = (DepthSelector)getInstance();
+            s.setMin(1);
+            results = selectionString(s);
+            assertEquals("FFFFFTTTTTTT", results);
+
+            s = (DepthSelector)getInstance();
+            s.setMax(0);
+            results = selectionString(s);
+            assertEquals("TTTTTFFFFFFF", results);
+
+            s = (DepthSelector)getInstance();
+            s.setMin(1);
+            s.setMax(1);
+            results = selectionString(s);
+            assertEquals("FFFFFTTTFFFT", results);
+
+        }
+        finally {
+            cleanupBed();
+        }
+
+    }
+
+}
diff --git a/src/testcases/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java
new file mode 100644
index 000000000..c60969290
--- /dev/null
+++ b/src/testcases/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java
@@ -0,0 +1,167 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+package org.apache.tools.ant.types.selectors;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.util.*;
+import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.types.Parameter;
+
+import junit.framework.TestCase;
+import junit.framework.AssertionFailedError;
+
+/**
+ * Tests Filename Selectors
+ *
+ * @author <a href="mailto:bruce@callenish.com">Bruce Atherton</a>
+ */
+public class FilenameSelectorTest extends BaseSelectorTest {
+
+    private Project project;
+
+    public FilenameSelectorTest(String name) {
+        super(name);
+    }
+
+    /**
+     * Factory method from base class. This is overriden in child
+     * classes to return a specific Selector class.
+     */
+    public BaseSelector getInstance() {
+        return new FilenameSelector();
+    }
+
+    /**
+     * Test the code that validates the selector.
+     */
+    public void testValidate() {
+        FilenameSelector s = (FilenameSelector)getInstance();
+        try {
+            s.isSelected(basedir,filenames[0],files[0]);
+            fail("FilenameSelector did not check for required fields");
+        } catch (BuildException be1) {
+            assertEquals("The name attribute is required", be1.getMessage());
+        }
+
+        s = (FilenameSelector)getInstance();
+        Parameter param = new Parameter();
+        param.setName("garbage in");
+        param.setValue("garbage out");
+        Parameter[] params = {param};
+        s.setParameters(params);
+        try {
+            s.isSelected(basedir,filenames[0],files[0]);
+            fail("FilenameSelector did not check for valid parameter element");
+        } catch (BuildException be2) {
+            assertEquals("Invalid parameter garbage in", be2.getMessage());
+        }
+
+    }
+
+    /**
+     * Tests to make sure that the selector is selecting files correctly.
+     */
+    public void testSelectionBehaviour() {
+        FilenameSelector s;
+        String results;
+
+        try {
+            makeBed();
+
+            s = (FilenameSelector)getInstance();
+            s.setName("no match possible");
+            results = selectionString(s);
+            assertEquals("FFFFFFFFFFFF", results);
+
+            s = (FilenameSelector)getInstance();
+            s.setName("*.gz");
+            results = selectionString(s);
+            // This is turned off temporarily. There appears to be a bug
+            // in SelectorUtils.matchPattern() where it is recursive on
+            // Windows even if no ** is in pattern.
+            //assertEquals("FFFTFFFFFFFF", results); // Unix
+            // vs
+            //assertEquals("FFFTFFFFTFFF", results); // Windows
+
+            s = (FilenameSelector)getInstance();
+            s.setName("**/*.gz");
+            s.setNegate(true);
+            results = selectionString(s);
+            assertEquals("TTTFTTTTFTTT", results);
+
+            s = (FilenameSelector)getInstance();
+            s.setName("**/*.GZ");
+            s.setCasesensitive(false);
+            results = selectionString(s);
+            assertEquals("FFFTFFFFTFFF", results);
+
+            s = (FilenameSelector)getInstance();
+            Parameter param1 = new Parameter();
+            param1.setName("name");
+            param1.setValue("**/*.bz2");
+            Parameter[] params = {param1};
+            s.setParameters(params);
+            results = selectionString(s);
+            assertEquals("FFTFFFFFFTTF", results);
+
+        }
+        finally {
+            cleanupBed();
+        }
+
+    }
+
+}
diff --git a/src/testcases/org/apache/tools/ant/types/selectors/PresentSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/PresentSelectorTest.java
new file mode 100644
index 000000000..eea20975f
--- /dev/null
+++ b/src/testcases/org/apache/tools/ant/types/selectors/PresentSelectorTest.java
@@ -0,0 +1,177 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+package org.apache.tools.ant.types.selectors;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.util.*;
+import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.types.Mapper;
+import org.apache.tools.ant.util.FileNameMapper;
+import org.apache.tools.ant.util.IdentityMapper;
+import org.apache.tools.ant.util.GlobPatternMapper;
+
+import junit.framework.TestCase;
+import junit.framework.AssertionFailedError;
+
+/**
+ * Tests Present Selectors
+ *
+ * @author <a href="mailto:bruce@callenish.com">Bruce Atherton</a>
+ */
+public class PresentSelectorTest extends BaseSelectorTest {
+
+    private Project project;
+
+    public PresentSelectorTest(String name) {
+        super(name);
+    }
+
+    /**
+     * Factory method from base class. This is overriden in child
+     * classes to return a specific Selector class.
+     */
+    public BaseSelector getInstance() {
+        return new PresentSelector();
+    }
+
+    /**
+     * Test the code that validates the selector.
+     */
+    public void testValidate() {
+        PresentSelector s = (PresentSelector)getInstance();
+        try {
+            s.createMapper();
+            s.createMapper();
+            fail("PresentSelector allowed more than one nested mapper.");
+        } catch (BuildException be1) {
+            assertEquals("Cannot define more than one mapper",
+                    be1.getMessage());
+        }
+
+        s = (PresentSelector)getInstance();
+        try {
+            s.isSelected(basedir,filenames[0],files[0]);
+            fail("PresentSelector did not check for required fields");
+        } catch (BuildException be2) {
+            assertEquals("The targetdir attribute is required.",
+                    be2.getMessage());
+        }
+
+    }
+
+    /**
+     * Tests to make sure that the selector is selecting files correctly.
+     */
+    public void testSelectionBehaviour() {
+        PresentSelector s;
+        String results;
+        Mapper m;
+        Mapper.MapperType identity = new Mapper.MapperType();
+        identity.setValue("identity");
+        Mapper.MapperType glob = new Mapper.MapperType();
+        glob.setValue("glob");
+        Mapper.MapperType merge = new Mapper.MapperType();
+        merge.setValue("merge");
+        Mapper.MapperType flatten = new Mapper.MapperType();
+        flatten.setValue("flatten");
+
+        try {
+            makeBed();
+
+            s = (PresentSelector)getInstance();
+            s.setTargetdir(basedirname);
+            results = selectionString(s);
+            assertEquals("TTTTTTTTTTTT", results);
+
+            s = (PresentSelector)getInstance();
+            s.setTargetdir(basedirname);
+            m = s.createMapper();
+            m.setType(identity);
+            results = selectionString(s);
+            assertEquals("TTTTTTTTTTTT", results);
+
+            s = (PresentSelector)getInstance();
+            s.setTargetdir("src/etc/testcases/taskdefs/expected");
+            m = s.createMapper();
+            m.setType(flatten);
+            results = selectionString(s);
+            assertEquals("TTTTTTTTTTTF", results);
+
+            s = (PresentSelector)getInstance();
+            s.setTargetdir(basedirname);
+            m = s.createMapper();
+            m.setType(merge);
+            m.setTo("asf-logo.gif.gz");
+            results = selectionString(s);
+            assertEquals("TTTTTTTTTTTT", results);
+
+            s = (PresentSelector)getInstance();
+            s.setTargetdir(basedirname + "/tar/bz2");
+            m = s.createMapper();
+            m.setType(glob);
+            m.setFrom("*.bz2");
+            m.setTo("*.tar.bz2");
+            results = selectionString(s);
+            assertEquals("FFTFFFFFFFFF", results);
+
+        }
+        finally {
+            cleanupBed();
+        }
+
+    }
+
+}
diff --git a/src/testcases/org/apache/tools/ant/types/selectors/SizeSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/SizeSelectorTest.java
new file mode 100644
index 000000000..be471e5ba
--- /dev/null
+++ b/src/testcases/org/apache/tools/ant/types/selectors/SizeSelectorTest.java
@@ -0,0 +1,243 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+package org.apache.tools.ant.types.selectors;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.util.*;
+import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.types.Parameter;
+
+import junit.framework.TestCase;
+import junit.framework.AssertionFailedError;
+
+/**
+ * Tests Size Selectors
+ *
+ * @author <a href="mailto:bruce@callenish.com">Bruce Atherton</a>
+ */
+public class SizeSelectorTest extends BaseSelectorTest {
+
+    private Project project;
+
+    public SizeSelectorTest(String name) {
+        super(name);
+    }
+
+    /**
+     * Factory method from base class. This is overriden in child
+     * classes to return a specific Selector class.
+     */
+    public BaseSelector getInstance() {
+        return new SizeSelector();
+    }
+
+    /**
+     * Test the code that validates the selector.
+     */
+    public void testValidate() {
+        SizeSelector s = (SizeSelector)getInstance();
+        try {
+            s.isSelected(basedir,filenames[0],files[0]);
+            fail("SizeSelector did not check for required fields");
+        } catch (BuildException be1) {
+            assertEquals("The value attribute is required, and must "
+                    + "be positive", be1.getMessage());
+        }
+
+        s = (SizeSelector)getInstance();
+        s.setValue(-10);
+        try {
+            s.isSelected(basedir,filenames[0],files[0]);
+            fail("SizeSelector did not check for value being in the "
+                    + "allowable range");
+        } catch (BuildException be2) {
+            assertEquals("The value attribute is required, and must "
+                    + "be positive", be2.getMessage());
+        }
+
+        s = (SizeSelector)getInstance();
+        Parameter param = new Parameter();
+        param.setName("garbage in");
+        param.setValue("garbage out");
+        Parameter[] params = {param};
+        s.setParameters(params);
+        try {
+            s.isSelected(basedir,filenames[0],files[0]);
+            fail("SizeSelector did not check for valid parameter element");
+        } catch (BuildException be3) {
+            assertEquals("Invalid parameter garbage in", be3.getMessage());
+        }
+
+        s = (SizeSelector)getInstance();
+        param = new Parameter();
+        param.setName("value");
+        param.setValue("garbage out");
+        params[0] = param;
+        s.setParameters(params);
+        try {
+            s.isSelected(basedir,filenames[0],files[0]);
+            fail("SizeSelector accepted bad value as parameter");
+        } catch (BuildException be4) {
+            assertEquals("Invalid size setting garbage out",
+                    be4.getMessage());
+        }
+
+        s = (SizeSelector)getInstance();
+        Parameter param1 = new Parameter();
+        Parameter param2 = new Parameter();
+        param1.setName("value");
+        param1.setValue("5");
+        param2.setName("units");
+        param2.setValue("garbage out");
+        params = new Parameter[2];
+        params[0] = param1;
+        params[1] = param2;
+        try {
+            s.setParameters(params);
+            s.isSelected(basedir,filenames[0],files[0]);
+            fail("SizeSelector accepted bad units as parameter");
+        } catch (BuildException be5) {
+            assertEquals("garbage out is not a legal value for this attribute",
+                    be5.getMessage());
+        }
+
+    }
+
+    /**
+     * Tests to make sure that the selector is selecting files correctly.
+     */
+    public void testSelectionBehaviour() {
+        SizeSelector s;
+        String results;
+
+        SizeSelector.ByteUnits kilo = new SizeSelector.ByteUnits();
+        kilo.setValue("K");
+        SizeSelector.ByteUnits kibi = new SizeSelector.ByteUnits();
+        kibi.setValue("Ki");
+        SizeSelector.ByteUnits tibi = new SizeSelector.ByteUnits();
+        tibi.setValue("Ti");
+        SizeSelector.SizeComparisons less = new SizeSelector.SizeComparisons();
+        less.setValue("less");
+        SizeSelector.SizeComparisons equal = new SizeSelector.SizeComparisons();
+        equal.setValue("equal");
+        SizeSelector.SizeComparisons more = new SizeSelector.SizeComparisons();
+        more.setValue("more");
+
+
+        try {
+            makeBed();
+
+            s = (SizeSelector)getInstance();
+            s.setValue(10);
+            s.setWhen(less);
+            results = selectionString(s);
+            assertEquals("TFFFFFFFFFFT", results);
+
+            s = (SizeSelector)getInstance();
+            s.setValue(10);
+            s.setWhen(more);
+            results = selectionString(s);
+            assertEquals("TTTTTTTTTTTT", results);
+
+            s = (SizeSelector)getInstance();
+            s.setValue(32);
+            s.setWhen(equal);
+            results = selectionString(s);
+            assertEquals("TTFFTFFFFFFT", results);
+
+            s = (SizeSelector)getInstance();
+            s.setValue(7);
+            s.setWhen(more);
+            s.setUnits(kilo);
+            results = selectionString(s);
+            assertEquals("TFTFFTTTTTTT", results);
+
+            s = (SizeSelector)getInstance();
+            s.setValue(7);
+            s.setWhen(more);
+            s.setUnits(kibi);
+            results = selectionString(s);
+            assertEquals("TFTFFFTTFTTT", results);
+
+            s = (SizeSelector)getInstance();
+            s.setValue(99999);
+            s.setWhen(more);
+            s.setUnits(tibi);
+            results = selectionString(s);
+            assertEquals("TFFFFFFFFFFT", results);
+
+            s = (SizeSelector)getInstance();
+            Parameter param1 = new Parameter();
+            Parameter param2 = new Parameter();
+            Parameter param3 = new Parameter();
+            param1.setName("value");
+            param1.setValue("20");
+            param2.setName("units");
+            param2.setValue("Ki");
+            param3.setName("when");
+            param3.setValue("more");
+            Parameter[] params = {param1,param2,param3};
+            s.setParameters(params);
+            results = selectionString(s);
+            assertEquals("TFFFFFFTFFTT", results);
+        }
+        finally {
+            cleanupBed();
+        }
+
+    }
+
+}
diff --git a/src/testcases/org/apache/tools/ant/util/FileUtilsTest.java b/src/testcases/org/apache/tools/ant/util/FileUtilsTest.java
index 66dbaf5d2..ad0fe140b 100644
--- a/src/testcases/org/apache/tools/ant/util/FileUtilsTest.java
+++ b/src/testcases/org/apache/tools/ant/util/FileUtilsTest.java
@@ -382,6 +382,30 @@ public class FileUtilsTest extends TestCase {
         assertTrue(removeThis.exists());
     }
 
+    /**
+     * Test removeLeadingPath.
+     */
+    public void testRemoveLeadingPath() {
+        assertEquals("bar", fu.removeLeadingPath(new File("/foo"), 
+                                                 new File("/foo/bar")));
+        assertEquals("bar", fu.removeLeadingPath(new File("/foo/"), 
+                                                 new File("/foo/bar")));
+        assertEquals("bar", fu.removeLeadingPath(new File("\\foo"), 
+                                                 new File("\\foo\\bar")));
+        assertEquals("bar", fu.removeLeadingPath(new File("\\foo\\"), 
+                                                 new File("\\foo\\bar")));
+        assertEquals("bar", fu.removeLeadingPath(new File("c:/foo"), 
+                                                 new File("c:/foo/bar")));
+        assertEquals("bar", fu.removeLeadingPath(new File("c:/foo/"), 
+                                                 new File("c:/foo/bar")));
+        assertEquals("bar", fu.removeLeadingPath(new File("c:\\foo"), 
+                                                 new File("c:\\foo\\bar")));
+        assertEquals("bar", fu.removeLeadingPath(new File("c:\\foo\\"), 
+                                                 new File("c:\\foo\\bar")));
+        assertEquals(fu.normalize("/bar").getAbsolutePath(), 
+                     fu.removeLeadingPath(new File("/foo"), new File("/bar")));
+    }
+
     /**
      * adapt file separators to local conventions
      */
diff --git a/src/testcases/org/apache/tools/ant/util/JavaEnvUtilsTest.java b/src/testcases/org/apache/tools/ant/util/JavaEnvUtilsTest.java
index b649809c3..adac16dc5 100644
--- a/src/testcases/org/apache/tools/ant/util/JavaEnvUtilsTest.java
+++ b/src/testcases/org/apache/tools/ant/util/JavaEnvUtilsTest.java
@@ -155,7 +155,8 @@ public class JavaEnvUtilsTest extends TestCase {
                        j.startsWith(javaHomeParent));
 
             if (JavaEnvUtils.getJavaVersion() == JavaEnvUtils.JAVA_1_0 ||
-                JavaEnvUtils.getJavaVersion() == JavaEnvUtils.JAVA_1_1) {
+                JavaEnvUtils.getJavaVersion() == JavaEnvUtils.JAVA_1_1 ||
+                Os.isFamily("mac")) {
                 assertTrue(j+" is normalized and in the JRE dir",
                            j.startsWith(javaHome));
             } else {
diff --git a/xdocs/antnews.xml b/xdocs/antnews.xml
index ef5f06286..8e96f2e88 100644
--- a/xdocs/antnews.xml
+++ b/xdocs/antnews.xml
@@ -8,6 +8,15 @@
   </properties>
 
 <body>
+  <section name="Ant 1.5Beta2">
+    <h3>June 1, 2002 - Ant 1.5 Beta2 Available!</h3>
+    <p>The second beta version of Ant 1.5 is now available for 
+     <a href="http://jakarta.apache.org/builds/jakarta-ant/release/v1.5Beta2/">
+     download</a>. If you have any feedback on the beta feel free to join the 
+     discussion on the ant-dev and ant-user mailing lists.
+     </p>
+  </section>
+
   <section name="Ant 1.5Beta1">
     <h3>Ant 1.5 Beta1 Available !</h3>
     <p>The first beta version of Ant 1.5 is now available for 
diff --git a/xdocs/external.xml b/xdocs/external.xml
index 711a009cc..ae5145b62 100644
--- a/xdocs/external.xml
+++ b/xdocs/external.xml
@@ -847,6 +847,28 @@
           </tr>
         </table>
       </subsection>
+
+
+      <subsection name="WebSphere Studio Application Developer">
+
+        <p>WSAD features Ant integrate by virtue of being built on the Eclipse tools platform.</p>
+
+        <table>
+          <tr>
+            <th>Compatibility:</th>
+            <td>bundles Ant 1.4.1</td>
+          </tr>
+          <tr>
+            <th>Article:</th>
+            <td><a href="http://www7b.software.ibm.com/wsdd/library/techarticles/0203_searle/searle1.html">Ant Integration Part1</a></td>
+          </tr>
+          <tr>
+            <th>License:</th>
+            <td>Commercial</td>
+          </tr>
+        </table>
+      </subsection>
+
     </section>
     
   </body>
diff --git a/xdocs/index.xml b/xdocs/index.xml
index 9b454c580..5d1000fc0 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -9,10 +9,10 @@
 
 <body>
 
-  <section name="Ant 1.5Beta1">
-    <h3>Apache Ant 1.5Beta1 Available !</h3>
-    <p>Version 1.5Beta1 of Ant has been released. It is available for download 
-      <a href="http://jakarta.apache.org/builds/jakarta-ant/release/v1.5Beta1/">
+  <section name="Ant 1.5Beta2">
+    <h3>Apache Ant 1.5Beta2 Available !</h3>
+    <p>Version 1.5Beta2 of Ant has been released. It is available for download 
+      <a href="http://jakarta.apache.org/builds/jakarta-ant/release/v1.5Beta2/">
       here</a>.
     </p>
     <p><a href="./antnews.html">Read more news about Ant</a></p>