Summary of files affected by the merge.
Steve & Erik, please pay particular attention to the
Javadocs. I resolved a lot of conflicts with those.
I hope I haven't messed up any of your work.
Cheers,
Magesh
**********************************************
* Courage is acting as if your hands aren't *
* trembling. *
**********************************************
umagesh 2002/07/09 14:06:16
Modified: . README WHATSNEW build.xml
docs ant_task_guidelines.html
docs/manual coretasklist.html dirtasks.html install.html
optionaltasklist.html tasksoverview.html using.html
docs/manual/CoreTasks concat.html conditions.html jar.html
pathconvert.html style.html
docs/manual/Integration VAJAntTool.html
docs/manual/OptionalTasks ejb.html jpcoverage.html jspc.html
perforce.html pvcstask.html replaceregexp.html
rpm.html script.html serverdeploy.html sos.html
splash.html starteam.html stylebook.html vss.html
xmlvalidate.html
lib README xercesImpl.jar
src/etc/testcases/taskdefs zip.xml
src/etc/testcases/taskdefs/optional xslt.xml
src/etc/testcases/types selectors.xml
src/main/org/apache/tools/ant DirectoryScanner.java
Main.java
src/main/org/apache/tools/ant/helper ProjectHelperImpl.java
src/main/org/apache/tools/ant/taskdefs Ant.java
Basename.java BuildNumber.java CVSPass.java
CallTarget.java Chmod.java Copy.java DependSet.java
Dirname.java Echo.java ExecTask.java ExecuteOn.java
Exit.java Filter.java FixCRLF.java Get.java
JDBCTask.java Jar.java Java.java Javac.java
Javadoc.java Manifest.java MatchingTask.java
PathConvert.java Property.java Recorder.java
SQLExec.java Sleep.java Transform.java Tstamp.java
UpToDate.java War.java XSLTLiaison.java
XSLTProcess.java XmlProperty.java Zip.java
defaults.properties
src/main/org/apache/tools/ant/taskdefs/cvslib
ChangeLogTask.java CvsTagDiff.java
src/main/org/apache/tools/ant/taskdefs/optional ANTLR.java
EchoProperties.java IContract.java Javah.java
Native2Ascii.java NetRexxC.java PropertyFile.java
RenameExtensions.java ReplaceRegExp.java Rpm.java
Script.java StyleBook.java Test.java
TraXLiaison.java XMLValidateTask.java
XalanLiaison.java XslpLiaison.java
src/main/org/apache/tools/ant/taskdefs/optional/depend
Depend.java
src/main/org/apache/tools/ant/taskdefs/optional/dotnet
CSharp.java Ilasm.java WsdlToDotnet.java
src/main/org/apache/tools/ant/taskdefs/optional/ejb
DDCreator.java EjbJar.java Ejbc.java
GenericDeploymentTool.java IPlanetEjbc.java
IPlanetEjbcTask.java WLRun.java WLStop.java
WeblogicDeploymentTool.java
WebsphereDeploymentTool.java
src/main/org/apache/tools/ant/taskdefs/optional/extension
JarLibAvailableTask.java JarLibDisplayTask.java
JarLibManifestTask.java JarLibResolveTask.java
src/main/org/apache/tools/ant/taskdefs/optional/i18n
Translate.java
src/main/org/apache/tools/ant/taskdefs/optional/ide
VAJExport.java VAJImport.java VAJLoadProjects.java
VAJProjectDescription.java VAJTask.java
src/main/org/apache/tools/ant/taskdefs/optional/j2ee
AbstractHotDeploymentTool.java
GenericHotDeploymentTool.java
JonasHotDeploymentTool.java ServerDeploy.java
WebLogicHotDeploymentTool.java
src/main/org/apache/tools/ant/taskdefs/optional/javacc
JJTree.java JavaCC.java
src/main/org/apache/tools/ant/taskdefs/optional/jdepend
JDependTask.java
src/main/org/apache/tools/ant/taskdefs/optional/jlink
JlinkTask.java
src/main/org/apache/tools/ant/taskdefs/optional/jsp
JspC.java WLJspc.java
src/main/org/apache/tools/ant/taskdefs/optional/junit
JUnitTask.java XMLResultAggregator.java
src/main/org/apache/tools/ant/taskdefs/optional/metamata
AbstractMetamataTask.java MAudit.java MMetrics.java
MParse.java
src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java
MimeMail.java TelnetTask.java
src/main/org/apache/tools/ant/taskdefs/optional/perforce
P4Add.java P4Base.java P4Change.java P4Counter.java
P4Delete.java P4Edit.java P4Have.java P4Label.java
P4Reopen.java P4Revert.java P4Submit.java
P4Sync.java
src/main/org/apache/tools/ant/taskdefs/optional/pvcs
Pvcs.java PvcsProject.java
src/main/org/apache/tools/ant/taskdefs/optional/scm
AntStarTeamCheckOut.java
src/main/org/apache/tools/ant/taskdefs/optional/sitraka
CovMerge.java CovReport.java Coverage.java
Filters.java Socket.java Triggers.java
src/main/org/apache/tools/ant/taskdefs/optional/sos SOS.java
SOSCheckin.java SOSCheckout.java SOSGet.java
SOSLabel.java
src/main/org/apache/tools/ant/taskdefs/optional/sound
SoundTask.java
src/main/org/apache/tools/ant/taskdefs/optional/splash
SplashTask.java
src/main/org/apache/tools/ant/taskdefs/optional/starteam
StarTeamCheckin.java StarTeamCheckout.java
StarTeamLabel.java StarTeamList.java
StarTeamTask.java TreeBasedTask.java
src/main/org/apache/tools/ant/taskdefs/optional/vss
MSVSS.java MSVSSADD.java MSVSSCHECKIN.java
MSVSSCHECKOUT.java MSVSSCP.java MSVSSCREATE.java
MSVSSGET.java MSVSSHISTORY.java MSVSSLABEL.java
src/main/org/apache/tools/ant/types AbstractFileSet.java
XMLCatalog.java
src/main/org/apache/tools/ant/types/selectors
DependSelector.java PresentSelector.java
SelectorUtils.java
src/main/org/apache/tools/ant/util CollectionUtils.java
JavaEnvUtils.java
src/script ant
src/testcases/org/apache/tools/ant BuildFileTest.java
DirectoryScannerTest.java IncludeTest.java
src/testcases/org/apache/tools/ant/taskdefs ZipTest.java
src/testcases/org/apache/tools/ant/taskdefs/optional
EchoPropertiesTest.java XsltTest.java
src/testcases/org/apache/tools/ant/types/selectors
BaseSelectorTest.java DateSelectorTest.java
DependSelectorTest.java PresentSelectorTest.java
Added: . LICENSE.dom LICENSE.sax welcome.html
src/etc/testcases/core/include/included_file_parse_error
build.xml included_file.xml
src/etc/testcases/core/include/included_file_task_error
build.xml included_file.xml
src/etc/testcases/core/include/including_file_parse_error
build.xml included_file.xml
src/etc/testcases/core/include/including_file_task_error
build.xml included_file.xml
src/etc/testcases/taskdefs/optional/xml test.xml test.xsl
src/main/org/apache/tools/ant Diagnostics.java
src/main/org/apache/tools/ant/taskdefs ManifestTask.java
src/testcases/org/apache/tools/ant/util
CollectionUtilsTest.java
Log:
Merge differences between the ANT_15_FINAL branch and the trunk into the
trunk.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
