As usual, this was not delivered because the size of
the commits was too large. Here is a summary of
the files affected by the merge. Please do take a look
at the merged code at your convenience, to make sure I
haven't messed anything up.
Subject: cvs commit: jakarta-ant/src/testcases/org/apache/tools/ant/types
XMLCatalogBuildFileTest.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
umagesh 2002/06/22 16:38:38
Modified: . WHATSNEW build.xml
docs/manual conceptstypeslist.html credits.html index.html
install.html optionaltasklist.html running.html
docs/manual/CoreTasks apply.html checksum.html chmod.html
copydir.html delete.html dirname.html ear.html
exec.html fixcrlf.html jar.html javac.html
mail.html manifest.html patch.html property.html
replace.html rmic.html sql.html style.html tar.html
taskdef.html tstamp.html war.html xmlproperty.html
zip.html
docs/manual/CoreTypes dirset.html fileset.html
patternset.html
docs/manual/OptionalTasks BorlandEJBTasks.html
BorlandGenerateClient.html antlr.html cab.html
ccm.html dotnet.html ejb.html jspc.html
junitreport.html native2ascii.html netrexxc.html
pvcstask.html renameextensions.html test.html
vss.html
proposal/xdocs build.xml
proposal/xdocs/src/org/apache/tools/ant/xdoclet
TaskSubTask.java TaskTagsHandler.java
proposal/xdocs/templates task_xdoc.template
src/etc manifest
src/etc/testcases/taskdefs ant.xml available.xml
src/etc/testcases/taskdefs/fixcrlf/expected Mac2Unix
src/etc/testcases/taskdefs/fixcrlf/input Mac2Unix
src/main/org/apache/tools/ant AntClassLoader.java
DefaultLogger.java Main.java Project.java
RuntimeConfigurable.java Task.java
UnknownElement.java
src/main/org/apache/tools/ant/filters LineContains.java
src/main/org/apache/tools/ant/taskdefs AbstractCvsTask.java
Ant.java Available.java BZip2.java Basename.java
BuildNumber.java CVSPass.java CallTarget.java
Checksum.java Chmod.java Concat.java
ConditionTask.java Copy.java Cvs.java Definer.java
Delete.java DependSet.java Dirname.java Ear.java
Echo.java ExecTask.java Execute.java ExecuteOn.java
Exit.java Filter.java FixCRLF.java GenerateKey.java
Get.java Input.java JDBCTask.java Jar.java
Java.java Javac.java Javadoc.java LoadFile.java
LoadProperties.java Manifest.java Mkdir.java
Move.java Pack.java Parallel.java Patch.java
PathConvert.java Property.java Recorder.java
Replace.java Rmic.java SQLExec.java SendEmail.java
Sequential.java SignJar.java Sleep.java Tar.java
Taskdef.java Touch.java Tstamp.java Typedef.java
Unpack.java Untar.java WaitFor.java War.java
XSLTProcess.java XmlProperty.java Zip.java
src/main/org/apache/tools/ant/taskdefs/compilers
DefaultCompilerAdapter.java Gcj.java Jikes.java
Jvc.java Kjc.java
src/main/org/apache/tools/ant/taskdefs/condition Os.java
src/main/org/apache/tools/ant/taskdefs/cvslib
ChangeLogTask.java CvsTagDiff.java
src/main/org/apache/tools/ant/taskdefs/email EmailTask.java
Mailer.java MimeMailer.java PlainMailer.java
src/main/org/apache/tools/ant/taskdefs/optional Cab.java
EchoProperties.java Native2Ascii.java
src/main/org/apache/tools/ant/taskdefs/optional/ccm
CCMCheck.java CCMCheckin.java
CCMCheckinDefault.java CCMCheckout.java
CCMCreateTask.java CCMReconfigure.java
Continuus.java
src/main/org/apache/tools/ant/taskdefs/optional/clearcase
CCCheckin.java CCCheckout.java CCUnCheckout.java
CCUpdate.java ClearCase.java
src/main/org/apache/tools/ant/taskdefs/optional/depend
AntAnalyzer.java Depend.java
src/main/org/apache/tools/ant/taskdefs/optional/dotnet
CSharp.java WsdlToDotnet.java
src/main/org/apache/tools/ant/taskdefs/optional/ejb
BorlandDeploymentTool.java
BorlandGenerateClient.java DDCreator.java
EjbJar.java Ejbc.java IPlanetDeploymentTool.java
IPlanetEjbc.java JonasDeploymentTool.java
WeblogicDeploymentTool.java
src/main/org/apache/tools/ant/taskdefs/optional/extension
Extension.java JarLibAvailableTask.java
src/main/org/apache/tools/ant/taskdefs/optional/jsp
JspC.java
src/main/org/apache/tools/ant/taskdefs/optional/junit
JUnitTestRunner.java
src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java
TelnetTask.java
src/main/org/apache/tools/ant/taskdefs/optional/pvcs
Pvcs.java
src/main/org/apache/tools/ant/types XMLCatalog.java
src/main/org/apache/tools/ant/util FileUtils.java
JavaEnvUtils.java
src/main/org/apache/tools/mail MailMessage.java
src/testcases/org/apache/tools/ant/taskdefs AntTest.java
TStampTest.java
Added: docs/manual/OptionalTasks jarlib-available.html
jarlib-display.html jarlib-manifest.html
jarlib-resolve.html
docs/manual/OptionalTypes extension.html extensionset.html
src/etc/testcases/types quote1.xml quote2.xml xmlcatalog.xml
xmlcatalog.xsl xmlcatalog1.xml xmlcatalog2.xml
src/testcases/org/apache/tools/ant/types
XMLCatalogBuildFileTest.java
Log:
Merge changes made to 1.5 Beta2.
Cheers,
Magesh
****************************************************
* I have one share in corporate Earth, and *
* I am nervous about the management. -E.B. White *
****************************************************
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
