From 6bd8d6e938a45868902ecd1092858e8372933c7c Mon Sep 17 00:00:00 2001 From: Magesh Umasankar Date: Sat, 22 Jun 2002 23:38:38 +0000 Subject: [PATCH] Merge changes made to 1.5 Beta2. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272967 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 192 ++- build.xml | 5 + docs/manual/CoreTasks/apply.html | 5 +- docs/manual/CoreTasks/checksum.html | 11 +- docs/manual/CoreTasks/chmod.html | 4 +- docs/manual/CoreTasks/copydir.html | 6 +- docs/manual/CoreTasks/delete.html | 4 +- docs/manual/CoreTasks/dirname.html | 2 +- docs/manual/CoreTasks/ear.html | 4 +- docs/manual/CoreTasks/exec.html | 5 +- docs/manual/CoreTasks/fixcrlf.html | 10 +- docs/manual/CoreTasks/jar.html | 4 +- docs/manual/CoreTasks/javac.html | 18 +- docs/manual/CoreTasks/mail.html | 19 +- docs/manual/CoreTasks/manifest.html | 4 +- docs/manual/CoreTasks/patch.html | 3 +- docs/manual/CoreTasks/property.html | 19 +- docs/manual/CoreTasks/replace.html | 4 +- docs/manual/CoreTasks/rmic.html | 4 +- docs/manual/CoreTasks/sql.html | 5 + docs/manual/CoreTasks/style.html | 6 +- docs/manual/CoreTasks/tar.html | 8 +- docs/manual/CoreTasks/taskdef.html | 7 + docs/manual/CoreTasks/tstamp.html | 8 +- docs/manual/CoreTasks/war.html | 10 +- docs/manual/CoreTasks/xmlproperty.html | 4 +- docs/manual/CoreTasks/zip.html | 9 +- docs/manual/CoreTypes/dirset.html | 4 +- docs/manual/CoreTypes/fileset.html | 4 +- docs/manual/CoreTypes/patternset.html | 4 +- .../manual/OptionalTasks/BorlandEJBTasks.html | 73 +- .../OptionalTasks/BorlandGenerateClient.html | 39 +- docs/manual/OptionalTasks/antlr.html | 8 +- docs/manual/OptionalTasks/cab.html | 10 +- docs/manual/OptionalTasks/ccm.html | 12 +- docs/manual/OptionalTasks/dotnet.html | 4 +- docs/manual/OptionalTasks/ejb.html | 347 +++--- .../OptionalTasks/jarlib-available.html | 119 ++ docs/manual/OptionalTasks/jarlib-display.html | 65 ++ .../manual/OptionalTasks/jarlib-manifest.html | 108 ++ docs/manual/OptionalTasks/jarlib-resolve.html | 196 ++++ docs/manual/OptionalTasks/jspc.html | 96 +- docs/manual/OptionalTasks/junitreport.html | 13 +- docs/manual/OptionalTasks/native2ascii.html | 20 +- docs/manual/OptionalTasks/netrexxc.html | 6 +- docs/manual/OptionalTasks/pvcstask.html | 22 +- .../OptionalTasks/renameextensions.html | 14 +- docs/manual/OptionalTasks/test.html | 4 + docs/manual/OptionalTasks/vss.html | 108 +- docs/manual/OptionalTypes/extension.html | 99 ++ docs/manual/OptionalTypes/extensionset.html | 69 ++ docs/manual/conceptstypeslist.html | 1 + docs/manual/credits.html | 2 +- docs/manual/index.html | 2 +- docs/manual/install.html | 2 +- docs/manual/optionaltasklist.html | 4 + docs/manual/running.html | 117 +- proposal/xdocs/build.xml | 17 +- .../apache/tools/ant/xdoclet/TaskSubTask.java | 6 +- .../tools/ant/xdoclet/TaskTagsHandler.java | 285 +++-- proposal/xdocs/templates/task_xdoc.template | 30 +- src/etc/manifest | 2 +- src/etc/testcases/taskdefs/ant.xml | 46 + src/etc/testcases/taskdefs/available.xml | 2 +- .../taskdefs/fixcrlf/expected/Mac2Unix | 2 + .../testcases/taskdefs/fixcrlf/input/Mac2Unix | 2 +- src/etc/testcases/types/quote1.xml | 9 + src/etc/testcases/types/quote2.xml | 10 + src/etc/testcases/types/xmlcatalog.xml | 134 +++ src/etc/testcases/types/xmlcatalog.xsl | 31 + src/etc/testcases/types/xmlcatalog1.xml | 14 + src/etc/testcases/types/xmlcatalog2.xml | 11 + .../org/apache/tools/ant/AntClassLoader.java | 17 + .../org/apache/tools/ant/DefaultLogger.java | 30 +- src/main/org/apache/tools/ant/Main.java | 58 +- src/main/org/apache/tools/ant/Project.java | 165 ++- .../apache/tools/ant/RuntimeConfigurable.java | 93 +- src/main/org/apache/tools/ant/Task.java | 9 + .../org/apache/tools/ant/UnknownElement.java | 39 +- .../tools/ant/filters/LineContains.java | 4 - .../tools/ant/taskdefs/AbstractCvsTask.java | 76 ++ .../org/apache/tools/ant/taskdefs/Ant.java | 58 +- .../apache/tools/ant/taskdefs/Available.java | 15 +- .../org/apache/tools/ant/taskdefs/BZip2.java | 2 +- .../apache/tools/ant/taskdefs/Basename.java | 12 +- .../tools/ant/taskdefs/BuildNumber.java | 2 +- .../apache/tools/ant/taskdefs/CVSPass.java | 14 +- .../apache/tools/ant/taskdefs/CallTarget.java | 21 +- .../apache/tools/ant/taskdefs/Checksum.java | 33 +- .../org/apache/tools/ant/taskdefs/Chmod.java | 33 +- .../org/apache/tools/ant/taskdefs/Concat.java | 8 +- .../tools/ant/taskdefs/ConditionTask.java | 13 +- .../org/apache/tools/ant/taskdefs/Copy.java | 12 +- .../org/apache/tools/ant/taskdefs/Cvs.java | 2 + .../apache/tools/ant/taskdefs/Definer.java | 88 +- .../org/apache/tools/ant/taskdefs/Delete.java | 11 +- .../apache/tools/ant/taskdefs/DependSet.java | 60 +- .../apache/tools/ant/taskdefs/Dirname.java | 51 +- .../org/apache/tools/ant/taskdefs/Ear.java | 7 +- .../org/apache/tools/ant/taskdefs/Echo.java | 6 +- .../apache/tools/ant/taskdefs/ExecTask.java | 29 +- .../apache/tools/ant/taskdefs/Execute.java | 74 +- .../apache/tools/ant/taskdefs/ExecuteOn.java | 21 +- .../org/apache/tools/ant/taskdefs/Exit.java | 22 +- .../org/apache/tools/ant/taskdefs/Filter.java | 18 +- .../apache/tools/ant/taskdefs/FixCRLF.java | 34 +- .../tools/ant/taskdefs/GenerateKey.java | 85 +- .../org/apache/tools/ant/taskdefs/Get.java | 11 +- .../org/apache/tools/ant/taskdefs/Input.java | 4 +- .../apache/tools/ant/taskdefs/JDBCTask.java | 28 +- .../org/apache/tools/ant/taskdefs/Jar.java | 106 +- .../org/apache/tools/ant/taskdefs/Java.java | 34 +- .../org/apache/tools/ant/taskdefs/Javac.java | 85 +- .../apache/tools/ant/taskdefs/Javadoc.java | 333 ++++-- .../apache/tools/ant/taskdefs/LoadFile.java | 6 +- .../tools/ant/taskdefs/LoadProperties.java | 6 +- .../apache/tools/ant/taskdefs/Manifest.java | 219 ++-- .../org/apache/tools/ant/taskdefs/Mkdir.java | 13 + .../org/apache/tools/ant/taskdefs/Move.java | 33 +- .../org/apache/tools/ant/taskdefs/Pack.java | 34 +- .../apache/tools/ant/taskdefs/Parallel.java | 17 +- .../org/apache/tools/ant/taskdefs/Patch.java | 23 +- .../tools/ant/taskdefs/PathConvert.java | 124 +- .../apache/tools/ant/taskdefs/Property.java | 148 ++- .../apache/tools/ant/taskdefs/Recorder.java | 17 +- .../apache/tools/ant/taskdefs/Replace.java | 104 +- .../org/apache/tools/ant/taskdefs/Rmic.java | 151 ++- .../apache/tools/ant/taskdefs/SQLExec.java | 103 +- .../apache/tools/ant/taskdefs/SendEmail.java | 52 +- .../apache/tools/ant/taskdefs/Sequential.java | 25 +- .../apache/tools/ant/taskdefs/SignJar.java | 60 +- .../org/apache/tools/ant/taskdefs/Sleep.java | 32 +- .../org/apache/tools/ant/taskdefs/Tar.java | 98 +- .../apache/tools/ant/taskdefs/Taskdef.java | 18 +- .../org/apache/tools/ant/taskdefs/Touch.java | 14 +- .../org/apache/tools/ant/taskdefs/Tstamp.java | 95 +- .../apache/tools/ant/taskdefs/Typedef.java | 21 +- .../org/apache/tools/ant/taskdefs/Unpack.java | 10 + .../org/apache/tools/ant/taskdefs/Untar.java | 20 +- .../apache/tools/ant/taskdefs/WaitFor.java | 7 +- .../org/apache/tools/ant/taskdefs/War.java | 40 +- .../tools/ant/taskdefs/XSLTProcess.java | 212 ++-- .../tools/ant/taskdefs/XmlProperty.java | 48 +- .../org/apache/tools/ant/taskdefs/Zip.java | 53 +- .../compilers/DefaultCompilerAdapter.java | 20 +- .../tools/ant/taskdefs/compilers/Gcj.java | 6 +- .../tools/ant/taskdefs/compilers/Jikes.java | 6 +- .../tools/ant/taskdefs/compilers/Jvc.java | 6 +- .../tools/ant/taskdefs/compilers/Kjc.java | 8 +- .../tools/ant/taskdefs/condition/Os.java | 2 +- .../ant/taskdefs/cvslib/ChangeLogTask.java | 4 +- .../tools/ant/taskdefs/cvslib/CvsTagDiff.java | 22 +- .../tools/ant/taskdefs/email/EmailTask.java | 5 +- .../tools/ant/taskdefs/email/Mailer.java | 37 + .../tools/ant/taskdefs/email/MimeMailer.java | 3 +- .../tools/ant/taskdefs/email/PlainMailer.java | 9 +- .../tools/ant/taskdefs/optional/Cab.java | 14 +- .../ant/taskdefs/optional/EchoProperties.java | 8 +- .../ant/taskdefs/optional/Native2Ascii.java | 7 +- .../ant/taskdefs/optional/ccm/CCMCheck.java | 8 +- .../ant/taskdefs/optional/ccm/CCMCheckin.java | 5 +- .../optional/ccm/CCMCheckinDefault.java | 3 +- .../taskdefs/optional/ccm/CCMCheckout.java | 5 +- .../taskdefs/optional/ccm/CCMCreateTask.java | 25 +- .../taskdefs/optional/ccm/CCMReconfigure.java | 7 +- .../ant/taskdefs/optional/ccm/Continuus.java | 4 +- .../optional/clearcase/CCCheckin.java | 24 +- .../optional/clearcase/CCCheckout.java | 20 +- .../optional/clearcase/CCUnCheckout.java | 5 +- .../taskdefs/optional/clearcase/CCUpdate.java | 22 +- .../optional/clearcase/ClearCase.java | 4 +- .../taskdefs/optional/depend/AntAnalyzer.java | 26 +- .../ant/taskdefs/optional/depend/Depend.java | 24 +- .../ant/taskdefs/optional/dotnet/CSharp.java | 65 +- .../optional/dotnet/WsdlToDotnet.java | 109 +- .../optional/ejb/BorlandDeploymentTool.java | 94 +- .../optional/ejb/BorlandGenerateClient.java | 149 ++- .../ant/taskdefs/optional/ejb/DDCreator.java | 2 +- .../ant/taskdefs/optional/ejb/EjbJar.java | 127 +- .../tools/ant/taskdefs/optional/ejb/Ejbc.java | 6 +- .../optional/ejb/IPlanetDeploymentTool.java | 65 +- .../taskdefs/optional/ejb/IPlanetEjbc.java | 17 +- .../optional/ejb/JonasDeploymentTool.java | 1025 ++++++++++------- .../optional/ejb/WeblogicDeploymentTool.java | 52 +- .../optional/extension/Extension.java | 6 +- .../extension/JarLibAvailableTask.java | 4 +- .../tools/ant/taskdefs/optional/jsp/JspC.java | 8 +- .../optional/junit/JUnitTestRunner.java | 2 +- .../tools/ant/taskdefs/optional/net/FTP.java | 21 +- .../ant/taskdefs/optional/net/TelnetTask.java | 74 +- .../ant/taskdefs/optional/pvcs/Pvcs.java | 109 +- .../apache/tools/ant/types/XMLCatalog.java | 20 +- .../org/apache/tools/ant/util/FileUtils.java | 32 +- .../apache/tools/ant/util/JavaEnvUtils.java | 55 + .../org/apache/tools/mail/MailMessage.java | 49 +- .../apache/tools/ant/taskdefs/AntTest.java | 82 +- .../apache/tools/ant/taskdefs/TStampTest.java | 35 +- .../ant/types/XMLCatalogBuildFileTest.java | 139 +++ 198 files changed, 6220 insertions(+), 2645 deletions(-) create mode 100644 docs/manual/OptionalTasks/jarlib-available.html create mode 100644 docs/manual/OptionalTasks/jarlib-display.html create mode 100644 docs/manual/OptionalTasks/jarlib-manifest.html create mode 100644 docs/manual/OptionalTasks/jarlib-resolve.html create mode 100644 docs/manual/OptionalTypes/extension.html create mode 100644 docs/manual/OptionalTypes/extensionset.html create mode 100644 src/etc/testcases/types/quote1.xml create mode 100644 src/etc/testcases/types/quote2.xml create mode 100644 src/etc/testcases/types/xmlcatalog.xml create mode 100644 src/etc/testcases/types/xmlcatalog.xsl create mode 100644 src/etc/testcases/types/xmlcatalog1.xml create mode 100644 src/etc/testcases/types/xmlcatalog2.xml create mode 100644 src/testcases/org/apache/tools/ant/types/XMLCatalogBuildFileTest.java diff --git a/WHATSNEW b/WHATSNEW index 6b9a0201a..35edc7fbf 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -128,6 +128,192 @@ Changes that could break older environments: -------------------------------------------- * Important: Single $ signs are no longer silently stripped! +======= +* Project.getBuildListeners now returns a clone of the listener + list. Changes to the returned list will not affect the listeners + currently attached to the Project. It also means that it is safe to + iterate over the returned list if listeners are added or removed + during the traversal. + +* default filenameformat has been different from Ant 1.4.1. + Now it is different from 1.5beta1 and 1.5beta2. + +* Some messages that are printed during startup will not be + written to the logfile specified via -logfile as they might destroy + the format of the file for special BuildLoggers (like XmlLogger). + +Fixed bugs: +----------- + +* could fail to find files or directories that happen to + start with the name of the project's basedir but are not children of + the basedir. + +* Nested 's inside can now be overriden by subsequent + and tasks. + +* 's outputtype attribute wouldn't do anything. + +* filterreader could swallow lines. + +* used to configure the tasks (set their attributes) + before the first task has been executed. This means that properties + that have been set by nested task seemed to be unset for the other + tasks in the same element. + +* 's sourcepath setting has been ignored by some compiler + implementations. + +* 's packagelist attribute didn't work. + +* the plain mailer would always use port 25 in . + +* Ant's default logger could swallow empty lines. + +* ejbjar's iPlanet nested element now can process multiple descriptors. + +* IPlanetEjbc was looking in the wrong place for four iiop files. + +* would pass the -source switch to JDK 1.3's javac, even + though it doesn't support it. + +Other changes: +-------------- + +* now uses a buffer (of configurable size). + +* The "Trying to override task definition" warning has been degraded + to verbose level if the two task definitions only differ in the class + loader instance that has loaded the definition. + +* Add a jvmargs to the ejbjar's weblogic element to allow additional + arguments to be provided to the VM runnign ejbc. Document the + jvmdebuglevel attribute which can be used to avoid warnings about + interface classess being found on the classpath. Document the new + element which allows JVM properties to be defined. + Added an outputdir attribute to allow the destination to be a + directory into which the exploded jar is written. + +* ejbjar now supports Borland Enterprise Server 5 and Jonas 2.5 + +Changes from Ant 1.5beta1 to Ant 1.5beta2 +========================================= + +Changes that could break older environments: +-------------------------------------------- + +* 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 attempts a rename, it deletes the destination file, if it + exists, before renaming the source file. However, 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 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. + +* throws a build exception on an http authorization error, unless you +have set ignoreerrors to true. + +* was spelt in Wintel case: . 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. + +* and tasks were in beta1, but not defined by +default; They now are. fills a property with the name of a +temporary file; lets you set the JVM's http, ftp and socks proxy +settings. + +* failed for +JDK 1.1 and 1.2, even if the class could be found on the +user-specified classpath. + +* now works on z/OS. + +* forked 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 s nested into or s +nested into didn't work. + +* didn't work for nested s. + +* 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 + may have caused NullPointerExceptions. + +* nested of would include too much. + +* will no longer choke on s that point to +non-existing directories. + +* didn't work at all. + +* and now fail if the file they are working +on is locked. + +* 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. + +* and now have an optional followsymlink attribute +that can prevent Ant from following symbolic links on some platforms. + +* BeanShell is now supported in the