From 61b4c00b3852083b0f81586d6f78adf0bc3c7f6f Mon Sep 17 00:00:00 2001 From: "Jesse N. Glick" Date: Wed, 26 May 2010 20:33:51 +0000 Subject: [PATCH] Obliterating "core" vs. "optional" distinction for tasks and types in manual and associated doc files. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@948574 13f79535-47bb-0310-9956-ffa450edef68 --- docs/ant_in_anger.html | 60 ++-- docs/ant_task_guidelines.html | 3 +- .../BorlandEJBTasks.html | 0 .../BorlandGenerateClient.html | 0 docs/manual/{CoreTasks => Tasks}/ant.html | 2 +- docs/manual/{CoreTasks => Tasks}/antcall.html | 2 +- .../{OptionalTasks => Tasks}/antlr.html | 0 .../{CoreTasks => Tasks}/antstructure.html | 2 +- .../{CoreTasks => Tasks}/antversion.html | 0 docs/manual/{CoreTasks => Tasks}/apply.html | 14 +- docs/manual/{CoreTasks => Tasks}/apt.html | 0 .../{OptionalTasks => Tasks}/attrib.html | 10 +- docs/manual/{CoreTasks => Tasks}/augment.html | 0 .../{CoreTasks => Tasks}/available.html | 0 .../manual/{CoreTasks => Tasks}/basename.html | 0 .../{CoreTasks => Tasks}/buildnumber.html | 2 +- docs/manual/{OptionalTasks => Tasks}/cab.html | 6 +- docs/manual/{OptionalTasks => Tasks}/ccm.html | 0 .../{CoreTasks => Tasks}/changelog.html | 0 .../manual/{CoreTasks => Tasks}/checksum.html | 2 +- .../{OptionalTasks => Tasks}/chgrp.html | 10 +- docs/manual/{CoreTasks => Tasks}/chmod.html | 6 +- .../{OptionalTasks => Tasks}/chown.html | 10 +- .../{OptionalTasks => Tasks}/clearcase.html | 0 docs/manual/{CoreTasks => Tasks}/common.html | 0 .../{CoreTasks => Tasks}/componentdef.html | 2 +- docs/manual/{CoreTasks => Tasks}/concat.html | 12 +- .../{CoreTasks => Tasks}/condition.html | 0 .../{CoreTasks => Tasks}/conditions.html | 16 +- docs/manual/{CoreTasks => Tasks}/copy.html | 18 +- docs/manual/{CoreTasks => Tasks}/copydir.html | 2 +- .../manual/{CoreTasks => Tasks}/copyfile.html | 0 docs/manual/{CoreTasks => Tasks}/cvs.html | 0 docs/manual/{CoreTasks => Tasks}/cvspass.html | 0 .../{CoreTasks => Tasks}/cvstagdiff.html | 0 .../{CoreTasks => Tasks}/cvsversion.html | 0 .../{CoreTasks => Tasks}/defaultexcludes.html | 0 docs/manual/{CoreTasks => Tasks}/delete.html | 2 +- docs/manual/{CoreTasks => Tasks}/deltree.html | 0 .../{OptionalTasks => Tasks}/depend.html | 2 +- .../{CoreTasks => Tasks}/dependset.html | 12 +- .../{CoreTasks => Tasks}/diagnostics.html | 0 docs/manual/{CoreTasks => Tasks}/dirname.html | 0 docs/manual/{CoreTasks => Tasks}/ear.html | 2 +- docs/manual/{CoreTasks => Tasks}/echo.html | 2 +- .../echoproperties.html | 2 +- docs/manual/{CoreTasks => Tasks}/echoxml.html | 0 docs/manual/{OptionalTasks => Tasks}/ejb.html | 2 +- docs/manual/{CoreTasks => Tasks}/exec.html | 6 +- docs/manual/{CoreTasks => Tasks}/fail.html | 0 docs/manual/{CoreTasks => Tasks}/filter.html | 0 docs/manual/{CoreTasks => Tasks}/fixcrlf.html | 4 +- docs/manual/{OptionalTasks => Tasks}/ftp.html | 2 +- docs/manual/{CoreTasks => Tasks}/genkey.html | 0 docs/manual/{CoreTasks => Tasks}/get.html | 6 +- docs/manual/{CoreTasks => Tasks}/gunzip.html | 0 docs/manual/{CoreTasks => Tasks}/gzip.html | 0 .../manual/{CoreTasks => Tasks}/hostinfo.html | 0 .../image-classdiagram.gif | Bin .../{OptionalTasks => Tasks}/image.html | 6 +- docs/manual/{CoreTasks => Tasks}/import.html | 2 +- docs/manual/{CoreTasks => Tasks}/include.html | 2 +- docs/manual/{CoreTasks => Tasks}/input.html | 0 docs/manual/{CoreTasks => Tasks}/jar.html | 4 +- .../jarlib-available.html | 6 +- .../jarlib-display.html | 2 +- .../jarlib-manifest.html | 6 +- .../jarlib-resolve.html | 2 +- docs/manual/{CoreTasks => Tasks}/java.html | 10 +- docs/manual/{CoreTasks => Tasks}/javac.html | 4 +- .../{OptionalTasks => Tasks}/javacc.html | 0 docs/manual/{CoreTasks => Tasks}/javadoc.html | 8 +- .../{OptionalTasks => Tasks}/javah.html | 0 .../{OptionalTasks => Tasks}/jdepend.html | 0 .../{OptionalTasks => Tasks}/jjdoc.html | 0 .../{OptionalTasks => Tasks}/jjtree.html | 0 .../{OptionalTasks => Tasks}/jlink.html | 6 +- .../manual/{OptionalTasks => Tasks}/jspc.html | 0 .../{OptionalTasks => Tasks}/junit.html | 14 +- .../{OptionalTasks => Tasks}/junitreport.html | 2 +- docs/manual/{CoreTasks => Tasks}/length.html | 4 +- .../manual/{CoreTasks => Tasks}/loadfile.html | 6 +- .../{CoreTasks => Tasks}/loadproperties.html | 12 +- .../{CoreTasks => Tasks}/loadresource.html | 4 +- docs/manual/{CoreTasks => Tasks}/local.html | 0 .../manual/{CoreTasks => Tasks}/macrodef.html | 0 docs/manual/{CoreTasks => Tasks}/mail.html | 2 +- docs/manual/{CoreTasks => Tasks}/makeurl.html | 0 .../manual/{CoreTasks => Tasks}/manifest.html | 0 .../manifestclasspath.html | 0 .../{OptionalTasks => Tasks}/mimemail.html | 4 +- docs/manual/{CoreTasks => Tasks}/mkdir.html | 0 docs/manual/{CoreTasks => Tasks}/move.html | 14 +- .../native2ascii.html | 4 +- .../{OptionalTasks => Tasks}/netrexxc.html | 2 +- docs/manual/{CoreTasks => Tasks}/nice.html | 0 docs/manual/{CoreTasks => Tasks}/pack.html | 2 +- .../manual/{CoreTasks => Tasks}/parallel.html | 0 docs/manual/{CoreTasks => Tasks}/patch.html | 0 .../{CoreTasks => Tasks}/pathconvert.html | 8 +- .../{OptionalTasks => Tasks}/perforce.html | 2 +- .../{CoreTasks => Tasks}/presetdef.html | 0 .../manual/{CoreTasks => Tasks}/property.html | 0 .../propertyfile.html | 0 .../{CoreTasks => Tasks}/propertyhelper.html | 0 .../{OptionalTasks => Tasks}/pvcstask.html | 0 .../manual/{CoreTasks => Tasks}/recorder.html | 0 docs/manual/{CoreTasks => Tasks}/rename.html | 0 .../renameextensions.html | 6 +- docs/manual/{CoreTasks => Tasks}/replace.html | 4 +- .../replaceregexp.html | 10 +- .../{CoreTasks => Tasks}/resourcecount.html | 4 +- docs/manual/{CoreTasks => Tasks}/retry.html | 0 .../{OptionalTasks => Tasks}/rexec.html | 0 docs/manual/{CoreTasks => Tasks}/rmic.html | 2 +- docs/manual/{OptionalTasks => Tasks}/rpm.html | 0 .../schemavalidate.html | 4 +- docs/manual/{OptionalTasks => Tasks}/scp.html | 2 +- .../{OptionalTasks => Tasks}/script.html | 0 .../{OptionalTasks => Tasks}/scriptdef.html | 4 +- .../{CoreTasks => Tasks}/sequential.html | 0 .../serverdeploy.html | 0 .../{OptionalTasks => Tasks}/setproxy.html | 0 docs/manual/{CoreTasks => Tasks}/signjar.html | 0 docs/manual/{CoreTasks => Tasks}/sleep.html | 0 docs/manual/{OptionalTasks => Tasks}/sos.html | 0 .../{OptionalTasks => Tasks}/sound.html | 0 .../{OptionalTasks => Tasks}/splash.html | 0 docs/manual/{CoreTasks => Tasks}/sql.html | 4 +- .../{OptionalTasks => Tasks}/sshexec.html | 0 .../{OptionalTasks => Tasks}/sshsession.html | 0 .../{OptionalTasks => Tasks}/starteam.html | 0 docs/manual/{CoreTasks => Tasks}/style.html | 16 +- docs/manual/{CoreTasks => Tasks}/subant.html | 2 +- .../{OptionalTasks => Tasks}/symlink.html | 4 +- docs/manual/{CoreTasks => Tasks}/sync.html | 6 +- docs/manual/{CoreTasks => Tasks}/tar.html | 8 +- docs/manual/{CoreTasks => Tasks}/taskdef.html | 0 .../{OptionalTasks => Tasks}/telnet.html | 0 .../manual/{CoreTasks => Tasks}/tempfile.html | 0 docs/manual/{CoreTasks => Tasks}/touch.html | 6 +- .../{OptionalTasks => Tasks}/translate.html | 4 +- .../manual/{CoreTasks => Tasks}/truncate.html | 2 +- docs/manual/{CoreTasks => Tasks}/tstamp.html | 0 docs/manual/{CoreTasks => Tasks}/typedef.html | 6 +- docs/manual/{CoreTasks => Tasks}/unpack.html | 4 +- docs/manual/{CoreTasks => Tasks}/untar.html | 0 docs/manual/{CoreTasks => Tasks}/unzip.html | 16 +- .../manual/{CoreTasks => Tasks}/uptodate.html | 10 +- docs/manual/{OptionalTasks => Tasks}/vss.html | 0 docs/manual/{CoreTasks => Tasks}/waitfor.html | 0 docs/manual/{CoreTasks => Tasks}/war.html | 8 +- .../{CoreTasks => Tasks}/whichresource.html | 0 .../{OptionalTasks => Tasks}/wljspc.html | 0 .../{CoreTasks => Tasks}/xmlproperty.html | 4 +- .../{OptionalTasks => Tasks}/xmlvalidate.html | 4 +- docs/manual/{CoreTasks => Tasks}/zip.html | 8 +- docs/manual/{CoreTypes => Types}/antlib.html | 12 +- .../{CoreTypes => Types}/assertions.html | 4 +- .../classfileset.html | 2 +- .../custom-programming.html | 0 .../{CoreTypes => Types}/description.html | 0 docs/manual/{CoreTypes => Types}/dirset.html | 0 .../{OptionalTypes => Types}/extension.html | 0 .../extensionset.html | 2 +- .../manual/{CoreTypes => Types}/filelist.html | 0 docs/manual/{CoreTypes => Types}/fileset.html | 0 .../{CoreTypes => Types}/filterchain.html | 22 +- .../{CoreTypes => Types}/filterset.html | 0 docs/manual/{CoreTypes => Types}/mapper.html | 10 +- .../{CoreTypes => Types}/namespace.html | 0 .../{CoreTypes => Types}/patternset.html | 0 .../{CoreTypes => Types}/permissions.html | 0 .../{CoreTypes => Types}/propertyset.html | 0 .../{CoreTypes => Types}/redirector.html | 8 +- docs/manual/{CoreTypes => Types}/regexp.html | 2 +- .../{CoreTypes => Types}/resources.html | 4 +- .../selectors-program.html | 0 .../{CoreTypes => Types}/selectors.html | 6 +- .../{CoreTypes => Types}/tarfileset.html | 2 +- .../{CoreTypes => Types}/xmlcatalog.html | 0 .../{CoreTypes => Types}/zipfileset.html | 4 +- docs/manual/anttaskslist.html | 3 +- docs/manual/clonevm.html | 4 +- docs/manual/conceptstypeslist.html | 66 ++-- docs/manual/coretasklist.html | 142 -------- docs/manual/develop.html | 10 +- docs/manual/dirtasks.html | 68 ++-- docs/manual/install.html | 8 +- docs/manual/optionaltasklist.html | 92 ------ docs/manual/properties.html | 16 +- docs/manual/proxy.html | 4 +- docs/manual/running.html | 36 +-- docs/manual/targets.html | 4 +- docs/manual/tasklist.html | 193 +++++++++++ docs/manual/tasksoverview.html | 306 +++++++++--------- docs/manual/tutorial-HelloWorldWithAnt.html | 2 +- .../tutorial-tasks-filesets-properties.html | 13 +- docs/manual/tutorial-writing-tasks.html | 6 +- docs/manual/using.html | 34 +- xdocs/antlibs/svn/index.xml | 6 +- xdocs/faq.xml | 4 +- xdocs/resources.xml | 2 +- 203 files changed, 777 insertions(+), 827 deletions(-) rename docs/manual/{OptionalTasks => Tasks}/BorlandEJBTasks.html (100%) rename docs/manual/{OptionalTasks => Tasks}/BorlandGenerateClient.html (100%) rename docs/manual/{CoreTasks => Tasks}/ant.html (99%) rename docs/manual/{CoreTasks => Tasks}/antcall.html (99%) rename docs/manual/{OptionalTasks => Tasks}/antlr.html (100%) rename docs/manual/{CoreTasks => Tasks}/antstructure.html (97%) rename docs/manual/{CoreTasks => Tasks}/antversion.html (100%) rename docs/manual/{CoreTasks => Tasks}/apply.html (97%) rename docs/manual/{CoreTasks => Tasks}/apt.html (100%) rename docs/manual/{OptionalTasks => Tasks}/attrib.html (94%) rename docs/manual/{CoreTasks => Tasks}/augment.html (100%) rename docs/manual/{CoreTasks => Tasks}/available.html (100%) rename docs/manual/{CoreTasks => Tasks}/basename.html (100%) rename docs/manual/{CoreTasks => Tasks}/buildnumber.html (97%) rename docs/manual/{OptionalTasks => Tasks}/cab.html (95%) rename docs/manual/{OptionalTasks => Tasks}/ccm.html (100%) rename docs/manual/{CoreTasks => Tasks}/changelog.html (100%) rename docs/manual/{CoreTasks => Tasks}/checksum.html (99%) rename docs/manual/{OptionalTasks => Tasks}/chgrp.html (95%) rename docs/manual/{CoreTasks => Tasks}/chmod.html (97%) rename docs/manual/{OptionalTasks => Tasks}/chown.html (95%) rename docs/manual/{OptionalTasks => Tasks}/clearcase.html (100%) rename docs/manual/{CoreTasks => Tasks}/common.html (100%) rename docs/manual/{CoreTasks => Tasks}/componentdef.html (96%) rename docs/manual/{CoreTasks => Tasks}/concat.html (96%) rename docs/manual/{CoreTasks => Tasks}/condition.html (100%) rename docs/manual/{CoreTasks => Tasks}/conditions.html (98%) rename docs/manual/{CoreTasks => Tasks}/copy.html (95%) rename docs/manual/{CoreTasks => Tasks}/copydir.html (98%) rename docs/manual/{CoreTasks => Tasks}/copyfile.html (100%) rename docs/manual/{CoreTasks => Tasks}/cvs.html (100%) rename docs/manual/{CoreTasks => Tasks}/cvspass.html (100%) rename docs/manual/{CoreTasks => Tasks}/cvstagdiff.html (100%) rename docs/manual/{CoreTasks => Tasks}/cvsversion.html (100%) rename docs/manual/{CoreTasks => Tasks}/defaultexcludes.html (100%) rename docs/manual/{CoreTasks => Tasks}/delete.html (99%) rename docs/manual/{CoreTasks => Tasks}/deltree.html (100%) rename docs/manual/{OptionalTasks => Tasks}/depend.html (99%) rename docs/manual/{CoreTasks => Tasks}/dependset.html (93%) rename docs/manual/{CoreTasks => Tasks}/diagnostics.html (100%) rename docs/manual/{CoreTasks => Tasks}/dirname.html (100%) rename docs/manual/{CoreTasks => Tasks}/ear.html (99%) rename docs/manual/{CoreTasks => Tasks}/echo.html (98%) rename docs/manual/{OptionalTasks => Tasks}/echoproperties.html (98%) rename docs/manual/{CoreTasks => Tasks}/echoxml.html (100%) rename docs/manual/{OptionalTasks => Tasks}/ejb.html (99%) rename docs/manual/{CoreTasks => Tasks}/exec.html (98%) rename docs/manual/{CoreTasks => Tasks}/fail.html (100%) rename docs/manual/{CoreTasks => Tasks}/filter.html (100%) rename docs/manual/{CoreTasks => Tasks}/fixcrlf.html (99%) rename docs/manual/{OptionalTasks => Tasks}/ftp.html (99%) rename docs/manual/{CoreTasks => Tasks}/genkey.html (100%) rename docs/manual/{CoreTasks => Tasks}/get.html (97%) rename docs/manual/{CoreTasks => Tasks}/gunzip.html (100%) rename docs/manual/{CoreTasks => Tasks}/gzip.html (100%) rename docs/manual/{CoreTasks => Tasks}/hostinfo.html (100%) rename docs/manual/{OptionalTasks => Tasks}/image-classdiagram.gif (100%) rename docs/manual/{OptionalTasks => Tasks}/image.html (97%) rename docs/manual/{CoreTasks => Tasks}/import.html (99%) rename docs/manual/{CoreTasks => Tasks}/include.html (99%) rename docs/manual/{CoreTasks => Tasks}/input.html (100%) rename docs/manual/{CoreTasks => Tasks}/jar.html (99%) rename docs/manual/{OptionalTasks => Tasks}/jarlib-available.html (95%) rename docs/manual/{OptionalTasks => Tasks}/jarlib-display.html (97%) rename docs/manual/{OptionalTasks => Tasks}/jarlib-manifest.html (94%) rename docs/manual/{OptionalTasks => Tasks}/jarlib-resolve.html (99%) rename docs/manual/{CoreTasks => Tasks}/java.html (97%) rename docs/manual/{CoreTasks => Tasks}/javac.html (99%) rename docs/manual/{OptionalTasks => Tasks}/javacc.html (100%) rename docs/manual/{CoreTasks => Tasks}/javadoc.html (99%) rename docs/manual/{OptionalTasks => Tasks}/javah.html (100%) rename docs/manual/{OptionalTasks => Tasks}/jdepend.html (100%) rename docs/manual/{OptionalTasks => Tasks}/jjdoc.html (100%) rename docs/manual/{OptionalTasks => Tasks}/jjtree.html (100%) rename docs/manual/{OptionalTasks => Tasks}/jlink.html (95%) rename docs/manual/{OptionalTasks => Tasks}/jspc.html (100%) rename docs/manual/{OptionalTasks => Tasks}/junit.html (98%) rename docs/manual/{OptionalTasks => Tasks}/junitreport.html (98%) rename docs/manual/{CoreTasks => Tasks}/length.html (96%) rename docs/manual/{CoreTasks => Tasks}/loadfile.html (93%) rename docs/manual/{CoreTasks => Tasks}/loadproperties.html (88%) rename docs/manual/{CoreTasks => Tasks}/loadresource.html (95%) rename docs/manual/{CoreTasks => Tasks}/local.html (100%) rename docs/manual/{CoreTasks => Tasks}/macrodef.html (100%) rename docs/manual/{CoreTasks => Tasks}/mail.html (99%) rename docs/manual/{CoreTasks => Tasks}/makeurl.html (100%) rename docs/manual/{CoreTasks => Tasks}/manifest.html (100%) rename docs/manual/{CoreTasks => Tasks}/manifestclasspath.html (100%) rename docs/manual/{OptionalTasks => Tasks}/mimemail.html (95%) rename docs/manual/{CoreTasks => Tasks}/mkdir.html (100%) rename docs/manual/{CoreTasks => Tasks}/move.html (94%) rename docs/manual/{OptionalTasks => Tasks}/native2ascii.html (98%) rename docs/manual/{OptionalTasks => Tasks}/netrexxc.html (99%) rename docs/manual/{CoreTasks => Tasks}/nice.html (100%) rename docs/manual/{CoreTasks => Tasks}/pack.html (97%) rename docs/manual/{CoreTasks => Tasks}/parallel.html (100%) rename docs/manual/{CoreTasks => Tasks}/patch.html (100%) rename docs/manual/{CoreTasks => Tasks}/pathconvert.html (96%) rename docs/manual/{OptionalTasks => Tasks}/perforce.html (99%) rename docs/manual/{CoreTasks => Tasks}/presetdef.html (100%) rename docs/manual/{CoreTasks => Tasks}/property.html (100%) rename docs/manual/{OptionalTasks => Tasks}/propertyfile.html (100%) rename docs/manual/{CoreTasks => Tasks}/propertyhelper.html (100%) rename docs/manual/{OptionalTasks => Tasks}/pvcstask.html (100%) rename docs/manual/{CoreTasks => Tasks}/recorder.html (100%) rename docs/manual/{CoreTasks => Tasks}/rename.html (100%) rename docs/manual/{OptionalTasks => Tasks}/renameextensions.html (94%) rename docs/manual/{CoreTasks => Tasks}/replace.html (98%) rename docs/manual/{OptionalTasks => Tasks}/replaceregexp.html (93%) rename docs/manual/{CoreTasks => Tasks}/resourcecount.html (95%) rename docs/manual/{CoreTasks => Tasks}/retry.html (100%) rename docs/manual/{OptionalTasks => Tasks}/rexec.html (100%) rename docs/manual/{CoreTasks => Tasks}/rmic.html (99%) rename docs/manual/{OptionalTasks => Tasks}/rpm.html (100%) rename docs/manual/{OptionalTasks => Tasks}/schemavalidate.html (98%) rename docs/manual/{OptionalTasks => Tasks}/scp.html (99%) rename docs/manual/{OptionalTasks => Tasks}/script.html (100%) rename docs/manual/{OptionalTasks => Tasks}/scriptdef.html (98%) rename docs/manual/{CoreTasks => Tasks}/sequential.html (100%) rename docs/manual/{OptionalTasks => Tasks}/serverdeploy.html (100%) rename docs/manual/{OptionalTasks => Tasks}/setproxy.html (100%) rename docs/manual/{CoreTasks => Tasks}/signjar.html (100%) rename docs/manual/{CoreTasks => Tasks}/sleep.html (100%) rename docs/manual/{OptionalTasks => Tasks}/sos.html (100%) rename docs/manual/{OptionalTasks => Tasks}/sound.html (100%) rename docs/manual/{OptionalTasks => Tasks}/splash.html (100%) rename docs/manual/{CoreTasks => Tasks}/sql.html (99%) rename docs/manual/{OptionalTasks => Tasks}/sshexec.html (100%) rename docs/manual/{OptionalTasks => Tasks}/sshsession.html (100%) rename docs/manual/{OptionalTasks => Tasks}/starteam.html (100%) rename docs/manual/{CoreTasks => Tasks}/style.html (97%) rename docs/manual/{CoreTasks => Tasks}/subant.html (99%) rename docs/manual/{OptionalTasks => Tasks}/symlink.html (97%) rename docs/manual/{CoreTasks => Tasks}/sync.html (96%) rename docs/manual/{CoreTasks => Tasks}/tar.html (97%) rename docs/manual/{CoreTasks => Tasks}/taskdef.html (100%) rename docs/manual/{OptionalTasks => Tasks}/telnet.html (100%) rename docs/manual/{CoreTasks => Tasks}/tempfile.html (100%) rename docs/manual/{CoreTasks => Tasks}/touch.html (96%) rename docs/manual/{OptionalTasks => Tasks}/translate.html (97%) rename docs/manual/{CoreTasks => Tasks}/truncate.html (97%) rename docs/manual/{CoreTasks => Tasks}/tstamp.html (100%) rename docs/manual/{CoreTasks => Tasks}/typedef.html (97%) rename docs/manual/{CoreTasks => Tasks}/unpack.html (96%) rename docs/manual/{CoreTasks => Tasks}/untar.html (100%) rename docs/manual/{CoreTasks => Tasks}/unzip.html (94%) rename docs/manual/{CoreTasks => Tasks}/uptodate.html (95%) rename docs/manual/{OptionalTasks => Tasks}/vss.html (100%) rename docs/manual/{CoreTasks => Tasks}/waitfor.html (100%) rename docs/manual/{CoreTasks => Tasks}/war.html (97%) rename docs/manual/{CoreTasks => Tasks}/whichresource.html (100%) rename docs/manual/{OptionalTasks => Tasks}/wljspc.html (100%) rename docs/manual/{CoreTasks => Tasks}/xmlproperty.html (98%) rename docs/manual/{OptionalTasks => Tasks}/xmlvalidate.html (98%) rename docs/manual/{CoreTasks => Tasks}/zip.html (98%) rename docs/manual/{CoreTypes => Types}/antlib.html (95%) rename docs/manual/{CoreTypes => Types}/assertions.html (97%) rename docs/manual/{OptionalTypes => Types}/classfileset.html (98%) rename docs/manual/{CoreTypes => Types}/custom-programming.html (100%) rename docs/manual/{CoreTypes => Types}/description.html (100%) rename docs/manual/{CoreTypes => Types}/dirset.html (100%) rename docs/manual/{OptionalTypes => Types}/extension.html (100%) rename docs/manual/{OptionalTypes => Types}/extensionset.html (97%) rename docs/manual/{CoreTypes => Types}/filelist.html (100%) rename docs/manual/{CoreTypes => Types}/fileset.html (100%) rename docs/manual/{CoreTypes => Types}/filterchain.html (98%) rename docs/manual/{CoreTypes => Types}/filterset.html (100%) rename docs/manual/{CoreTypes => Types}/mapper.html (98%) rename docs/manual/{CoreTypes => Types}/namespace.html (100%) rename docs/manual/{CoreTypes => Types}/patternset.html (100%) rename docs/manual/{CoreTypes => Types}/permissions.html (100%) rename docs/manual/{CoreTypes => Types}/propertyset.html (100%) rename docs/manual/{CoreTypes => Types}/redirector.html (96%) rename docs/manual/{CoreTypes => Types}/regexp.html (98%) rename docs/manual/{CoreTypes => Types}/resources.html (99%) rename docs/manual/{CoreTypes => Types}/selectors-program.html (100%) rename docs/manual/{CoreTypes => Types}/selectors.html (99%) rename docs/manual/{CoreTypes => Types}/tarfileset.html (98%) rename docs/manual/{CoreTypes => Types}/xmlcatalog.html (100%) rename docs/manual/{CoreTypes => Types}/zipfileset.html (98%) delete mode 100644 docs/manual/coretasklist.html delete mode 100644 docs/manual/optionaltasklist.html create mode 100644 docs/manual/tasklist.html diff --git a/docs/ant_in_anger.html b/docs/ant_in_anger.html index 0044b01c9..817f4b102 100644 --- a/docs/ant_in_anger.html +++ b/docs/ant_in_anger.html @@ -122,7 +122,7 @@ And of course, the ubiquitous clean target. With standard target names, it is easy to build encompassing Ant build files which just hand off the work to the classes below using the -ant +ant task. For example. the clean target could be handed down to the intf and impl subdirectories from a parent directory @@ -147,9 +147,9 @@ entry points is therefore very useful, even before a project becomes big and com If Ant does not do what you want, you can use the -exec and -java tasks or -inline scripting to extend it. In a +exec and +java tasks or +inline scripting to extend it. In a project with many build.xml files, you soon find that having a single central place for implementing the functionality keeps maintenance overhead down. Implementing task extensions through Java code seems @@ -180,7 +180,7 @@ Embrace Automated Testing (alternatively "recriminate early, recriminate often")

-Ant lets you call JUnit +Ant lets you call JUnit tasks, which unit test the code your team has written. Automated testing may seem like extra work at first, but JUnit makes writing unit tests so easy that you have almost no reason not to. Invest the time in learning @@ -203,7 +203,7 @@ given the choice.

System tests are harder to automate than unit tests, but if you can write java code to stress large portions of the system - even if the code -can not run as JUnit tasks - then the java +can not run as JUnit tasks - then the java task can be used to invoke them. It is best to specify that you want a new JVM for these tests, so that a significant crash does not break the full build. The Junit extensions such as @@ -263,8 +263,8 @@ The common barriers to cross-platform Ant are the use of command line tools (exec tasks) which are not portable, path issues, and hard coding in the location of things. -

Command Line apps: Exec / - Apply

+

Command Line apps: Exec / + Apply

The trouble with external invocation is that not all functions are found cross platform, and those that are often have different names - DOS @@ -307,7 +307,7 @@ attributes), or by including a fileset of *.jar in the classpath definition.

There is also the PathConvert task which +href="manual/Tasks/pathconvert.html">PathConvert task which can put a fully resolved path into a property. Why do that? Because then you can use that path in other ways - such as pass it as a parameter to some application you are calling, or use the replace task to patch it @@ -326,14 +326,14 @@ find any .java files. The Java compiler is of course case sensitive - y not have a class 'ExampleThree' implemented in "examplethree.java".

-Some tasks only work on one platform - +Some tasks only work on one platform - Chmod being a classic example. These tasks usually result in just a warning message on an unsupported platform - the rest of the target's tasks will still be called. Other tasks degrade their functionality on platforms or Java versions. In particular, any task which adjusts the timestamp of files can not do so properly on Java 1.1. Tasks which can -do that - Get, Touch and +do that - Get, Touch and Unjar/Unwar/Unzip for example, degrade their functionality on Java1.1, usually resorting to the current timestamp instead. @@ -348,7 +348,7 @@ on Windows, OS/2 and Unix and hence called from Ant without issues. The perl code can be left to resolve its own platform issues. Don't forget to set the line endings of the file to the appropriate platform when you redistribute Perl code; fixCRLF +href="manual/Tasks/fixcrlf.html">fixCRLF can do that for you. @@ -381,36 +381,36 @@ processes for deploying Java to remote sites are reasonably well evolved in Ant. That is because we all have to do it these days, so many people have put in the effort to make the tasks easier.

-Ant can Jar, Tar or Zip files for deployment, while the -War task extends the jar task +Ant can Jar, Tar or Zip files for deployment, while the +War task extends the jar task for better servlet deployment. -Jlink is a +Jlink is a jar generation file which lets you merge multiple sub jars. This is ideal for a build process in which separate jars are generated by sub projects, yet the final output is a merged jar. Cab can be used on Win32 boxes to +"manual/Tasks/cab.html">Cab can be used on Win32 boxes to build a cab file which is useful if you still have to target IE deployment.

The ftp task lets you move stuff up to a server. Beware of putting the ftp password in the build file - a property file with tight access control is slightly better. The FixCRLF task is often a useful interim step if +"manual/Tasks/fixcrlf.html">FixCRLF task is often a useful interim step if you need to to adjust the line endings of files. A WebDav task has long been discussed, which would provide a more secure upload to web servers, but it is still in the todo list. Rumour has it that there is such a task in the jakarta-slide libraries. With MacOS X, Linux and Windows XP all supporting WebDAV file systems, you may even be able -to use copy to deploy +to use copy to deploy though a firewall.

-EJB deployment is aided by the ejb tasks, +EJB deployment is aided by the ejb tasks, while the serverdeploy +href="manual/Tasks/serverdeploy.html">serverdeploy suite can deploy to multiple servers. The popularity of Ant has encouraged vendors to produce their own deployment tasks which they redistribute with their servers. For example, the Tomcat4.1 installation @@ -418,9 +418,9 @@ includes tasks to deploy, undeploy and reload web applications.

Finally, there are of course the fallbacks of just copying files to a -destination using Copy and Copydir , or just sending them to a person or -process using Mail or the attachment -aware MimeMail. +destination using Copy and Copydir , or just sending them to a person or +process using Mail or the attachment +aware MimeMail. In one project our team even used Ant to build CD images through a build followed by a long set of Copy tasks, which worked surprisingly well, certainly easier than when we mailed them to the free email service on @@ -673,7 +673,7 @@ Tips and Tricks get

-The get task can fetch any URL, so be used +The get task can fetch any URL, so be used to trigger remote server side code during the build process, from remote server restarts to sending SMS/pager messages to the developer cellphones. @@ -683,7 +683,7 @@ i18n
Internationalisation is always trouble. Ant helps here with the native2ascii task which can escape out all non +"manual/Tasks/native2ascii.html">native2ascii task which can escape out all non ascii characters into unicode. You can use this to write java files which include strings (and indeed comments) in your own non-ASCII language and then use native2ascii to convert to ascii prior to feeding @@ -758,7 +758,7 @@ XML entity expansion is handled during the parsing process.

The <import> task does powerful things, such as let you override targets, and use ant properties to name the location of the file to import. Consult the -documentation for the specifics of +documentation for the specifics of these features.

@@ -791,7 +791,7 @@ Implement complex Ant builds through XSL

XSLT can be used to dynamically generate build.xml files from a source -xml file, with the xslt task controlling +xml file, with the xslt task controlling the transform. This is the current recommended strategy for creating complex build files dynamically. However, its use is still apparently quite rare - which means you will be on the bleeding edge of technology. diff --git a/docs/ant_task_guidelines.html b/docs/ant_task_guidelines.html index 23027d34b..d2ee2cad2 100644 --- a/docs/ant_task_guidelines.html +++ b/docs/ant_task_guidelines.html @@ -496,8 +496,7 @@ subject.
  • Patch files generated using svn diff -u
  • patch files include a patch to defaults.properties to register the tasks -
  • patch files include a patch to coretasklist.html or -optionaltasklist.html to link to the new task page +
  • patch files include a patch to tasklist.html to link to the new task page
  • Message to dev contains [SUBMIT] and task name in subject
  • Message body contains a rationale for the task
  • Message attachments contain the required files -source, documentation, diff --git a/docs/manual/OptionalTasks/BorlandEJBTasks.html b/docs/manual/Tasks/BorlandEJBTasks.html similarity index 100% rename from docs/manual/OptionalTasks/BorlandEJBTasks.html rename to docs/manual/Tasks/BorlandEJBTasks.html diff --git a/docs/manual/OptionalTasks/BorlandGenerateClient.html b/docs/manual/Tasks/BorlandGenerateClient.html similarity index 100% rename from docs/manual/OptionalTasks/BorlandGenerateClient.html rename to docs/manual/Tasks/BorlandGenerateClient.html diff --git a/docs/manual/CoreTasks/ant.html b/docs/manual/Tasks/ant.html similarity index 99% rename from docs/manual/CoreTasks/ant.html rename to docs/manual/Tasks/ant.html index eb7bdd52c..236769516 100644 --- a/docs/manual/CoreTasks/ant.html +++ b/docs/manual/Tasks/ant.html @@ -172,7 +172,7 @@ optionally changing their id.

    You can specify a set of properties to be copied into the new project with propertysets.

    +href="../Types/propertyset.html">propertysets.

    since Ant 1.6.

    diff --git a/docs/manual/CoreTasks/antcall.html b/docs/manual/Tasks/antcall.html similarity index 99% rename from docs/manual/CoreTasks/antcall.html rename to docs/manual/Tasks/antcall.html index 32ee0b599..52321c11c 100644 --- a/docs/manual/CoreTasks/antcall.html +++ b/docs/manual/Tasks/antcall.html @@ -148,7 +148,7 @@ optionally changing their id.

    You can specify a set of properties to be copied into the new project with propertysets.

    +href="../Types/propertyset.html">propertysets.

    since Ant 1.6.

    diff --git a/docs/manual/OptionalTasks/antlr.html b/docs/manual/Tasks/antlr.html similarity index 100% rename from docs/manual/OptionalTasks/antlr.html rename to docs/manual/Tasks/antlr.html diff --git a/docs/manual/CoreTasks/antstructure.html b/docs/manual/Tasks/antstructure.html similarity index 97% rename from docs/manual/CoreTasks/antstructure.html rename to docs/manual/Tasks/antstructure.html index 252cb24f9..5fb09785a 100644 --- a/docs/manual/CoreTasks/antstructure.html +++ b/docs/manual/Tasks/antstructure.html @@ -35,7 +35,7 @@ usage of XML cannot be captured with a DTD. Several elements in Ant can have different attribute lists depending on the element that contains them. "fail" for example can be the task or the nested child element of the sound task. Don't consider the +href="../Tasks/sound.html">sound task. Don't consider the generated DTD something to rely upon.

    Also note that the DTD generated by this task is incomplete, you can diff --git a/docs/manual/CoreTasks/antversion.html b/docs/manual/Tasks/antversion.html similarity index 100% rename from docs/manual/CoreTasks/antversion.html rename to docs/manual/Tasks/antversion.html diff --git a/docs/manual/CoreTasks/apply.html b/docs/manual/Tasks/apply.html similarity index 97% rename from docs/manual/CoreTasks/apply.html rename to docs/manual/Tasks/apply.html index f5ee80ff9..b6df73260 100644 --- a/docs/manual/CoreTasks/apply.html +++ b/docs/manual/Tasks/apply.html @@ -33,16 +33,16 @@ the command is only executed when Ant is run on one of the specified operating systems.

    The files and/or directories of a number of Resource Collections +href="../Types/resources.html#collection">Resource Collections – including but not restricted to - FileSets, - DirSets + FileSets, + DirSets (since Ant 1.6) or - FileLists + FileLists (since Ant 1.6) – are passed as arguments to the system command.

    -

    If you specify a nested mapper, +

    If you specify a nested mapper, the timestamp of each source file is compared to the timestamp of a target file which is defined by the nested mapper element and searched for in the given dest, if specified.

    @@ -312,7 +312,7 @@ elements to define the files for this task and refer to elements to define the directories for this task and refer to <dirset>s defined elsewhere.

    -

    Any other Resource +

    Any other Resource Collection

    since Ant 1.7

    You can use any number of nested resource collections.

    @@ -383,7 +383,7 @@ system command via nested <env> elements. See the description in the section about exec

    redirector

    Since Ant 1.6.2 -

    A nested I/O Redirector +

    A nested I/O Redirector can be specified. <apply>'s behavior is like that of exec with regard to redirectors, with the exception that, in non-parallel mode, diff --git a/docs/manual/CoreTasks/apt.html b/docs/manual/Tasks/apt.html similarity index 100% rename from docs/manual/CoreTasks/apt.html rename to docs/manual/Tasks/apt.html diff --git a/docs/manual/OptionalTasks/attrib.html b/docs/manual/Tasks/attrib.html similarity index 94% rename from docs/manual/OptionalTasks/attrib.html rename to docs/manual/Tasks/attrib.html index 1b72aac1b..8215710f2 100644 --- a/docs/manual/OptionalTasks/attrib.html +++ b/docs/manual/Tasks/attrib.html @@ -33,14 +33,14 @@ directories. Right now it has effect only under Windows. Each of the 4 possible permissions has its own attribute, matching the arguments for the attrib command.

    -

    FileSets, -DirSets or FileLists can be specified using +

    FileSets, +DirSets or FileLists can be specified using nested <fileset>, <dirset> and <filelist> elements.

    Starting with Ant 1.7, this task supports arbitrary Resource Collections +href="../Types/resources.html#collection">Resource Collections as nested elements.

    By default this task will use a single invocation of the underlying @@ -126,7 +126,7 @@ directory tree), so you'll have to experiment a little.

    osfamily OS family as used in - the <os> + the <os> condition. No - defaults to "windows" diff --git a/docs/manual/CoreTasks/augment.html b/docs/manual/Tasks/augment.html similarity index 100% rename from docs/manual/CoreTasks/augment.html rename to docs/manual/Tasks/augment.html diff --git a/docs/manual/CoreTasks/available.html b/docs/manual/Tasks/available.html similarity index 100% rename from docs/manual/CoreTasks/available.html rename to docs/manual/Tasks/available.html diff --git a/docs/manual/CoreTasks/basename.html b/docs/manual/Tasks/basename.html similarity index 100% rename from docs/manual/CoreTasks/basename.html rename to docs/manual/Tasks/basename.html diff --git a/docs/manual/CoreTasks/buildnumber.html b/docs/manual/Tasks/buildnumber.html similarity index 97% rename from docs/manual/CoreTasks/buildnumber.html rename to docs/manual/Tasks/buildnumber.html index 8bae6742c..aaaa14cd8 100644 --- a/docs/manual/CoreTasks/buildnumber.html +++ b/docs/manual/Tasks/buildnumber.html @@ -33,7 +33,7 @@ set the property build.number to the value that was read in (or to 0, if no such value). It will then increment the number by one and write it back out to the file. (See the -PropertyFile task +PropertyFile task if you need finer control over things such as the property name or the number format.)

    diff --git a/docs/manual/OptionalTasks/cab.html b/docs/manual/Tasks/cab.html similarity index 95% rename from docs/manual/OptionalTasks/cab.html rename to docs/manual/Tasks/cab.html index cd7504d82..e981827a5 100644 --- a/docs/manual/OptionalTasks/cab.html +++ b/docs/manual/Tasks/cab.html @@ -27,7 +27,7 @@

    Cab

    Description

    The cab task creates Microsoft cab archive files. It is invoked -similar to the jar or zip tasks. +similar to the jar or zip tasks. This task will work on Windows using the external cabarc tool (provided by Microsoft) which must be located in your executable path.

    To use this task on other platforms you need to download and compile libcabinet from @@ -36,7 +36,7 @@ http://trill.cis.fordham.edu/~barbacha/cabinet_library/.

    See the section on directory based tasks, on how the inclusion/exclusion of files works, and how to write patterns.

    -

    This task forms an implicit FileSet and +

    This task forms an implicit FileSet and supports most attributes of <fileset> (dir becomes basedir) as well as the nested <include>, <exclude> and @@ -112,7 +112,7 @@ supports most attributes of <fileset>

    fileset

    The cab task supports one nested <fileset> +href="../Types/fileset.html"><fileset> element to specify the files to be included in the archive. If this is specified, the "basedir" attribute cannot be used.

    diff --git a/docs/manual/OptionalTasks/ccm.html b/docs/manual/Tasks/ccm.html similarity index 100% rename from docs/manual/OptionalTasks/ccm.html rename to docs/manual/Tasks/ccm.html diff --git a/docs/manual/CoreTasks/changelog.html b/docs/manual/Tasks/changelog.html similarity index 100% rename from docs/manual/CoreTasks/changelog.html rename to docs/manual/Tasks/changelog.html diff --git a/docs/manual/CoreTasks/checksum.html b/docs/manual/Tasks/checksum.html similarity index 99% rename from docs/manual/CoreTasks/checksum.html rename to docs/manual/Tasks/checksum.html index a6dbcbe28..5de3bfca3 100644 --- a/docs/manual/CoreTasks/checksum.html +++ b/docs/manual/Tasks/checksum.html @@ -189,7 +189,7 @@ or set the fileext attribute.

    resource collection

    - Resource collections are + Resource collections are used to select files for which checksums should be generated.

    diff --git a/docs/manual/OptionalTasks/chgrp.html b/docs/manual/Tasks/chgrp.html similarity index 95% rename from docs/manual/OptionalTasks/chgrp.html rename to docs/manual/Tasks/chgrp.html index 6c2993c2c..9d676f8c0 100644 --- a/docs/manual/OptionalTasks/chgrp.html +++ b/docs/manual/Tasks/chgrp.html @@ -33,14 +33,14 @@ directories. Right now it has effect only under Unix. The group attribute is equivalent to the corresponding argument for the chgrp command.

    -

    FileSets, -DirSets or FileLists can be specified using +

    FileSets, +DirSets or FileLists can be specified using nested <fileset>, <dirset> and <filelist> elements.

    Starting with Ant 1.7, this task supports arbitrary Resource Collections +href="../Types/resources.html#collection">Resource Collections as nested elements.

    By default this task will use a single invocation of the underlying @@ -120,7 +120,7 @@ could use as initial value for these experiments.

    osfamily OS family as used in - the <os> + the <os> condition. No - defaults to "unix" diff --git a/docs/manual/CoreTasks/chmod.html b/docs/manual/Tasks/chmod.html similarity index 97% rename from docs/manual/CoreTasks/chmod.html rename to docs/manual/Tasks/chmod.html index 7e965cbf7..8850f173d 100644 --- a/docs/manual/CoreTasks/chmod.html +++ b/docs/manual/Tasks/chmod.html @@ -34,16 +34,16 @@ tasks, on how the inclusion/exclusion of files works, and how to write patterns.

    This task holds an implicit FileSet and supports all of +href="../Types/fileset.html">FileSet and supports all of FileSet's attributes and nested elements directly. More sets can be specified using nested <fileset> or <dirset> (since Ant 1.6) elements.

    Starting with Ant 1.6, this task also supports nested filelists.

    +href="../Types/filelist.html">filelists.

    Starting with Ant 1.7, this task supports arbitrary Resource Collections +href="../Types/resources.html#collection">Resource Collections as nested elements.

    By default this task will use a single invocation of the underlying diff --git a/docs/manual/OptionalTasks/chown.html b/docs/manual/Tasks/chown.html similarity index 95% rename from docs/manual/OptionalTasks/chown.html rename to docs/manual/Tasks/chown.html index 4714fa442..d44035c1c 100644 --- a/docs/manual/OptionalTasks/chown.html +++ b/docs/manual/Tasks/chown.html @@ -33,14 +33,14 @@ directories. Right now it has effect only under Unix. The owner attribute is equivalent to the corresponding argument for the chown command.

    -

    FileSets, -DirSets or FileLists can be specified using +

    FileSets, +DirSets or FileLists can be specified using nested <fileset>, <dirset> and <filelist> elements.

    Starting with Ant 1.7, this task supports arbitrary Resource Collections +href="../Types/resources.html#collection">Resource Collections as nested elements.

    By default this task will use a single invocation of the underlying @@ -119,7 +119,7 @@ could use as initial value for these experiments.

    osfamily OS family as used in - the <os> + the <os> condition. No - defaults to "unix" diff --git a/docs/manual/OptionalTasks/clearcase.html b/docs/manual/Tasks/clearcase.html similarity index 100% rename from docs/manual/OptionalTasks/clearcase.html rename to docs/manual/Tasks/clearcase.html diff --git a/docs/manual/CoreTasks/common.html b/docs/manual/Tasks/common.html similarity index 100% rename from docs/manual/CoreTasks/common.html rename to docs/manual/Tasks/common.html diff --git a/docs/manual/CoreTasks/componentdef.html b/docs/manual/Tasks/componentdef.html similarity index 96% rename from docs/manual/CoreTasks/componentdef.html rename to docs/manual/Tasks/componentdef.html index 55fb21c4e..668009267 100644 --- a/docs/manual/CoreTasks/componentdef.html +++ b/docs/manual/Tasks/componentdef.html @@ -55,7 +55,7 @@

    defines two components with the same name "or"; one is a condition (see conditions) and one is - a selector (see selectors). + a selector (see selectors).

    diff --git a/docs/manual/CoreTasks/concat.html b/docs/manual/Tasks/concat.html similarity index 96% rename from docs/manual/CoreTasks/concat.html rename to docs/manual/Tasks/concat.html index ddc9549ee..e2953d957 100644 --- a/docs/manual/CoreTasks/concat.html +++ b/docs/manual/Tasks/concat.html @@ -30,20 +30,20 @@

    Concatenates one or more - resources + resources to a single file or to the console. The destination file will be created if it does not exist unless the resource list is empty and ignoreempty is true.

    Since Ant 1.7.1, this task can be used as a - Resource Collection + Resource Collection that will return exactly one - resource. + resource.

    - + Resource Collections are used to select which resources are to be concatenated. There is no singular attribute to specify a single resource to cat. @@ -198,7 +198,7 @@ Resource Collections are used to

    since Ant 1.7.

    - Any of the various + Any of the various Resource Collection types can specify the resources to be concatenated.

    @@ -206,7 +206,7 @@ Resource Collections are used to

    filterchain

    since Ant 1.6.

    The concat task supports nested - FilterChains.

    + FilterChains.

    header, footer

    since Ant 1.6.

    diff --git a/docs/manual/CoreTasks/condition.html b/docs/manual/Tasks/condition.html similarity index 100% rename from docs/manual/CoreTasks/condition.html rename to docs/manual/Tasks/condition.html diff --git a/docs/manual/CoreTasks/conditions.html b/docs/manual/Tasks/conditions.html similarity index 98% rename from docs/manual/CoreTasks/conditions.html rename to docs/manual/Tasks/conditions.html index 9e1f7254b..8dd5528b9 100644 --- a/docs/manual/CoreTasks/conditions.html +++ b/docs/manual/Tasks/conditions.html @@ -30,7 +30,7 @@ <waitfor> tasks. There are core conditions and custom conditions. Custom conditions are described in - + Custom Conditions. Core Conditions are described below.

    @@ -412,7 +412,7 @@ that is "true","yes", or "on"

    isfileselected

    Test whether a file passes an embedded - selector. + selector.

    This condition was added in Apache Ant 1.6.3. @@ -490,7 +490,7 @@ tasks, datatypes, scriptdefs, macrodefs and presetdefs.

    supported language.

    -See the Script task for +See the Script task for an explanation of scripts and dependencies.

    @@ -511,7 +511,7 @@ an explanation of scripts and dependencies. manager The script engine manager to use. - See the script task + See the script task for using this attribute. No - default is "auto" @@ -549,7 +549,7 @@ an explanation of scripts and dependencies.
    Parameters specified as nested elements
    classpath

    - See the script task + See the script task for using this nested element.

    Description
    @@ -738,7 +738,7 @@ Probe for the maven repository being reachable using the hostname, ten second ti

    This condition is a facet of the ResourceCount task. It is used to test the size of a - resource collection. + resource collection. Since Ant 1.7

    @@ -754,7 +754,7 @@ By default this test does a byte for byte comparision, so test time scales with byte size. NB: if the files are different sizes, one of them is missing or the filenames match the answer is so obvious the detailed test is omitted. The resources to check are specified as nested -resource collections, +resource collections, meaning that more than two resources can be checked; in this case all resources must match. Since Ant 1.7

    @@ -916,7 +916,7 @@ must match. Since Ant 1.7

    There is also an optional <regexp> element, which can be used to specify a regular expression instead of the "pattern" attribute. - See Regexp Type for the description + See Regexp Type for the description of the nested element regexp and of the choice of regular expression implementation.

    diff --git a/docs/manual/CoreTasks/copy.html b/docs/manual/Tasks/copy.html similarity index 95% rename from docs/manual/CoreTasks/copy.html rename to docs/manual/Tasks/copy.html index e8e240e59..c5292de19 100644 --- a/docs/manual/CoreTasks/copy.html +++ b/docs/manual/Tasks/copy.html @@ -31,11 +31,11 @@ only copied if the source file is newer than the destination file, or when the destination file does not exist. However, you can explicitly overwrite files with the overwrite attribute.

    -

    Resource +

    Resource Collections are used to select a group of files to copy. To use a resource collection, the todir attribute must be set. Note that some resources (for example -the file resource) +the file resource) return absolute paths as names and the result of using them without using a nested mapper (or the flatten attribute) may not be what you expect.

    @@ -46,7 +46,7 @@ you should limit the copy to text files. Binary files will be corrupted by the copy operation. This applies whether the filters are implicitly defined by the filter task or explicitly provided to the copy -operation as filtersets. +operation as filtersets. See encoding note.

    Parameters

    @@ -109,7 +109,7 @@ operation as filtersets. Ignore the directory structure of the source files, and copy all files into the directory specified by the todir attribute. Note that you can achieve the same effect by using a - flatten mapper. + flatten mapper. No; defaults to false. @@ -170,7 +170,7 @@ operation as filtersets.

    Parameters specified as nested elements

    fileset or any other resource collection

    -

    Resource +

    Resource Collections are used to select groups of files to copy. To use a resource collection, the todir attribute must be set.

    Prior to Ant 1.7 only <fileset> has been @@ -178,9 +178,9 @@ supported as a nested element.

    mapper

    You can define filename transformations by using a nested mapper element. The default mapper used by + href="../Types/mapper.html">mapper element. The default mapper used by <copy> is the identity mapper.

    + href="../Types/mapper.html#identity-mapper">identity mapper.

    Since Ant 1.6.3, one can use a filenamemapper type in place of the mapper element. @@ -194,14 +194,14 @@ directory. In any other case the absolute filename of the source will be used.

    filterset

    -

    FilterSets are used to replace +

    FilterSets are used to replace tokens in files that are copied. To use a FilterSet, use the nested <filterset> element.

    It is possible to use more than one filterset.

    filterchain

    -

    The Copy task supports nested +

    The Copy task supports nested FilterChains.

    diff --git a/docs/manual/CoreTasks/copydir.html b/docs/manual/Tasks/copydir.html similarity index 98% rename from docs/manual/CoreTasks/copydir.html rename to docs/manual/Tasks/copydir.html index bf277ac6b..9e9e60e1c 100644 --- a/docs/manual/CoreTasks/copydir.html +++ b/docs/manual/Tasks/copydir.html @@ -38,7 +38,7 @@ finally with the defaultexcludes attribute, you can specify whether you want to use default exclusions or not. See the section on directory based tasks, on how the inclusion/exclusion of files works, and how to write patterns.

    -

    This task forms an implicit FileSet and +

    This task forms an implicit FileSet and supports most attributes of <fileset> (dir becomes src) as well as the nested <include>, <exclude> and diff --git a/docs/manual/CoreTasks/copyfile.html b/docs/manual/Tasks/copyfile.html similarity index 100% rename from docs/manual/CoreTasks/copyfile.html rename to docs/manual/Tasks/copyfile.html diff --git a/docs/manual/CoreTasks/cvs.html b/docs/manual/Tasks/cvs.html similarity index 100% rename from docs/manual/CoreTasks/cvs.html rename to docs/manual/Tasks/cvs.html diff --git a/docs/manual/CoreTasks/cvspass.html b/docs/manual/Tasks/cvspass.html similarity index 100% rename from docs/manual/CoreTasks/cvspass.html rename to docs/manual/Tasks/cvspass.html diff --git a/docs/manual/CoreTasks/cvstagdiff.html b/docs/manual/Tasks/cvstagdiff.html similarity index 100% rename from docs/manual/CoreTasks/cvstagdiff.html rename to docs/manual/Tasks/cvstagdiff.html diff --git a/docs/manual/CoreTasks/cvsversion.html b/docs/manual/Tasks/cvsversion.html similarity index 100% rename from docs/manual/CoreTasks/cvsversion.html rename to docs/manual/Tasks/cvsversion.html diff --git a/docs/manual/CoreTasks/defaultexcludes.html b/docs/manual/Tasks/defaultexcludes.html similarity index 100% rename from docs/manual/CoreTasks/defaultexcludes.html rename to docs/manual/Tasks/defaultexcludes.html diff --git a/docs/manual/CoreTasks/delete.html b/docs/manual/Tasks/delete.html similarity index 99% rename from docs/manual/CoreTasks/delete.html rename to docs/manual/Tasks/delete.html index 87236e7e3..c8dcf2ab1 100644 --- a/docs/manual/CoreTasks/delete.html +++ b/docs/manual/Tasks/delete.html @@ -28,7 +28,7 @@

    Description

    Deletes a single file, a specified directory and all its files and subdirectories, or a set of files specified by one or more -resource collections. +resource collections. The literal implication of <fileset> is that directories are not included; however the removal of empty directories can be triggered when using nested filesets by setting the diff --git a/docs/manual/CoreTasks/deltree.html b/docs/manual/Tasks/deltree.html similarity index 100% rename from docs/manual/CoreTasks/deltree.html rename to docs/manual/Tasks/deltree.html diff --git a/docs/manual/OptionalTasks/depend.html b/docs/manual/Tasks/depend.html similarity index 99% rename from docs/manual/OptionalTasks/depend.html rename to docs/manual/Tasks/depend.html index b4b780920..7910f60f7 100644 --- a/docs/manual/OptionalTasks/depend.html +++ b/docs/manual/Tasks/depend.html @@ -179,7 +179,7 @@ via a nested <classpath> element.

    Additionally, this task forms an implicit -FileSet +FileSet and supports most attributes of <fileset> (dir becomes srcdir), as well as the nested <include>, diff --git a/docs/manual/CoreTasks/dependset.html b/docs/manual/Tasks/dependset.html similarity index 93% rename from docs/manual/CoreTasks/dependset.html rename to docs/manual/Tasks/dependset.html index 982c80306..8891c6f33 100644 --- a/docs/manual/CoreTasks/dependset.html +++ b/docs/manual/Tasks/dependset.html @@ -37,7 +37,7 @@ any of the target files, all of the target files are removed.

    Sources and target files are specified via nested -Resource Collections; +Resource Collections; sources can be resources of any type, while targets are restricted to files only. At least one set of sources and one set of targets is required.

    @@ -78,7 +78,7 @@ well as other stylesheets imported by the main stylesheet.

    sources

    The <sources> element is a -Union into which +Union into which arbitrary resource collections can be nested. Since Ant 1.7

    @@ -86,7 +86,7 @@ arbitrary resource collections can be nested. Since Ant 1.7

    The nested <srcfileset> element specifies a FileSet. All files included in +href="../Types/fileset.html">FileSet. All files included in this fileset will be compared against all files included in all of the <targetfileset> filesets and <targetfilelist> filelists. Multiple <srcfileset> filesets may be specified. @@ -96,7 +96,7 @@ filelists. Multiple <srcfileset> filesets may be specified.

    The nested <srcfilelist> element specifies a FileList. All files included in +href="../Types/filelist.html">FileList. All files included in this filelist will be compared against all files included in all of the <targetfileset> filesets and <targetfilelist> filelists. Multiple <srcfilelist> filelists may be specified. @@ -113,7 +113,7 @@ include any filesystem-based resource. Since Ant 1.7

    The nested <targetfileset> element specifies a FileSet. All files included in +href="../Types/fileset.html">FileSet. All files included in this fileset will be compared against all files included in all of the <srcfileset> filesets and <sourcefilelist> filelists, and if any are older, they are all deleted. @@ -124,7 +124,7 @@ Multiple <targetfileset> filesets may be specified.

    The nested <targetfilelist> element specifies a FileList. All files included in +href="../Types/filelist.html">FileList. All files included in this filelist will be compared against all files included in all of the <srcfileset> filesets and <sourcefilelist> filelists, and if any are older, they are all deleted. diff --git a/docs/manual/CoreTasks/diagnostics.html b/docs/manual/Tasks/diagnostics.html similarity index 100% rename from docs/manual/CoreTasks/diagnostics.html rename to docs/manual/Tasks/diagnostics.html diff --git a/docs/manual/CoreTasks/dirname.html b/docs/manual/Tasks/dirname.html similarity index 100% rename from docs/manual/CoreTasks/dirname.html rename to docs/manual/Tasks/dirname.html diff --git a/docs/manual/CoreTasks/ear.html b/docs/manual/Tasks/ear.html similarity index 99% rename from docs/manual/CoreTasks/ear.html rename to docs/manual/Tasks/ear.html index 73c4ca88a..fe1199fe3 100644 --- a/docs/manual/CoreTasks/ear.html +++ b/docs/manual/Tasks/ear.html @@ -270,7 +270,7 @@ to a value other than its default, "add".

    metainf

    The nested metainf element specifies a FileSet. All files included in this fileset will +href="../Types/fileset.html">FileSet. All files included in this fileset will end up in the META-INF directory of the ear file. If this fileset includes a file named MANIFEST.MF, the file is ignored and you will get a warning.

    diff --git a/docs/manual/CoreTasks/echo.html b/docs/manual/Tasks/echo.html similarity index 98% rename from docs/manual/CoreTasks/echo.html rename to docs/manual/Tasks/echo.html index 377ab7578..b0bbae171 100644 --- a/docs/manual/CoreTasks/echo.html +++ b/docs/manual/Tasks/echo.html @@ -55,7 +55,7 @@ ignored

    output - the Resource + the Resource to write the message to (see note). Since Ant 1.8 diff --git a/docs/manual/OptionalTasks/echoproperties.html b/docs/manual/Tasks/echoproperties.html similarity index 98% rename from docs/manual/OptionalTasks/echoproperties.html rename to docs/manual/Tasks/echoproperties.html index 00d2981c3..363d48807 100644 --- a/docs/manual/OptionalTasks/echoproperties.html +++ b/docs/manual/Tasks/echoproperties.html @@ -89,7 +89,7 @@ files.

    propertyset

    You can specify subsets of properties to be echoed with propertysets. Using +href="../Types/propertyset.html">propertysets. Using propertysets gives more control on which properties will be picked up. The attributes prefix and regex are just shorcuts that use propertysets internally. diff --git a/docs/manual/CoreTasks/echoxml.html b/docs/manual/Tasks/echoxml.html similarity index 100% rename from docs/manual/CoreTasks/echoxml.html rename to docs/manual/Tasks/echoxml.html diff --git a/docs/manual/OptionalTasks/ejb.html b/docs/manual/Tasks/ejb.html similarity index 99% rename from docs/manual/OptionalTasks/ejb.html rename to docs/manual/Tasks/ejb.html index 7f4147ec4..61b551dd3 100644 --- a/docs/manual/OptionalTasks/ejb.html +++ b/docs/manual/Tasks/ejb.html @@ -863,7 +863,7 @@ requiring the vendor classes in the classpath, you would need to use a

    The <support> nested element is used to supply additional classes (files) to be included in the generated jars. The <support> element is a -FileSet, so it can either reference a fileset declared elsewhere or it can be +FileSet, so it can either reference a fileset declared elsewhere or it can be defined in-place with the appropriate <include> and <exclude> nested elements. The files in the support fileset are added into the generated EJB jar in the same relative location as their location within the support fileset. Note diff --git a/docs/manual/CoreTasks/exec.html b/docs/manual/Tasks/exec.html similarity index 98% rename from docs/manual/CoreTasks/exec.html rename to docs/manual/Tasks/exec.html index e20eba63b..09698c4b8 100644 --- a/docs/manual/CoreTasks/exec.html +++ b/docs/manual/Tasks/exec.html @@ -364,13 +364,13 @@ system command via nested <env> elements.

    redirector

     Since Ant 1.6.2 -

    A nested I/O Redirector +

    A nested I/O Redirector can be specified. In general, the attributes of the redirector behave as the corresponding attributes available at the task level. The most notable peculiarity stems from the retention of the <exec> attributes for backwards compatibility. Any file mapping is done using a null sourcefile; therefore not all -Mapper types will return +Mapper types will return results. When no results are returned, redirection specifications will fall back to the task level attributes. In practice this means that defaults can be specified for input, output, and error output files. @@ -437,7 +437,7 @@ Ant process. The browser will remain.

    Sends the string "blah before blah" to the "cat" executable, -using an <inputfilterchain> +using an <inputfilterchain> to replace "before" with "after" on the way in. Output is sent to the file "redirector.out" and stored in a property of the same name. Similarly, error output is sent to diff --git a/docs/manual/CoreTasks/fail.html b/docs/manual/Tasks/fail.html similarity index 100% rename from docs/manual/CoreTasks/fail.html rename to docs/manual/Tasks/fail.html diff --git a/docs/manual/CoreTasks/filter.html b/docs/manual/Tasks/filter.html similarity index 100% rename from docs/manual/CoreTasks/filter.html rename to docs/manual/Tasks/filter.html diff --git a/docs/manual/CoreTasks/fixcrlf.html b/docs/manual/Tasks/fixcrlf.html similarity index 99% rename from docs/manual/CoreTasks/fixcrlf.html rename to docs/manual/Tasks/fixcrlf.html index 15dc45c6d..b408df2a8 100644 --- a/docs/manual/CoreTasks/fixcrlf.html +++ b/docs/manual/Tasks/fixcrlf.html @@ -47,7 +47,7 @@

    This task forms an implicit - FileSet and + FileSet and supports most attributes of <fileset> (dir becomes srcdir) as well as the nested <include>, <exclude> and @@ -63,7 +63,7 @@

    Since Ant 1.7, this task can be used in a - filterchain. + filterchain.

    Parameters

    diff --git a/docs/manual/OptionalTasks/ftp.html b/docs/manual/Tasks/ftp.html similarity index 99% rename from docs/manual/OptionalTasks/ftp.html rename to docs/manual/Tasks/ftp.html index 75fad2590..c40c59088 100644 --- a/docs/manual/OptionalTasks/ftp.html +++ b/docs/manual/Tasks/ftp.html @@ -480,7 +480,7 @@ patterns of the fileset

    Parameters specified as nested elements

    fileset

    The ftp task supports any number of nested <fileset> elements to specify +href="../Types/fileset.html"><fileset> elements to specify the files to be retrieved, or deleted, or listed, or whose mode you want to change.

    The attribute followsymlinks of fileset is supported on diff --git a/docs/manual/CoreTasks/genkey.html b/docs/manual/Tasks/genkey.html similarity index 100% rename from docs/manual/CoreTasks/genkey.html rename to docs/manual/Tasks/genkey.html diff --git a/docs/manual/CoreTasks/get.html b/docs/manual/Tasks/get.html similarity index 97% rename from docs/manual/CoreTasks/get.html rename to docs/manual/Tasks/get.html index e15578fc9..36b2a9f67 100644 --- a/docs/manual/CoreTasks/get.html +++ b/docs/manual/Tasks/get.html @@ -43,7 +43,7 @@ plain text' authentication is used. This is only secure over an HTTPS link. use the proxy settings of the operating system if enabled with the -autoproxy option. There is also the - <setproxy> task + <setproxy> task for earlier Java versions. With proxies turned on, <get> requests against localhost may not work as expected, if the request is relayed to the proxy.

    @@ -125,7 +125,7 @@ plain text' authentication is used. This is only secure over an HTTPS link.

    Parameters specified as nested elements

    any resource collection

    -

    Resource +

    Resource Collections are used to select groups of URLs to download. If the collection contains more than one resource, the dest attribute must point to a directory if it exists or a directory will be @@ -136,7 +136,7 @@ plain text' authentication is used. This is only secure over an HTTPS link.

    mapper

    You can define name transformations by using a - nested mapper element. You + nested mapper element. You can also use any filenamemapper type in place of the mapper element.

    diff --git a/docs/manual/CoreTasks/gunzip.html b/docs/manual/Tasks/gunzip.html similarity index 100% rename from docs/manual/CoreTasks/gunzip.html rename to docs/manual/Tasks/gunzip.html diff --git a/docs/manual/CoreTasks/gzip.html b/docs/manual/Tasks/gzip.html similarity index 100% rename from docs/manual/CoreTasks/gzip.html rename to docs/manual/Tasks/gzip.html diff --git a/docs/manual/CoreTasks/hostinfo.html b/docs/manual/Tasks/hostinfo.html similarity index 100% rename from docs/manual/CoreTasks/hostinfo.html rename to docs/manual/Tasks/hostinfo.html diff --git a/docs/manual/OptionalTasks/image-classdiagram.gif b/docs/manual/Tasks/image-classdiagram.gif similarity index 100% rename from docs/manual/OptionalTasks/image-classdiagram.gif rename to docs/manual/Tasks/image-classdiagram.gif diff --git a/docs/manual/OptionalTasks/image.html b/docs/manual/Tasks/image.html similarity index 97% rename from docs/manual/OptionalTasks/image.html rename to docs/manual/Tasks/image.html index 3e5cd7f8e..79d075a02 100644 --- a/docs/manual/OptionalTasks/image.html +++ b/docs/manual/Tasks/image.html @@ -119,7 +119,7 @@

    Parameters specified as nested elements

    -

    This task forms an implicit FileSet and +

    This task forms an implicit FileSet and supports most attributes of <fileset> as well as the nested <include>, <exclude> and <patternset> elements.

    @@ -204,10 +204,10 @@ nested inside the Draw object.

    Since Ant 1.8.0

    You can define filename transformations by using a - nested mapper element. The + nested mapper element. The default mapper used by <image> is - the identity + the identity mapper.

    You can also use a filenamemapper type in place of the mapper diff --git a/docs/manual/CoreTasks/import.html b/docs/manual/Tasks/import.html similarity index 99% rename from docs/manual/CoreTasks/import.html rename to docs/manual/Tasks/import.html index 9f4e28c20..9742990dc 100644 --- a/docs/manual/CoreTasks/import.html +++ b/docs/manual/Tasks/import.html @@ -211,7 +211,7 @@ project).

    Parameters specified as nested elements

    -

    any resource or resource +

    any resource or resource collection

    The specified resources will be imported. Since Ant diff --git a/docs/manual/CoreTasks/include.html b/docs/manual/Tasks/include.html similarity index 99% rename from docs/manual/CoreTasks/include.html rename to docs/manual/Tasks/include.html index 24d2f361b..1a809816d 100644 --- a/docs/manual/CoreTasks/include.html +++ b/docs/manual/Tasks/include.html @@ -215,7 +215,7 @@ project).

    Parameters specified as nested elements

    -

    any resource or resource +

    any resource or resource collection

    The specified resources will be included.

    diff --git a/docs/manual/CoreTasks/input.html b/docs/manual/Tasks/input.html similarity index 100% rename from docs/manual/CoreTasks/input.html rename to docs/manual/Tasks/input.html diff --git a/docs/manual/CoreTasks/jar.html b/docs/manual/Tasks/jar.html similarity index 99% rename from docs/manual/CoreTasks/jar.html rename to docs/manual/Tasks/jar.html index d7aec7f50..b12a6e129 100644 --- a/docs/manual/CoreTasks/jar.html +++ b/docs/manual/Tasks/jar.html @@ -38,7 +38,7 @@ finally with the defaultexcludes attribute, you can specify whether you want to use default exclusions or not. See the section on directory based tasks, on how the inclusion/exclusion of files works, and how to write patterns.

    -

    This task forms an implicit FileSet and +

    This task forms an implicit FileSet and supports most attributes of <fileset> (dir becomes basedir) as well as the nested <include>, <exclude> and @@ -325,7 +325,7 @@ to a value other than its default, "add".

    Nested elements

    metainf

    The nested metainf element specifies a FileSet. All files included in this fileset will +href="../Types/fileset.html">FileSet. All files included in this fileset will end up in the META-INF directory of the jar file. If this fileset includes a file named MANIFEST.MF, the file is ignored and you will get a warning.

    diff --git a/docs/manual/OptionalTasks/jarlib-available.html b/docs/manual/Tasks/jarlib-available.html similarity index 95% rename from docs/manual/OptionalTasks/jarlib-available.html rename to docs/manual/Tasks/jarlib-available.html index c71732cc7..73412df45 100644 --- a/docs/manual/OptionalTasks/jarlib-available.html +++ b/docs/manual/Tasks/jarlib-available.html @@ -61,15 +61,15 @@ http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html.

    Parameters specified as nested elements

    extension

    -

    Extension the extension +

    Extension the extension to search for.

    fileset

    -

    FileSets are used to select +

    FileSets are used to select sets of files to check for extension.

    extensionSet

    -

    ExtensionSets is the set +

    ExtensionSets is the set of extensions to search for extension in.

    Examples

    diff --git a/docs/manual/OptionalTasks/jarlib-display.html b/docs/manual/Tasks/jarlib-display.html similarity index 97% rename from docs/manual/OptionalTasks/jarlib-display.html rename to docs/manual/Tasks/jarlib-display.html index 82bfff268..b9b21f606 100644 --- a/docs/manual/OptionalTasks/jarlib-display.html +++ b/docs/manual/Tasks/jarlib-display.html @@ -56,7 +56,7 @@ http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html.

    Parameters specified as nested elements

    fileset

    -

    FileSets contain list of files to +

    FileSets contain list of files to display Extension information about.

    Examples

    diff --git a/docs/manual/OptionalTasks/jarlib-manifest.html b/docs/manual/Tasks/jarlib-manifest.html similarity index 94% rename from docs/manual/OptionalTasks/jarlib-manifest.html rename to docs/manual/Tasks/jarlib-manifest.html index dadda500b..cedb2656c 100644 --- a/docs/manual/OptionalTasks/jarlib-manifest.html +++ b/docs/manual/Tasks/jarlib-manifest.html @@ -57,15 +57,15 @@ http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html.

    Parameters specified as nested elements

    extension

    -

    Extension the extension +

    Extension the extension that this library implements.

    depends

    -

    ExtensionSets containing +

    ExtensionSets containing all dependencies for jar.

    options

    -

    ExtensionSets containing +

    ExtensionSets containing all optional dependencies for jar. (Optional dependencies will be used if present else they will be ignored)

    diff --git a/docs/manual/OptionalTasks/jarlib-resolve.html b/docs/manual/Tasks/jarlib-resolve.html similarity index 99% rename from docs/manual/OptionalTasks/jarlib-resolve.html rename to docs/manual/Tasks/jarlib-resolve.html index c6e083543..a00435c58 100644 --- a/docs/manual/OptionalTasks/jarlib-resolve.html +++ b/docs/manual/Tasks/jarlib-resolve.html @@ -71,7 +71,7 @@ http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html.

    Parameters specified as nested elements

    extension

    -

    Extension the extension +

    Extension the extension to resolve. Must be present

    location

    diff --git a/docs/manual/CoreTasks/java.html b/docs/manual/Tasks/java.html similarity index 97% rename from docs/manual/CoreTasks/java.html rename to docs/manual/Tasks/java.html index 0bb7bb460..d1af418f4 100644 --- a/docs/manual/CoreTasks/java.html +++ b/docs/manual/Tasks/java.html @@ -234,7 +234,7 @@ variables.

    syspropertyset

    You can specify a set of properties to be used as system properties -with syspropertysets.

    +with syspropertysets.

    since Ant 1.6.

    @@ -261,7 +261,7 @@ section about exec

    permissions

    Security permissions can be revoked and granted during the execution of the class via a nested permissions element. For more information please -see permissions

    +see permissions

    When the permission RuntimePermission exitVM has not been granted (or has been revoked) the System.exit() call will be intercepted and treated like indicated in failonerror.

    @@ -280,7 +280,7 @@ disallowed.

    assertions

    You can control enablement of Java 1.4 assertions with an -<assertions> +<assertions> subelement.

    Assertion statements are currently ignored in non-forked mode.

    @@ -289,13 +289,13 @@ subelement.

    redirector

     Since Ant 1.6.2 -

    A nested I/O Redirector +

    A nested I/O Redirector can be specified. In general, the attributes of the redirector behave as the corresponding attributes available at the task level. The most notable peculiarity stems from the retention of the <java> attributes for backwards compatibility. Any file mapping is done using a null sourcefile; therefore not all -Mapper types will return +Mapper types will return results. When no results are returned, redirection specifications will fall back to the task level attributes. In practice this means that defaults can be specified for input, output, and error output files. diff --git a/docs/manual/CoreTasks/javac.html b/docs/manual/Tasks/javac.html similarity index 99% rename from docs/manual/CoreTasks/javac.html rename to docs/manual/Tasks/javac.html index a81013f25..79441d0a9 100644 --- a/docs/manual/CoreTasks/javac.html +++ b/docs/manual/Tasks/javac.html @@ -36,7 +36,7 @@ or where the class file is older than the the classes that need a rebuild. It will not scan the source and therefore will have no knowledge about nested classes, classes that are named different from the source file, and so on. See the -<depend> task +<depend> task for dependency checking based on other than just existence/modification times.

    When the source files are part of a package, the directory structure of @@ -443,7 +443,7 @@ invoking the compiler.

    Parameters specified as nested elements

    -

    This task forms an implicit FileSet and +

    This task forms an implicit FileSet and supports most attributes of <fileset> (dir becomes srcdir) as well as the nested <include>, <exclude> and diff --git a/docs/manual/OptionalTasks/javacc.html b/docs/manual/Tasks/javacc.html similarity index 100% rename from docs/manual/OptionalTasks/javacc.html rename to docs/manual/Tasks/javacc.html diff --git a/docs/manual/CoreTasks/javadoc.html b/docs/manual/Tasks/javadoc.html similarity index 99% rename from docs/manual/CoreTasks/javadoc.html rename to docs/manual/Tasks/javadoc.html index 1f980e6ce..fe560babf 100644 --- a/docs/manual/CoreTasks/javadoc.html +++ b/docs/manual/Tasks/javadoc.html @@ -526,7 +526,7 @@ recommended.

    packageset

    -

    A DirSet. All matched +

    A DirSet. All matched directories that contain Java source files will be passed to javadoc as package names. Package names are created from the directory names by translating the directory separator into dots. Ant assumes the @@ -539,7 +539,7 @@ the nested <packageset> elements.

    fileset

    -

    A FileSet. All matched +

    A FileSet. All matched files will be passed to javadoc as source files. Ant will automatically add the include pattern **/*.java (and **/package.html if includenosourcepackages is true) to @@ -558,7 +558,7 @@ the nested <fileset> elements.

    sourcefiles

    A container for arbitrary file system based resource +href="../Types/resources.html#collection">resource collections. All files contained in any of the nested collections (this includes nested filesets, filelists or paths) will be passed to javadoc as source files.

    @@ -765,7 +765,7 @@ not set the description attribute for those tags.

    dir If this attribute is specified, this element will behave as an implicit - fileset. The files included by this fileset should + fileset. The files included by this fileset should contain each tag definition on a separate line, as described in the Javadoc reference guide: 
    ejb.bean:t:XDoclet EJB Tag
diff --git a/docs/manual/OptionalTasks/javah.html b/docs/manual/Tasks/javah.html
similarity index 100%
rename from docs/manual/OptionalTasks/javah.html
rename to docs/manual/Tasks/javah.html
diff --git a/docs/manual/OptionalTasks/jdepend.html b/docs/manual/Tasks/jdepend.html
similarity index 100%
rename from docs/manual/OptionalTasks/jdepend.html
rename to docs/manual/Tasks/jdepend.html
diff --git a/docs/manual/OptionalTasks/jjdoc.html b/docs/manual/Tasks/jjdoc.html
similarity index 100%
rename from docs/manual/OptionalTasks/jjdoc.html
rename to docs/manual/Tasks/jjdoc.html
diff --git a/docs/manual/OptionalTasks/jjtree.html b/docs/manual/Tasks/jjtree.html
similarity index 100%
rename from docs/manual/OptionalTasks/jjtree.html
rename to docs/manual/Tasks/jjtree.html
diff --git a/docs/manual/OptionalTasks/jlink.html b/docs/manual/Tasks/jlink.html
similarity index 95%
rename from docs/manual/OptionalTasks/jlink.html
rename to docs/manual/Tasks/jlink.html
index 47bd24083..45ef96152 100644
--- a/docs/manual/OptionalTasks/jlink.html
+++ b/docs/manual/Tasks/jlink.html
@@ -23,9 +23,9 @@
 
 
    Jlink
    
 
    Deprecated
    
-
    This task has been deprecated. Use a zipfileset
- or zipgroupfileset with the
- Jar task or Zip task
+
    This task has been deprecated. Use a zipfileset
+ or zipgroupfileset with the
+ Jar task or Zip task
  instead.
    
 
 
    Description:
    
diff --git a/docs/manual/OptionalTasks/jspc.html b/docs/manual/Tasks/jspc.html
similarity index 100%
rename from docs/manual/OptionalTasks/jspc.html
rename to docs/manual/Tasks/jspc.html
diff --git a/docs/manual/OptionalTasks/junit.html b/docs/manual/Tasks/junit.html
similarity index 98%
rename from docs/manual/OptionalTasks/junit.html
rename to docs/manual/Tasks/junit.html
index 646fbe93f..6a5d611bc 100644
--- a/docs/manual/OptionalTasks/junit.html
+++ b/docs/manual/Tasks/junit.html
@@ -292,7 +292,7 @@ href="../using.html#arg">Command-line Arguments.
    
 properties required by the class. These properties will be made available
 to the VM during the execution of the test (either ANT's VM or the forked VM,
 if fork is enabled).
-The attributes for this element are the same as for environment variables.
    
+The attributes for this element are the same as for environment variables.
    
 
 
     <junit fork="no">
@@ -307,7 +307,7 @@ available to the test.
    
 
    syspropertyset
    
 
 
    You can specify a set of properties to be used as system properties
-with syspropertysets.
    
+with syspropertysets.
    
 
 
    since Ant 1.6.
    
 
@@ -316,7 +316,7 @@ with syspropertysets.
    
 
    It is possible to specify environment variables to pass to the
 forked VM via nested <env> elements. For a description
 of the <env> element's attributes, see the
-description in the exec task.
    
+description in the exec task.
    
 
 
    Settings will be ignored if fork is disabled.
    
 
@@ -332,7 +332,7 @@ support it (i.e. Java 1.1).
    
 
    permissions
    
 
    Security permissions can be revoked and granted during the execution of the 
 class via a nested permissions element. For more information please
-see permissions
    
+see permissions
    
 
 
    Settings will be ignored if fork is enabled.
    
 
@@ -341,7 +341,7 @@ see permissions
    
 
    assertions
    
 
 
    You can control enablement of Java 1.4 assertions with an
-<assertions>
+<assertions>
 subelement.
    
  
 
    Assertion statements are currently ignored in non-forked mode.
    
@@ -501,9 +501,9 @@ the name of the resulting class (without suffix). It defaults to java-tmp-dir
 
 
    Define a number of tests based on pattern matching.
    
 
-
    batchtest collects the included resources from any number
+
    batchtest collects the included resources from any number
 of nested Resource Collections. It then
+href="../Types/resources.html#collection">Resource Collections. It then
 generates a test class name for each resource that ends in
 .java or .class.
    
 
diff --git a/docs/manual/OptionalTasks/junitreport.html b/docs/manual/Tasks/junitreport.html
similarity index 98%
rename from docs/manual/OptionalTasks/junitreport.html
rename to docs/manual/Tasks/junitreport.html
index aaefbde56..da87ecb96 100644
--- a/docs/manual/OptionalTasks/junitreport.html
+++ b/docs/manual/Tasks/junitreport.html
@@ -76,7 +76,7 @@ available anymore for quite some time.
    
 
    Nested Elements
    
 
    fileset
    
 
    junitreport collects individual xml files generated by the JUnit
-task using the nested <FileSet>
+task using the nested <FileSet>
 element.
    
 
    report
    
 
    Generate a browsable report based on the document created by the merge.
    
diff --git a/docs/manual/CoreTasks/length.html b/docs/manual/Tasks/length.html
similarity index 96%
rename from docs/manual/CoreTasks/length.html
rename to docs/manual/Tasks/length.html
index e8009f141..f21231f04 100644
--- a/docs/manual/CoreTasks/length.html
+++ b/docs/manual/Tasks/length.html
@@ -28,7 +28,7 @@
 
    Description
    
 
    Display or set a property containing length information for
    a string, a file, or one or more nested
-   Resource Collections.
+   Resource Collections.
    Can also be used as a condition. Since Ant 1.6.3
    
 
    Parameters
    
 
@@ -92,7 +92,7 @@
 
 
    Resource Collections
    You can include resources via nested
-  Resource Collections.
    
+  Resource Collections.
    Examples
    
 
diff --git a/docs/manual/CoreTasks/loadfile.html b/docs/manual/Tasks/loadfile.html
similarity index 93%
rename from docs/manual/CoreTasks/loadfile.html
rename to docs/manual/Tasks/loadfile.html
index f7befbaa8..87c33e3e6 100644
--- a/docs/manual/CoreTasks/loadfile.html
+++ b/docs/manual/Tasks/loadfile.html
@@ -75,7 +75,7 @@ the property is not set.
    
 
 
 
 
 
    
 
    
-The LoadFile task supports nested 
+The LoadFile task supports nested 
 FilterChains.
 
 
    Examples
    
@@ -107,7 +107,7 @@ Load a file, don't fail if it is missing (a message is printed, though)
       property="mail.recipients"
       srcFile="recipientlist.txt">
       <filterchain>
-        <striplinebreaks/>
+        <striplinebreaks/>
       </filterchain>
     </loadfile>
 
    
@@ -118,7 +118,7 @@ merging lines to ensure this happens.
       property="system.configuration.xml"
       srcFile="configuration.xml">
         <filterchain>
-          <expandproperties/>
+          <expandproperties/>
         </filterchain>
     </loadfile>
    diff --git a/docs/manual/CoreTasks/loadproperties.html b/docs/manual/Tasks/loadproperties.html similarity index 88% rename from docs/manual/CoreTasks/loadproperties.html rename to docs/manual/Tasks/loadproperties.html index 11d68c5cd..0c115dfc9 100644 --- a/docs/manual/CoreTasks/loadproperties.html +++ b/docs/manual/Tasks/loadproperties.html @@ -35,7 +35,7 @@ than a warning being printed.

    If you want to simulate property's prefix attribute, please use prefixlines +href="../Types/filterchain.html#prefixlines">prefixlines filter.

    Parameters

    @@ -82,12 +82,12 @@ filter.

    Parameters specified as nested elements

    -

    any resource or single element +

    any resource or single element resource collection

    The specified resource will be used as src. Since Ant 1.7

    -

    FilterChain

    +

    FilterChain

    classpath

    @@ -106,7 +106,7 @@ Load contents of file.properties as Ant properties. 
        <loadproperties srcFile="file.properties">
       <filterchain>
-        <linecontains>
+        <linecontains>
           <contains value="import."/>
         </linecontains>
       </filterchain>
@@ -118,8 +118,8 @@ Ant properties.
 
 
         <loadproperties>
-      <gzipresource>
-        <url url="http://example.org/url.properties.gz"/>
+      <gzipresource>
+        <url url="http://example.org/url.properties.gz"/>
       </gzipresource>
     </loadproperties>
 
    
diff --git a/docs/manual/CoreTasks/loadresource.html b/docs/manual/Tasks/loadresource.html
similarity index 95%
rename from docs/manual/CoreTasks/loadresource.html
rename to docs/manual/Tasks/loadresource.html
index 37c8b7551..743741a18 100644
--- a/docs/manual/CoreTasks/loadresource.html
+++ b/docs/manual/Tasks/loadresource.html
@@ -32,7 +32,7 @@
 Load a text resource into a single property. Unless an encoding is
 specified, the encoding of the current locale is used.  Resources to
 load are specified as nested resource elements or single
+href="../Types/resources.html">resource elements or single
 element resource collections. If the resource content is empty (maybe after
 processing a filterchain) the property is not set.
 
    
@@ -73,7 +73,7 @@ processing a filterchain) the property is not set.
   
 
 
    
-The LoadResource task supports nested 
+The LoadResource task supports nested 
 FilterChains.
 
 
    Examples
    
diff --git a/docs/manual/CoreTasks/local.html b/docs/manual/Tasks/local.html
similarity index 100%
rename from docs/manual/CoreTasks/local.html
rename to docs/manual/Tasks/local.html
diff --git a/docs/manual/CoreTasks/macrodef.html b/docs/manual/Tasks/macrodef.html
similarity index 100%
rename from docs/manual/CoreTasks/macrodef.html
rename to docs/manual/Tasks/macrodef.html
diff --git a/docs/manual/CoreTasks/mail.html b/docs/manual/Tasks/mail.html
similarity index 99%
rename from docs/manual/CoreTasks/mail.html
rename to docs/manual/Tasks/mail.html
index def6c0c37..e5e6c2972 100644
--- a/docs/manual/CoreTasks/mail.html
+++ b/docs/manual/Tasks/mail.html
@@ -41,7 +41,7 @@
     <attachments> elements, which are path-like structures.  This means
     any filesystem based resource or resource
+    href="../Types/resources.html">resource or resource
     collection can be used to point to attachments.  Prior to Ant 1.7
     only <fileset> has been supported as a nested
     element, you can still use this directly without an
diff --git a/docs/manual/CoreTasks/makeurl.html b/docs/manual/Tasks/makeurl.html
similarity index 100%
rename from docs/manual/CoreTasks/makeurl.html
rename to docs/manual/Tasks/makeurl.html
diff --git a/docs/manual/CoreTasks/manifest.html b/docs/manual/Tasks/manifest.html
similarity index 100%
rename from docs/manual/CoreTasks/manifest.html
rename to docs/manual/Tasks/manifest.html
diff --git a/docs/manual/CoreTasks/manifestclasspath.html b/docs/manual/Tasks/manifestclasspath.html
similarity index 100%
rename from docs/manual/CoreTasks/manifestclasspath.html
rename to docs/manual/Tasks/manifestclasspath.html
diff --git a/docs/manual/OptionalTasks/mimemail.html b/docs/manual/Tasks/mimemail.html
similarity index 95%
rename from docs/manual/OptionalTasks/mimemail.html
rename to docs/manual/Tasks/mimemail.html
index a8652d344..e81343d78 100644
--- a/docs/manual/OptionalTasks/mimemail.html
+++ b/docs/manual/Tasks/mimemail.html
@@ -27,14 +27,14 @@
 
    MimeMail
    
 
 
    Deprecated
    
-
    This task has been deprecated.  Use the mail task instead.
    
+
    This task has been deprecated.  Use the mail task instead.
    
 
 
    Description
    
 
    Sends SMTP mail with MIME attachments.
 JavaMail
 and Java
 Activation Framework are required for this task.
    
-
    Multiple files can be attached using FileSets.
    
+
    Multiple files can be attached using FileSets.
    
 
    Parameters
    
 
diff --git a/docs/manual/CoreTasks/mkdir.html b/docs/manual/Tasks/mkdir.html
similarity index 100%
rename from docs/manual/CoreTasks/mkdir.html
rename to docs/manual/Tasks/mkdir.html
diff --git a/docs/manual/CoreTasks/move.html b/docs/manual/Tasks/move.html
similarity index 94%
rename from docs/manual/CoreTasks/move.html
rename to docs/manual/Tasks/move.html
index 90bd0ef97..b08625045 100644
--- a/docs/manual/CoreTasks/move.html
+++ b/docs/manual/Tasks/move.html
@@ -32,11 +32,11 @@ destination file is overwritten if it already exists.  When overwrite
 turned off, then files are only moved if the source file is newer than
 the destination file, or when the destination file does not exist.
    
 
-
    Resource
+
    Resource
 Collections are used to select a group of files to move.  Only
 file system based resource collections are supported, this includes filesets, filelist and filesets, filelist and path.  Prior to Ant 1.7 only
 <fileset> has been supported as a nested element.
 To use a resource collection, the todir attribute must be
@@ -103,7 +103,7 @@ there is a directory by the same name in todir, the action will fail.
     
    
+      same effect by using a flatten mapper
@@ -163,9 +163,9 @@ there is a directory by the same name in todir, the action will fail.
 
    Parameters specified as nested elements
    mapper
    You can define file name transformations by using a nested mapper element. The default mapper used by
+href="../Types/mapper.html">mapper element. The default mapper used by
 <move> is the identity.
    
+href="../Types/mapper.html#identity-mapper">identity.
    Note that the source name handed to the mapper depends on the
 resource collection you use.  If you use <fileset>
 or any other collection that provides a base directory, the name
@@ -173,7 +173,7 @@ passed to the mapper will be a relative filename, relative to the base
 directory.  In any other case the absolute filename of the source will
 be used.
    filterchain
    
-
    The Move task supports nested 
+
    The Move task supports nested 
 FilterChains.
    
diff --git a/docs/manual/OptionalTasks/native2ascii.html b/docs/manual/Tasks/native2ascii.html
similarity index 98%
rename from docs/manual/OptionalTasks/native2ascii.html
rename to docs/manual/Tasks/native2ascii.html
index 230b8d204..e623789cc 100644
--- a/docs/manual/OptionalTasks/native2ascii.html
+++ b/docs/manual/Tasks/native2ascii.html
@@ -43,14 +43,14 @@
       to use it as a new extension.
       More sophisticated file name translations can be achieved using a nested
       <mapper> element. By default an
-      identity mapper will be used.
+      identity mapper will be used.
       If dest and src point to the same directory,
       the ext attribute or a nested <mapper>
       is required.
     
    
-      This task forms an implicit File Set,
+      This task forms an implicit File Set,
       and supports most attributes of <fileset>
       (dir becomes src) as well as
       nested <include>, <exclude>,
diff --git a/docs/manual/OptionalTasks/netrexxc.html b/docs/manual/Tasks/netrexxc.html
similarity index 99%
rename from docs/manual/OptionalTasks/netrexxc.html
rename to docs/manual/Tasks/netrexxc.html
index c336b7cd3..a81c9160a 100644
--- a/docs/manual/OptionalTasks/netrexxc.html
+++ b/docs/manual/Tasks/netrexxc.html
@@ -47,7 +47,7 @@ excluded.  This is also done with patterns.  And finally with the
 want to use default exclusions or not. See the section on directory based tasks, on how the
 inclusion/exclusion of files works, and how to write patterns.
    
-
    This task forms an implicit FileSet and
+
    This task forms an implicit FileSet and
 supports most attributes of <fileset>
 (dir becomes srcdir) as well as the nested
 <include>, <exclude> and
diff --git a/docs/manual/CoreTasks/nice.html b/docs/manual/Tasks/nice.html
similarity index 100%
rename from docs/manual/CoreTasks/nice.html
rename to docs/manual/Tasks/nice.html
diff --git a/docs/manual/CoreTasks/pack.html b/docs/manual/Tasks/pack.html
similarity index 97%
rename from docs/manual/CoreTasks/pack.html
rename to docs/manual/Tasks/pack.html
index bf6d67034..84bd3187b 100644
--- a/docs/manual/CoreTasks/pack.html
+++ b/docs/manual/Tasks/pack.html
@@ -51,7 +51,7 @@ resource is newer.
    
   
    ignore directory structure of source directory,
       copy all files into a single directory, specified by the todir
       attribute (default is "false").Note that you can achieve the
-      same effect by using a flatten mapper
     No
   
    
   
    
 
 
 
 
 
 
 
     
     the deprecated old name of destfile.
   
    
 
    
-
    any resource or single element
+
    any resource or single element
 resource collection
    
 
 
    The specified resource will be used as src. Since Ant 1.7
    
diff --git a/docs/manual/CoreTasks/parallel.html b/docs/manual/Tasks/parallel.html
similarity index 100%
rename from docs/manual/CoreTasks/parallel.html
rename to docs/manual/Tasks/parallel.html
diff --git a/docs/manual/CoreTasks/patch.html b/docs/manual/Tasks/patch.html
similarity index 100%
rename from docs/manual/CoreTasks/patch.html
rename to docs/manual/Tasks/patch.html
diff --git a/docs/manual/CoreTasks/pathconvert.html b/docs/manual/Tasks/pathconvert.html
similarity index 96%
rename from docs/manual/CoreTasks/pathconvert.html
rename to docs/manual/Tasks/pathconvert.html
index 55d5c2c63..dd30f828f 100644
--- a/docs/manual/CoreTasks/pathconvert.html
+++ b/docs/manual/Tasks/pathconvert.html
@@ -26,7 +26,7 @@
 
 
    Pathconvert
    
 
    Description
    
-
    Converts nested 
+
    Converts nested 
 ResourceCollections, or a reference to just one, into a path
 form for a particular platform, optionally storing the result into
 a given property. It can also be used when you need
@@ -37,7 +37,7 @@ of files in a FileList into a path.
 
    Nested <map> elements can be specified to map Windows
 drive letters to Unix paths, and vice-versa.
    
 
    More complex transformations can be achieved using a nested
-<mapper>
+<mapper>
 (since Ant 1.6.2).
 
    
 
@@ -140,10 +140,10 @@ prefixes of other from values.    
 
       
 
    Resource Collections
    
 
    If the refid attribute is not specified, then one or more
-   nested Resource
+   nested Resource
 Collections must be supplied.
    
 
    mapper
    
-
    A single nested 
+
    A single nested 
 <mapper> element can be specified
 to perform any of various filename transformations (since Ant 1.6.2).
 
    
diff --git a/docs/manual/OptionalTasks/perforce.html b/docs/manual/Tasks/perforce.html
similarity index 99%
rename from docs/manual/OptionalTasks/perforce.html
rename to docs/manual/Tasks/perforce.html
index 9018c32d2..1a1b0846f 100644
--- a/docs/manual/OptionalTasks/perforce.html
+++ b/docs/manual/Tasks/perforce.html
@@ -733,7 +733,7 @@ Lists files under Perforce control and files not under Perforce control in one o
   
   
     fileset
-    one or several fileset(s)
+    one or several fileset(s)
     yes (at least one fileset is needed)
   
 
diff --git a/docs/manual/CoreTasks/presetdef.html b/docs/manual/Tasks/presetdef.html
similarity index 100%
rename from docs/manual/CoreTasks/presetdef.html
rename to docs/manual/Tasks/presetdef.html
diff --git a/docs/manual/CoreTasks/property.html b/docs/manual/Tasks/property.html
similarity index 100%
rename from docs/manual/CoreTasks/property.html
rename to docs/manual/Tasks/property.html
diff --git a/docs/manual/OptionalTasks/propertyfile.html b/docs/manual/Tasks/propertyfile.html
similarity index 100%
rename from docs/manual/OptionalTasks/propertyfile.html
rename to docs/manual/Tasks/propertyfile.html
diff --git a/docs/manual/CoreTasks/propertyhelper.html b/docs/manual/Tasks/propertyhelper.html
similarity index 100%
rename from docs/manual/CoreTasks/propertyhelper.html
rename to docs/manual/Tasks/propertyhelper.html
diff --git a/docs/manual/OptionalTasks/pvcstask.html b/docs/manual/Tasks/pvcstask.html
similarity index 100%
rename from docs/manual/OptionalTasks/pvcstask.html
rename to docs/manual/Tasks/pvcstask.html
diff --git a/docs/manual/CoreTasks/recorder.html b/docs/manual/Tasks/recorder.html
similarity index 100%
rename from docs/manual/CoreTasks/recorder.html
rename to docs/manual/Tasks/recorder.html
diff --git a/docs/manual/CoreTasks/rename.html b/docs/manual/Tasks/rename.html
similarity index 100%
rename from docs/manual/CoreTasks/rename.html
rename to docs/manual/Tasks/rename.html
diff --git a/docs/manual/OptionalTasks/renameextensions.html b/docs/manual/Tasks/renameextensions.html
similarity index 94%
rename from docs/manual/OptionalTasks/renameextensions.html
rename to docs/manual/Tasks/renameextensions.html
index 4ac951cb9..d2cbcdb39 100644
--- a/docs/manual/OptionalTasks/renameextensions.html
+++ b/docs/manual/Tasks/renameextensions.html
@@ -26,8 +26,8 @@
 
 
    RenameExtensions
    
 
    Deprecated
    
-
    This task has been deprecated.  Use the move
-task with a glob mapper instead.
    
+
    This task has been deprecated.  Use the move
+task with a glob mapper instead.
    
 
    Description
    
 
    Renames files in the srcDir directory ending with the
 fromExtension string so that they end with the
@@ -37,7 +37,7 @@ task with a glob mapper inste
 
    See the section on
 directory based tasks, on how the
 inclusion/exclusion of files works, and how to write patterns.
-This task forms an implicit FileSet and
+This task forms an implicit FileSet and
 supports most attributes of <fileset>
 (dir becomes srcDir) as well as the nested
 <include>, <exclude> and
diff --git a/docs/manual/CoreTasks/replace.html b/docs/manual/Tasks/replace.html
similarity index 98%
rename from docs/manual/CoreTasks/replace.html
rename to docs/manual/Tasks/replace.html
index 8df2059e0..edef3451e 100644
--- a/docs/manual/CoreTasks/replace.html
+++ b/docs/manual/Tasks/replace.html
@@ -138,12 +138,12 @@ have been regenerated by this task.
    
 
    replaces occurrences of the string "@@@" with the string
 "wombat", in the file ${src}/index.html.
    
 
    Parameters specified as nested elements
    
-
    This task forms an implicit FileSet and
+
    This task forms an implicit FileSet and
 supports most attributes of <fileset> as well as the
 nested <include>, <exclude> and
 <patternset> elements.
    
 
    Since Ant 1.8.0 this task supports any filesystem
-  based resource
+  based resource
     collections as nested elements.
    
 
    replacetoken and replacevalue
    
 
    If either the text you want to replace or the replacement text
diff --git a/docs/manual/OptionalTasks/replaceregexp.html b/docs/manual/Tasks/replaceregexp.html
similarity index 93%
rename from docs/manual/OptionalTasks/replaceregexp.html
rename to docs/manual/Tasks/replaceregexp.html
index e86224d71..25eebe0aa 100644
--- a/docs/manual/OptionalTasks/replaceregexp.html
+++ b/docs/manual/Tasks/replaceregexp.html
@@ -33,11 +33,11 @@ in a selected file or set of files.
    
 file.  This prevents spurious rebuilds based on unchanged files which
 have been regenerated by this task.
     
 
-
    Similar to regexp
+
    Similar to regexp
 type mappers this task needs a supporting regular expression
 library and an implementation of
 org.apache.tools.ant.util.regexp.Regexp.
-See details in the documentation of the Regexp Type. 
    
+See details in the documentation of the Regexp Type. 
    
 
 
    Parameters
    
 
@@ -107,12 +107,12 @@ See details in the documentation of the FileSet
+
    This task supports a nested FileSet
    element.
    Since Ant 1.8.0 this task supports any filesystem
-  based resource
+  based resource
     collections as nested elements.
    
-
    This task supports a nested Regexp element to specify
+
    This task supports a nested Regexp element to specify
    the regular expression.  You can use this element to refer to a previously
    defined regular expression datatype instance.
    
diff --git a/docs/manual/CoreTasks/resourcecount.html b/docs/manual/Tasks/resourcecount.html
similarity index 95%
rename from docs/manual/CoreTasks/resourcecount.html
rename to docs/manual/Tasks/resourcecount.html
index e191485ae..79db44b71 100644
--- a/docs/manual/CoreTasks/resourcecount.html
+++ b/docs/manual/Tasks/resourcecount.html
@@ -28,7 +28,7 @@
 
 
    Description
    
 
    Display or set a property containing the size of a nested
-   Resource Collection.
+   Resource Collection.
    Can also be used as a condition. Since Ant 1.7
    
 
    Parameters
    
 
    
 
 
    
@@ -68,7 +68,7 @@
 
    Parameters specified as nested elements
    Resource Collection
    A single
-  Resource Collection
+  Resource Collection
 should be specified via a nested element or the refid attribute.
 
    
 
diff --git a/docs/manual/CoreTasks/retry.html b/docs/manual/Tasks/retry.html
similarity index 100%
rename from docs/manual/CoreTasks/retry.html
rename to docs/manual/Tasks/retry.html
diff --git a/docs/manual/OptionalTasks/rexec.html b/docs/manual/Tasks/rexec.html
similarity index 100%
rename from docs/manual/OptionalTasks/rexec.html
rename to docs/manual/Tasks/rexec.html
diff --git a/docs/manual/CoreTasks/rmic.html b/docs/manual/Tasks/rmic.html
similarity index 99%
rename from docs/manual/CoreTasks/rmic.html
rename to docs/manual/Tasks/rmic.html
index e3ebf1c3b..b23e4a070 100644
--- a/docs/manual/CoreTasks/rmic.html
+++ b/docs/manual/Tasks/rmic.html
@@ -42,7 +42,7 @@ finally with the defaultexcludes attribute, you can specify whether you
 want to use default exclusions or not. See the section on directory based tasks, on how the
 inclusion/exclusion of files works, and how to write patterns.
    
-
    This task forms an implicit FileSet and
+
    This task forms an implicit FileSet and
 supports most attributes of <fileset>
 (dir becomes base) as well as the nested
 <include>, <exclude> and
diff --git a/docs/manual/OptionalTasks/rpm.html b/docs/manual/Tasks/rpm.html
similarity index 100%
rename from docs/manual/OptionalTasks/rpm.html
rename to docs/manual/Tasks/rpm.html
diff --git a/docs/manual/OptionalTasks/schemavalidate.html b/docs/manual/Tasks/schemavalidate.html
similarity index 98%
rename from docs/manual/OptionalTasks/schemavalidate.html
rename to docs/manual/Tasks/schemavalidate.html
index dce51d04d..fce3f201f 100644
--- a/docs/manual/OptionalTasks/schemavalidate.html
+++ b/docs/manual/Tasks/schemavalidate.html
@@ -43,7 +43,7 @@ sources of schema documents, so you can still delegate lookup to a catalog, you
 just need to list all schema URIs and their URL equivalents.
 
 
    This task supports the use of nested
-  
  • <xmlcatalog> elements
    • 
+  
  • <xmlcatalog> elements
  •  <schema> elements, that bind a namespace URI to a URL or a
   local filename.
   
  • <dtd> elements which are used to resolve DTDs and entities.
    • 
@@ -187,7 +187,7 @@ the document(s).
   
    
 
 
   
 
    
 
    xmlcatalog
    
-
    The <xmlcatalog>
+
    The <xmlcatalog>
 element is used to perform entity resolution.
    
 
    attribute
    
 
    The <attribute> element is used to set parser features.
    
diff --git a/docs/manual/OptionalTasks/scp.html b/docs/manual/Tasks/scp.html
similarity index 99%
rename from docs/manual/OptionalTasks/scp.html
rename to docs/manual/Tasks/scp.html
index b26acc55d..9d2a467e9 100644
--- a/docs/manual/OptionalTasks/scp.html
+++ b/docs/manual/Tasks/scp.html
@@ -186,7 +186,7 @@ for more information.  This task has been tested with jsch-0.1.2 and later.
    
 
    Parameters specified as nested elements
    
 
 
    fileset
    
- 
    FileSets are used to select
+ 
    FileSets are used to select
 sets of files to copy.
  To use a fileset, the todir attribute must be set.
    
 
diff --git a/docs/manual/OptionalTasks/script.html b/docs/manual/Tasks/script.html
similarity index 100%
rename from docs/manual/OptionalTasks/script.html
rename to docs/manual/Tasks/script.html
diff --git a/docs/manual/OptionalTasks/scriptdef.html b/docs/manual/Tasks/scriptdef.html
similarity index 98%
rename from docs/manual/OptionalTasks/scriptdef.html
rename to docs/manual/Tasks/scriptdef.html
index d63411a3a..043eb8dd5 100644
--- a/docs/manual/OptionalTasks/scriptdef.html
+++ b/docs/manual/Tasks/scriptdef.html
@@ -105,7 +105,7 @@ more information on writing scripts, please refer to the
     manager
     
       The script engine manager to use.
-      See the script task
+      See the script task
       for using this attribute.
     
     No - default is "auto"
@@ -201,7 +201,7 @@ more information on writing scripts, please refer to the
 
   
    classpath
    
   
    
-    See the script task
+    See the script task
     for using this nested element.
   
    
 
diff --git a/docs/manual/CoreTasks/sequential.html b/docs/manual/Tasks/sequential.html
similarity index 100%
rename from docs/manual/CoreTasks/sequential.html
rename to docs/manual/Tasks/sequential.html
diff --git a/docs/manual/OptionalTasks/serverdeploy.html b/docs/manual/Tasks/serverdeploy.html
similarity index 100%
rename from docs/manual/OptionalTasks/serverdeploy.html
rename to docs/manual/Tasks/serverdeploy.html
diff --git a/docs/manual/OptionalTasks/setproxy.html b/docs/manual/Tasks/setproxy.html
similarity index 100%
rename from docs/manual/OptionalTasks/setproxy.html
rename to docs/manual/Tasks/setproxy.html
diff --git a/docs/manual/CoreTasks/signjar.html b/docs/manual/Tasks/signjar.html
similarity index 100%
rename from docs/manual/CoreTasks/signjar.html
rename to docs/manual/Tasks/signjar.html
diff --git a/docs/manual/CoreTasks/sleep.html b/docs/manual/Tasks/sleep.html
similarity index 100%
rename from docs/manual/CoreTasks/sleep.html
rename to docs/manual/Tasks/sleep.html
diff --git a/docs/manual/OptionalTasks/sos.html b/docs/manual/Tasks/sos.html
similarity index 100%
rename from docs/manual/OptionalTasks/sos.html
rename to docs/manual/Tasks/sos.html
diff --git a/docs/manual/OptionalTasks/sound.html b/docs/manual/Tasks/sound.html
similarity index 100%
rename from docs/manual/OptionalTasks/sound.html
rename to docs/manual/Tasks/sound.html
diff --git a/docs/manual/OptionalTasks/splash.html b/docs/manual/Tasks/splash.html
similarity index 100%
rename from docs/manual/OptionalTasks/splash.html
rename to docs/manual/Tasks/splash.html
diff --git a/docs/manual/CoreTasks/sql.html b/docs/manual/Tasks/sql.html
similarity index 99%
rename from docs/manual/CoreTasks/sql.html
rename to docs/manual/Tasks/sql.html
index d3e3c0ee0..05c2da934 100644
--- a/docs/manual/CoreTasks/sql.html
+++ b/docs/manual/Tasks/sql.html
@@ -297,11 +297,11 @@ on the same schema.
    
   
 
 
    The <transaction> element supports any resource or single element
+href="../Types/resources.html">resource or single element
 resource collection as nested element to specify the resource
 containing the SQL statements.
    
 
-
    any resource or resource
+
    any resource or resource
 collection
    
 
 
    You can specify multiple sources via nested resource collection
diff --git a/docs/manual/OptionalTasks/sshexec.html b/docs/manual/Tasks/sshexec.html
similarity index 100%
rename from docs/manual/OptionalTasks/sshexec.html
rename to docs/manual/Tasks/sshexec.html
diff --git a/docs/manual/OptionalTasks/sshsession.html b/docs/manual/Tasks/sshsession.html
similarity index 100%
rename from docs/manual/OptionalTasks/sshsession.html
rename to docs/manual/Tasks/sshsession.html
diff --git a/docs/manual/OptionalTasks/starteam.html b/docs/manual/Tasks/starteam.html
similarity index 100%
rename from docs/manual/OptionalTasks/starteam.html
rename to docs/manual/Tasks/starteam.html
diff --git a/docs/manual/CoreTasks/style.html b/docs/manual/Tasks/style.html
similarity index 97%
rename from docs/manual/CoreTasks/style.html
rename to docs/manual/Tasks/style.html
index 36f1f5f47..66e76df50 100644
--- a/docs/manual/CoreTasks/style.html
+++ b/docs/manual/Tasks/style.html
@@ -45,7 +45,7 @@ finally with the defaultexcludes attribute, you can specify whether you
 want to use default exclusions or not. See the section on directory based tasks, on how the
 inclusion/exclusion of files works, and how to write patterns.
    
-
    This task forms an implicit FileSet and supports all
+
    This task forms an implicit FileSet and supports all
   attributes of <fileset> (dir becomes basedir)
   as well as the nested <include>, <exclude>
   and <patternset> elements.
    
@@ -61,13 +61,13 @@ been matched.  If this behavior is not what you want, set the
 scanincludedirectories attribute to false.
    
 
 
    Starting with Ant 1.7 this task supports nested resource collections
+href="../Types/resources.html#collection">resource collections
 in addition to (or instead of, depending on the useImplicitFileset
 attribute) the implicit fileset formed by this task.
    
 
 
    This task supports the use of a nested <param> element which is used to pass values
   to an <xsl:param> declaration.
    
-
    This task supports the use of a nested xmlcatalog
+
    This task supports the use of a nested xmlcatalog
 element which is used to perform Entity and URI resolution.
    
 
    Parameters
    
 
@@ -260,7 +260,7 @@ element which is used to perform Entity and URI resolution.
    
 
    
 
    Parameters specified as nested elements
    
 
-
    any resource
+
    any resource
 collection
    
 
 
    since Ant 1.7
    
@@ -275,7 +275,7 @@ nested <classpath>, as well - that is, a
 path-like structure.
    
 
 
    xmlcatalog
    
-
    The xmlcatalog
+
    The xmlcatalog
 element is used to perform Entity and URI resolution.
    
 
 
    param
    
@@ -406,7 +406,7 @@ And in Saxon 7.x:
 
    since Ant 1.6.2
    
 
 
    You can define filename transformations by using a nested mapper element. The default mapper
+href="../Types/mapper.html">mapper element. The default mapper
 used by <xslt> removes the file extension from the
 source file and adds the extension specified via the extension
 attribute.
    
@@ -416,7 +416,7 @@ attribute.
    
 
    Since Ant 1.7
    
 
 
    The nested style element can be used to specify your stylesheet in terms
-of Ant's resource types.  With
+of Ant's resource types.  With
 this element, the stylesheet should be specified as a nested resource or
 single-element collection.  Alternatively, use the refid to
 specify the resource or collection as a reference.
    
@@ -433,7 +433,7 @@ for environment variables.
    
 
    syspropertyset
    
 
 
    You can specify a set of properties to be used as system properties
-with syspropertysets.
    
+with syspropertysets.
    
 
 
    since Ant 1.8.0.
    
 
diff --git a/docs/manual/CoreTasks/subant.html b/docs/manual/Tasks/subant.html
similarity index 99%
rename from docs/manual/CoreTasks/subant.html
rename to docs/manual/Tasks/subant.html
index 43f298cdd..74699642f 100644
--- a/docs/manual/CoreTasks/subant.html
+++ b/docs/manual/Tasks/subant.html
@@ -288,7 +288,7 @@
        
       
         
-          any filesystem based resource collection
+          any filesystem based resource collection
       
       
    
         This includes <fileset>,
diff --git a/docs/manual/OptionalTasks/symlink.html b/docs/manual/Tasks/symlink.html
similarity index 97%
rename from docs/manual/OptionalTasks/symlink.html
rename to docs/manual/Tasks/symlink.html
index bef4aa028..b3304694c 100644
--- a/docs/manual/OptionalTasks/symlink.html
+++ b/docs/manual/Tasks/symlink.html
@@ -31,7 +31,7 @@ make an individual link, delete a link, create multiple links from properties fi
 or create properties files describing links in the specified directories.
 Existing links are not overwritten by default.
 
-
    FileSets are used to select a
+
    FileSets are used to select a
 set of links to record, or a set of property files to create links from. 
    
 
    Parameters
    
 
@@ -86,7 +86,7 @@ set of links to record, or a set of property files to create links from. 
    Parameters specified as nested elements
    fileset
    
- 
    FileSets
+ 
    FileSets
  are used when action = "record" to select directories and linknames to be recorded. 
  They are also used when action = "recreate" to specify both the name of the property 
  files to be processed, and the directories in which they can be found. At least one 
diff --git a/docs/manual/CoreTasks/sync.html b/docs/manual/Tasks/sync.html
similarity index 96%
rename from docs/manual/CoreTasks/sync.html
rename to docs/manual/Tasks/sync.html
index 5d9ad5eb6..de1f9f216 100644
--- a/docs/manual/CoreTasks/sync.html
+++ b/docs/manual/Tasks/sync.html
@@ -29,7 +29,7 @@
 
    Description
    Synchronize a target directory from the files defined in one or
-more Resource Collections.
    
+more Resource Collections.
    Any file in the target directory that has not been matched by at
 least one of the nested resource collections gets removed.  I.e. if you exclude a
@@ -97,7 +97,7 @@ dir, it will get removed from the target.
    Parameters specified as nested elements
    fileset or any other resource collection
    
-
    Resource
+
    Resource
 Collections are used to select groups of files to copy.  To use a
 resource collection, the todir attribute must be set.
    Prior to Ant 1.7 only <fileset> has been
@@ -112,7 +112,7 @@ directory even if they are not present in one of the source
 directories.
    This nested element is like a FileSet except that it doesn't
+href="../Types/fileset.html">FileSet except that it doesn't
 support the dir attribute and the usedefaultexcludes attribute
 defaults to false.
    
 
diff --git a/docs/manual/CoreTasks/tar.html b/docs/manual/Tasks/tar.html
similarity index 97%
rename from docs/manual/CoreTasks/tar.html
rename to docs/manual/Tasks/tar.html
index d2ae20b5c..73ba0c48f 100644
--- a/docs/manual/CoreTasks/tar.html
+++ b/docs/manual/Tasks/tar.html
@@ -29,7 +29,7 @@
 
    Creates a tar archive.
    The basedir attribute is the reference directory from where to tar.
    This task is a directory based task
-and, as such, forms an implicit Fileset. This
+and, as such, forms an implicit Fileset. This
 defines which files, relative to the basedir, will be included in the
 archive. The tar task supports all the attributes of Fileset to refine the
 set of files to be included in the implicit fileset.
    
@@ -131,8 +131,8 @@ or "bzip2".
    Nested Elements
    
 
 The tar task supports nested tarfileset elements. These are
-extended FileSets which,
+href="../Types/tarfileset.html">tarfileset elements. These are
+extended FileSets which,
 in addition to the standard elements, support one additional
 attributes
 
@@ -151,7 +151,7 @@ attributes
 
    
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
    
 
 
    any other resource collection
    
-
    Resource
+
    Resource
 Collections are used to select groups of files to archive.
    
 
    Prior to Ant 1.7 only <fileset> has been
 supported as a nested element.
    
diff --git a/docs/manual/CoreTasks/taskdef.html b/docs/manual/Tasks/taskdef.html
similarity index 100%
rename from docs/manual/CoreTasks/taskdef.html
rename to docs/manual/Tasks/taskdef.html
diff --git a/docs/manual/OptionalTasks/telnet.html b/docs/manual/Tasks/telnet.html
similarity index 100%
rename from docs/manual/OptionalTasks/telnet.html
rename to docs/manual/Tasks/telnet.html
diff --git a/docs/manual/CoreTasks/tempfile.html b/docs/manual/Tasks/tempfile.html
similarity index 100%
rename from docs/manual/CoreTasks/tempfile.html
rename to docs/manual/Tasks/tempfile.html
diff --git a/docs/manual/CoreTasks/touch.html b/docs/manual/Tasks/touch.html
similarity index 96%
rename from docs/manual/CoreTasks/touch.html
rename to docs/manual/Tasks/touch.html
index 6425c3915..290d3e718 100644
--- a/docs/manual/CoreTasks/touch.html
+++ b/docs/manual/Tasks/touch.html
@@ -29,9 +29,9 @@
 
 
    Changes the modification time of a resource and possibly creates it
 at the same time. In addition to working with a single file, this Task
-can also work on resources and
+can also work on resources and
 resource collections (which also includes directories).  Prior to Ant
-1.7 only FileSet or Filelist
+1.7 only FileSet or Filelist
 (since Ant 1.6) have been supported.
    
 
 
    Parameters
    
@@ -97,7 +97,7 @@ not to filesets nested into a path or any other resource
 collection.
    
 
 
    mapper
    
-
    Since Ant 1.6.3, a nested 
+
    Since Ant 1.6.3, a nested 
     mapper can be specified.  Files specified via nested
     filesets, filelists, or the file
     attribute are mapped using the specified mapper.  For each file mapped,
diff --git a/docs/manual/OptionalTasks/translate.html b/docs/manual/Tasks/translate.html
similarity index 97%
rename from docs/manual/OptionalTasks/translate.html
rename to docs/manual/Tasks/translate.html
index f941021ac..46426ad0e 100644
--- a/docs/manual/OptionalTasks/translate.html
+++ b/docs/manual/Tasks/translate.html
@@ -72,7 +72,7 @@ modified after the destination file was last modified.
 New in Ant 1.6:
    
 Line endings of source files are preserved in the translated files.
 
    
-
    FileSets are used to select files to
+
    FileSets are used to select files to
 translate.
 
    
 
    Parameters
    
@@ -155,7 +155,7 @@ translate.
 
    Parameters specified as nested elements
    
 
 
    fileset
    
- 
    FileSets are used to select files that
+ 
    FileSets are used to select files that
  contain keys for which value translated files are to be generated.
 
    
 
    Examples
    
diff --git a/docs/manual/CoreTasks/truncate.html b/docs/manual/Tasks/truncate.html
similarity index 97%
rename from docs/manual/CoreTasks/truncate.html
rename to docs/manual/Tasks/truncate.html
index 7389b57a3..c2c346e47 100644
--- a/docs/manual/CoreTasks/truncate.html
+++ b/docs/manual/Tasks/truncate.html
@@ -30,7 +30,7 @@
 
    Set the length of one or more files, as the intermittently available
 truncate Unix utility/function. In addition to working with
 a single file, this Task can also work on
-resources and resource collections.
+resources and resource collections.
 Since Ant 1.7.1.
 
    
 
diff --git a/docs/manual/CoreTasks/tstamp.html b/docs/manual/Tasks/tstamp.html
similarity index 100%
rename from docs/manual/CoreTasks/tstamp.html
rename to docs/manual/Tasks/tstamp.html
diff --git a/docs/manual/CoreTasks/typedef.html b/docs/manual/Tasks/typedef.html
similarity index 97%
rename from docs/manual/CoreTasks/typedef.html
rename to docs/manual/Tasks/typedef.html
index 4ef69fc3e..5cab4435a 100644
--- a/docs/manual/CoreTasks/typedef.html
+++ b/docs/manual/Tasks/typedef.html
@@ -36,7 +36,7 @@
   
    
   
    
     Data types are things like paths or
-    filesets that can be defined at
+    filesets that can be defined at
     the project level and referenced via their ID attribute.
     Custom data types usually need custom tasks to put them to good use.
   
    
@@ -59,7 +59,7 @@
     
   
    
     The xml format is described in the
-    Antlib section.
+    Antlib section.
   
    
 
 
    Parameters
    
@@ -102,7 +102,7 @@
       are "properties" or "xml". If the value is "properties" the file/resource
       is a property file contains name to classname pairs. If the value
       is "xml", the file/resource is an xml file/resource structured according
-      to Antlib.
+      to Antlib.
       The default is "properties" unless the file/resource name ends with
       ".xml", in which case the format attribute will have the value "xml".
       since Ant 1.6
diff --git a/docs/manual/CoreTasks/unpack.html b/docs/manual/Tasks/unpack.html
similarity index 96%
rename from docs/manual/CoreTasks/unpack.html
rename to docs/manual/Tasks/unpack.html
index ac5e071da..dcc88a9a8 100644
--- a/docs/manual/CoreTasks/unpack.html
+++ b/docs/manual/Tasks/unpack.html
@@ -55,7 +55,7 @@ does not exist.
    
 
 
    Parameters specified as nested elements
    
 
-
    any resource or single element
+
    any resource or single element
 resource collection
    
 
 
    The specified resource will be used as src.
    
@@ -106,7 +106,7 @@ is identical to
 
    The same is also true for <bunzip2> and
 <bzip2resource>.  <copy> offers
 additional features like filtering files on the fly,
+href="../Types/filterchain.html">filtering files on the fly,
 allowing a file to be mapped to multiple destinations, preserving the
 last modified time or a configurable file system timestamp
 granularity.
    
diff --git a/docs/manual/CoreTasks/untar.html b/docs/manual/Tasks/untar.html
similarity index 100%
rename from docs/manual/CoreTasks/untar.html
rename to docs/manual/Tasks/untar.html
diff --git a/docs/manual/CoreTasks/unzip.html b/docs/manual/Tasks/unzip.html
similarity index 94%
rename from docs/manual/CoreTasks/unzip.html
rename to docs/manual/Tasks/unzip.html
index b9883fcc1..b7fb4b660 100644
--- a/docs/manual/CoreTasks/unzip.html
+++ b/docs/manual/Tasks/unzip.html
@@ -27,23 +27,23 @@
 
    Unjar/Untar/Unwar/Unzip
    
 
    Description
    
 
    Unzips a zip-, war-, or jar file.
    
-
    PatternSets are used to select files to extract
+
    PatternSets are used to select files to extract
 from the archive.  If no patternset is used, all files are extracted.
 
    
 
-
    Resource
+
    Resource
 Collections may be used to select archived files to perform
 unarchival upon.  Only file system based resource collections are
 supported by Unjar/Unwar/Unzip, this includes fileset, filelist, fileset, filelist, path, and files.
+href="../Types/resources.html#files">files.
 Untar supports arbitrary resource collections.
 Prior to Ant 1.7 only fileset has been supported as a nested element.
    
 
-
    You can define filename transformations by using a nested mapper element.  The default mapper is the
-identity mapper.
+
    You can define filename transformations by using a nested mapper element.  The default mapper is the
+identity mapper.
 
    
 
    File permissions will not be restored on extracted files.
    
 
    The untar task recognizes the long pathname entries used by GNU tar.
    
@@ -205,7 +205,7 @@ is identical to
 
 
    The same is also true for <untar> and
 <tarfileset>.  <copy> offers
-additional features like filtering files on the fly,
+additional features like filtering files on the fly,
 allowing a file to be mapped to multiple destinations or a
 configurable file system timestamp granularity.
    
 
diff --git a/docs/manual/CoreTasks/uptodate.html b/docs/manual/Tasks/uptodate.html
similarity index 95%
rename from docs/manual/CoreTasks/uptodate.html
rename to docs/manual/Tasks/uptodate.html
index b1b7ce2ee..f02dddb10 100644
--- a/docs/manual/CoreTasks/uptodate.html
+++ b/docs/manual/Tasks/uptodate.html
@@ -30,16 +30,16 @@
 than a source file or set of source files. A single source file is specified
 using the srcfile attribute. A set of source files is specified
 using the nested <srcfiles>
-elements. These are FileSets,
+elements. These are FileSets,
 whereas multiple target files are specified using a nested
-<mapper> element.
    
+<mapper> element.
    
 
    By default, the value of the property is set to true if
 the timestamp of the source file(s) is not more recent than the timestamp of
 the corresponding target file(s). You can set the value to something other
 than the default by specifying the value attribute.
    
 
    If a <srcfiles> element is used, without also specifying
 a <mapper> element, the default behavior is to use a
-merge mapper, with the
+merge mapper, with the
 to attribute set to the value of the
 targetfile attribute.
    
 
    Normally, this task is used to set properties that are useful to avoid
@@ -79,7 +79,7 @@ target execution depending on the relative age of the specified files.
    
 
    Parameters specified as nested elements
    
 
    srcfiles
    
 
    The nested <srcfiles> element is a
-fileset and allows you to
+fileset and allows you to
 specify a set of files to check against the target file(s).
    
 
 
    Note: You can specify either the srcfile
@@ -92,7 +92,7 @@ attribute or nested <srcfiles> elements, but not both.
 
 
    srcresources
    
 
    The nested <srcresources> element is a union and allows you to
+href="../Types/resources.html#union">union and allows you to
 specify a collection of resources to check against the target file(s).
 Since Ant 1.7
    
 
diff --git a/docs/manual/OptionalTasks/vss.html b/docs/manual/Tasks/vss.html
similarity index 100%
rename from docs/manual/OptionalTasks/vss.html
rename to docs/manual/Tasks/vss.html
diff --git a/docs/manual/CoreTasks/waitfor.html b/docs/manual/Tasks/waitfor.html
similarity index 100%
rename from docs/manual/CoreTasks/waitfor.html
rename to docs/manual/Tasks/waitfor.html
diff --git a/docs/manual/CoreTasks/war.html b/docs/manual/Tasks/war.html
similarity index 97%
rename from docs/manual/CoreTasks/war.html
rename to docs/manual/Tasks/war.html
index caf6c429e..da9155c30 100644
--- a/docs/manual/CoreTasks/war.html
+++ b/docs/manual/Tasks/war.html
@@ -273,24 +273,24 @@ to a value other than its default, "add".
    
 
 
    lib
    
 
    The nested lib element specifies a FileSet. All files included in this fileset will
+href="../Types/fileset.html">FileSet. All files included in this fileset will
 end up in the WEB-INF/lib directory of the war file.
    
 
 
    classes
    
 
    The nested classes element specifies a FileSet. All files included in this fileset will
+href="../Types/fileset.html">FileSet. All files included in this fileset will
 end up in the WEB-INF/classes directory of the war file.
    
 
 
    webinf
    
 
    The nested webinf element specifies a FileSet. All files included in this fileset will
+href="../Types/fileset.html">FileSet. All files included in this fileset will
 end up in the WEB-INF directory of the war file. If this
 fileset includes a file named web.xml, the file is
 ignored and you will get a warning.
    
 
 
    metainf
    
 
    The nested metainf element specifies a FileSet. All files included in this fileset will
+href="../Types/fileset.html">FileSet. All files included in this fileset will
 end up in the META-INF directory of the war file. If this
 fileset includes a file named MANIFEST.MF, the file is
 ignored and you will get a warning.
    
diff --git a/docs/manual/CoreTasks/whichresource.html b/docs/manual/Tasks/whichresource.html
similarity index 100%
rename from docs/manual/CoreTasks/whichresource.html
rename to docs/manual/Tasks/whichresource.html
diff --git a/docs/manual/OptionalTasks/wljspc.html b/docs/manual/Tasks/wljspc.html
similarity index 100%
rename from docs/manual/OptionalTasks/wljspc.html
rename to docs/manual/Tasks/wljspc.html
diff --git a/docs/manual/CoreTasks/xmlproperty.html b/docs/manual/Tasks/xmlproperty.html
similarity index 98%
rename from docs/manual/CoreTasks/xmlproperty.html
rename to docs/manual/Tasks/xmlproperty.html
index 254d8d017..dece1243e 100644
--- a/docs/manual/CoreTasks/xmlproperty.html
+++ b/docs/manual/Tasks/xmlproperty.html
@@ -155,10 +155,10 @@ is roughly equivalent to the following fragments in a build.xml file:
 
 
    Nested Elements
    
 
    xmlcatalog
    
-
    The <xmlcatalog>
+
    The <xmlcatalog>
 element is used to perform entity resolution.
    
 
-
    any resource or single element
+
    any resource or single element
 resource collection
    
 
 
    The specified resource will be used as input.
    
diff --git a/docs/manual/OptionalTasks/xmlvalidate.html b/docs/manual/Tasks/xmlvalidate.html
similarity index 98%
rename from docs/manual/OptionalTasks/xmlvalidate.html
rename to docs/manual/Tasks/xmlvalidate.html
index e99e534f6..129ca5f37 100644
--- a/docs/manual/OptionalTasks/xmlvalidate.html
+++ b/docs/manual/Tasks/xmlvalidate.html
@@ -32,7 +32,7 @@ task uses the SAX2 parser implementation provided by JAXP by default
 SAX1/2 parser if needed.
    
 
 
    This task supports the use of nested
-  
  • <xmlcatalog> elements
    • 
+  
  • <xmlcatalog> elements
    • 
   
  • <dtd> elements which are used to resolve DTDs and entities
    • 
   
  • <attribute> elements which are used to set features on the parser.
       These can be any number of
@@ -122,7 +122,7 @@ may not apply.
    
   
 
 
    xmlcatalog
    
-
    The <xmlcatalog>
+
    The <xmlcatalog>
 element is used to perform entity resolution.
    
 
    attribute
    
 
    The <attribute> element is used to set parser features.
    
diff --git a/docs/manual/CoreTasks/zip.html b/docs/manual/Tasks/zip.html
similarity index 98%
rename from docs/manual/CoreTasks/zip.html
rename to docs/manual/Tasks/zip.html
index 4efff0eb7..b78536822 100644
--- a/docs/manual/CoreTasks/zip.html
+++ b/docs/manual/Tasks/zip.html
@@ -38,7 +38,7 @@ finally with the defaultexcludes attribute, you can specify whether you
 want to use default exclusions or not. See the section on directory based tasks, on how the
 inclusion/exclusion of files works, and how to write patterns. 
    
-
    This task forms an implicit FileSet and
+
    This task forms an implicit FileSet and
 supports most attributes of <fileset>
 (dir becomes basedir) as well as the nested
 <include>, <exclude> and
@@ -79,7 +79,7 @@ see below
    
 
 
    Starting with Ant 1.5.2, <zip> can store Unix permissions
 inside the archive (see description of the filemode and dirmode
-attributes for <zipfileset>).
+attributes for <zipfileset>).
 Unfortunately there is no portable way to store these permissions.
 Ant uses the algorithm used by Info-Zip's
 implementation of the zip and unzip commands - these are the default
@@ -387,7 +387,7 @@ archive.
    
 
    Parameters specified as nested elements
    
 
 
    any resource collection
    
-
    Resource
+
    Resource
 Collections are used to select groups of files to archive.
    
 
    Prior to Ant 1.7 only <fileset> and
 <zipfileset> have been supported as nested elements.
    
@@ -399,7 +399,7 @@ merged into the archive. Each file found in this fileset is added to the archive
 the same way that zipfileset src files are added.
    
 
 
    <zipgroupfileset> is
-  a fileset and supports all
+  a fileset and supports all
   of its attributes and nested elements.
 
 
    Examples
    
diff --git a/docs/manual/CoreTypes/antlib.html b/docs/manual/Types/antlib.html
similarity index 95%
rename from docs/manual/CoreTypes/antlib.html
rename to docs/manual/Types/antlib.html
index a5128a0ec..5ebbccdac 100644
--- a/docs/manual/CoreTypes/antlib.html
+++ b/docs/manual/Types/antlib.html
@@ -31,7 +31,7 @@
       An antlib file is an xml file with a root element of "antlib".
       Antlib's elements are ant definition tasks - like
       
-      and Taskdef,
+      and Taskdef,
       or any ant task that extends
       org.apache.tools.ant.taskdefs.AntlibDefinition.
     
    
@@ -39,15 +39,15 @@
         The current set of declarations bundled with Ant that do this are:
     
    
         
      
-            
    1. Typedef
+            
    2. Typedef
             
      3. 
-            
    3. Taskdef
+            
    4. Taskdef
             
      5. 
-            
    5. Macrodef
+            
    6. Macrodef
             
      7. 
-            
    7. Presetdef
+            
    8. Presetdef
             
      9. 
-            
    9. Scriptdef
+            
    10. Scriptdef
             
      11. 
         
    
     
    
diff --git a/docs/manual/CoreTypes/assertions.html b/docs/manual/Types/assertions.html
similarity index 97%
rename from docs/manual/CoreTypes/assertions.html
rename to docs/manual/Types/assertions.html
index f6117dca2..afa12fc06 100644
--- a/docs/manual/CoreTypes/assertions.html
+++ b/docs/manual/Types/assertions.html
@@ -28,8 +28,8 @@
 
    
 The assertions type enables or disables the Java 1.4 assertions feature,
 on a whole Java program, or components of a program. It can be used
-in <java> and
-<junit> to add extra validation to code.  
+in <java> and
+<junit> to add extra validation to code.  
 
 
    
 Assertions are covered in the 
diff --git a/docs/manual/OptionalTypes/classfileset.html b/docs/manual/Types/classfileset.html
similarity index 98%
rename from docs/manual/OptionalTypes/classfileset.html
rename to docs/manual/Types/classfileset.html
index 2bfb33d95..74a2af80c 100644
--- a/docs/manual/OptionalTypes/classfileset.html
+++ b/docs/manual/Types/classfileset.html
@@ -41,7 +41,7 @@ This type requires the jakarta-BCEL library.
 
    Attributes
    
 
    The class fileset support the following attributes in addition
 to those supported by the 
-standard fileset:
+standard fileset:
 
    
  
 
diff --git a/docs/manual/CoreTypes/custom-programming.html b/docs/manual/Types/custom-programming.html
similarity index 100%
rename from docs/manual/CoreTypes/custom-programming.html
rename to docs/manual/Types/custom-programming.html
diff --git a/docs/manual/CoreTypes/description.html b/docs/manual/Types/description.html
similarity index 100%
rename from docs/manual/CoreTypes/description.html
rename to docs/manual/Types/description.html
diff --git a/docs/manual/CoreTypes/dirset.html b/docs/manual/Types/dirset.html
similarity index 100%
rename from docs/manual/CoreTypes/dirset.html
rename to docs/manual/Types/dirset.html
diff --git a/docs/manual/OptionalTypes/extension.html b/docs/manual/Types/extension.html
similarity index 100%
rename from docs/manual/OptionalTypes/extension.html
rename to docs/manual/Types/extension.html
diff --git a/docs/manual/OptionalTypes/extensionset.html b/docs/manual/Types/extensionset.html
similarity index 97%
rename from docs/manual/OptionalTypes/extensionset.html
rename to docs/manual/Types/extensionset.html
index c3b151dc2..3dd4b48fc 100644
--- a/docs/manual/OptionalTypes/extensionset.html
+++ b/docs/manual/Types/extensionset.html
@@ -39,7 +39,7 @@ http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html.
    Extension object to add to set.
    fileset
    
- 
    FileSets all files contained
+ 
    FileSets all files contained
  contained within set that are jars and implement an extension are added
  to extension set.
    
 
diff --git a/docs/manual/CoreTypes/filelist.html b/docs/manual/Types/filelist.html
similarity index 100%
rename from docs/manual/CoreTypes/filelist.html
rename to docs/manual/Types/filelist.html
diff --git a/docs/manual/CoreTypes/fileset.html b/docs/manual/Types/fileset.html
similarity index 100%
rename from docs/manual/CoreTypes/fileset.html
rename to docs/manual/Types/fileset.html
diff --git a/docs/manual/CoreTypes/filterchain.html b/docs/manual/Types/filterchain.html
similarity index 98%
rename from docs/manual/CoreTypes/filterchain.html
rename to docs/manual/Types/filterchain.html
index ad1719b7b..9ba40eab7 100644
--- a/docs/manual/CoreTypes/filterchain.html
+++ b/docs/manual/Types/filterchain.html
@@ -98,11 +98,11 @@ is equivalent to:
 
 
 The following built-in tasks support nested <filterchain> elements.
    
-Concat,
    
-Copy,
    
-LoadFile,
    
-LoadProperties,
    
-Move

    
+Concat,
    
+Copy,
    
+LoadFile,
    
+LoadProperties,
    
+Move

    
 
 A FilterChain is formed by defining zero or more of the following
 nested elements.
    
@@ -124,7 +124,7 @@ nested elements.
    DeleteCharacters
    ConcatFilter
    TokenFilter
    
-FixCRLF
    
+FixCRLF
    SortFilter
    FilterReader
    
@@ -1282,7 +1282,7 @@ concerning the choice of the implementation.
   
@@ -1329,7 +1329,7 @@ concerning the choice of regular expression implementation.
   
@@ -1416,7 +1416,7 @@ This is an optional filter that executes a script in a
   or
   JSR 223
 supported language.
    
-See the Script task for
+See the Script task for
 an explanation of scripts and dependencies.
 
    
@@ -1443,7 +1443,7 @@ Must be a supported Apache BSF or JSR 223 language
     
    
@@ -1476,7 +1476,7 @@ Must be a supported Apache BSF or JSR 223 language
    
 
 
 
 
 
 
 
 
 
    
     flags
     See
-ReplaceRegexp
+ReplaceRegexp
 for an explanation of regex flags.
     No
   
    
     flags
     See
-ReplaceRegexp
+ReplaceRegexp
 for an explanation of regex flags.
     No
   
    
 
    manager
     
       The script engine manager to use.
-      See the script task
+      See the script task
       for using this attribute.
     
     No - default is "auto"
 
    
   
    
     This filter can take a nested <classpath> element.
-    See the script task
+    See the script task
     on how to use this element.
   
    
 
    Examples:
    
diff --git a/docs/manual/CoreTypes/filterset.html b/docs/manual/Types/filterset.html
similarity index 100%
rename from docs/manual/CoreTypes/filterset.html
rename to docs/manual/Types/filterset.html
diff --git a/docs/manual/CoreTypes/mapper.html b/docs/manual/Types/mapper.html
similarity index 98%
rename from docs/manual/CoreTypes/mapper.html
rename to docs/manual/Types/mapper.html
index b20b5786d..84448fa19 100644
--- a/docs/manual/CoreTypes/mapper.html
+++ b/docs/manual/Types/mapper.html
@@ -27,7 +27,7 @@
 
    Mapping File Names
    
 
    Some tasks take source files and create target files. Depending on
 the task, it may be quite obvious which name a target file will have
-(using javac, you know there will be
+(using javac, you know there will be
 .class files for your .java files) - in
 other cases you may want to specify the target files, either to help
 Ant or to get an extra bit of functionality.
    
@@ -95,7 +95,7 @@ instead.
 a path-like structure.
    
 
    Since Ant 1.7.0, nested File Mappers can
 be supplied via either <mapper> elements or
-<typedef>'d
+<typedef>'d
 implementations of org.apache.tools.ant.util.FileNameMapper.
 If nested File Mappers are specified by either means, the mapper will be
 implicitly configured as a composite mapper.
@@ -762,7 +762,7 @@ supported language, once per file to map.
    
 The script can be declared inline or in a specified file.
 
    
 
    
-See the Script task for
+See the Script task for
 an explanation of scripts and dependencies.
 
    
 
@@ -783,7 +783,7 @@ an explanation of scripts and dependencies.
       manager
       
         The script engine manager to use.
-        See the script task
+        See the script task
         for using this attribute.
       
       No - default is "auto"
@@ -817,7 +817,7 @@ an explanation of scripts and dependencies.
     
   
    
     This filename mapper can take a nested <classpath> element.
-    See the script task
+    See the script task
     on how to use this element.
   
    
 
diff --git a/docs/manual/CoreTypes/namespace.html b/docs/manual/Types/namespace.html
similarity index 100%
rename from docs/manual/CoreTypes/namespace.html
rename to docs/manual/Types/namespace.html
diff --git a/docs/manual/CoreTypes/patternset.html b/docs/manual/Types/patternset.html
similarity index 100%
rename from docs/manual/CoreTypes/patternset.html
rename to docs/manual/Types/patternset.html
diff --git a/docs/manual/CoreTypes/permissions.html b/docs/manual/Types/permissions.html
similarity index 100%
rename from docs/manual/CoreTypes/permissions.html
rename to docs/manual/Types/permissions.html
diff --git a/docs/manual/CoreTypes/propertyset.html b/docs/manual/Types/propertyset.html
similarity index 100%
rename from docs/manual/CoreTypes/propertyset.html
rename to docs/manual/Types/propertyset.html
diff --git a/docs/manual/CoreTypes/redirector.html b/docs/manual/Types/redirector.html
similarity index 96%
rename from docs/manual/CoreTypes/redirector.html
rename to docs/manual/Types/redirector.html
index 81dd92557..d8f4e4637 100644
--- a/docs/manual/CoreTypes/redirector.html
+++ b/docs/manual/Types/redirector.html
@@ -26,7 +26,7 @@
 
 
    I/O redirection
    
 
    For many tasks, input and output can be defined in a fairly
-straightforward fashion.  The exec
+straightforward fashion.  The exec
 task, used to execute an external process, stands as a very
 basic example.  The executed process may accept input, produce
 output, or do either or both depending upon various circumstances.
@@ -169,9 +169,9 @@ applied to the error output.
    
 
    Usage
    
 Tasks known to support I/O redirection:
 
 
    The expected behavior of a <redirector> is to a great degree
 dependent on the supporting task.  Any possible points of confusion
diff --git a/docs/manual/CoreTypes/regexp.html b/docs/manual/Types/regexp.html
similarity index 98%
rename from docs/manual/CoreTypes/regexp.html
rename to docs/manual/Types/regexp.html
index 59a7e4689..76a6a0ac3 100644
--- a/docs/manual/CoreTypes/regexp.html
+++ b/docs/manual/Types/regexp.html
@@ -96,7 +96,7 @@ both Unix and Windows platforms before you rely on it.
 
    Usage
    
 The following tasks and types use the Regexp type :
 
 
    
diff --git a/docs/manual/CoreTypes/resources.html b/docs/manual/Types/resources.html
similarity index 99%
rename from docs/manual/CoreTypes/resources.html
rename to docs/manual/Types/resources.html
index 355d127c0..ef285a5fe 100644
--- a/docs/manual/CoreTypes/resources.html
+++ b/docs/manual/Types/resources.html
@@ -339,7 +339,7 @@ Ant's "legacy" datatypes have been modified to behave as Resource Collections:
 
    
 
    Strangely, some tasks can even legitimately behave as resource collections:
 
    
 
 
    If the build file invokes another build file via <ant> or <subant> or uses <antcall>, you are creating a
+href="Tasks/ant.html"><ant> or <subant> or uses <antcall>, you are creating a
 new Ant "project" that will send target and task level events of its
 own but never sends build started/finished events.  Ant 1.6.2
 introduces an extension of the BuildListener interface named
diff --git a/docs/manual/dirtasks.html b/docs/manual/dirtasks.html
index 075335325..28a4daf03 100644
--- a/docs/manual/dirtasks.html
+++ b/docs/manual/dirtasks.html
@@ -26,11 +26,11 @@
 
 
    Directory-based Tasks
    
 
    Some tasks use directory trees for the actions they perform.
-For example, the javac task, which
+For example, the javac task, which
 compiles a directory tree with .java files into
 .class files, is one of these directory-based tasks. Because
 some of these tasks do so much work with a directory tree, the task itself
-can act as an implicit FileSet.
    
+can act as an implicit FileSet.
    
 
    Whether the fileset is implicit or not, it can often be very useful to
 work on a subset of the directory tree. This section describes how you can
 select a subset of such a directory tree when using one of these
@@ -41,16 +41,16 @@ which can be used at the same time:
    
   
  • Only include files and directories that match any
     include patterns and do not match any
     exclude patterns in a given
-    PatternSet.
    • 
+    PatternSet.
  • Select files based on selection criteria defined by a collection of - selector nested elements.
    • + selector nested elements.

    Patternset

    We said that Directory-based tasks can sometimes act as an implicit -<fileset>, +<fileset>, but in addition to that, a FileSet acts as an implicit -<patternset>.

    +<patternset>.

    The inclusion and exclusion elements of the implicit PatternSet can be specified inside the directory-based task (or explicit fileset) via @@ -190,13 +190,13 @@ For example, mypackage/test/ is interpreted as if it were way to select just the files you want.

    Selectors

    -

    The <fileset>, +

    The <fileset>, whether implicit or explicit in the directory-based task, also acts as an -<and> +<and> selector container. This can be used to create arbitrarily complicated selection criteria for the files the task should work with. See the -Selector documentation for more +Selector documentation for more information.

    Standard Tasks/Filesets

    @@ -204,32 +204,32 @@ information.

    the rules given here. This list, a subset of those, is a list of standard ant tasks that can act as an implicit fileset:

    Examples

    @@ -288,7 +288,7 @@ attribute.

    This is the default list; note that you can modify the list of default excludes by using the defaultexcludes task.

    +href="Tasks/defaultexcludes.html">defaultexcludes task.

    diff --git a/docs/manual/install.html b/docs/manual/install.html index d92dd6e87..c20ec5c8f 100644 --- a/docs/manual/install.html +++ b/docs/manual/install.html @@ -694,16 +694,16 @@ least the following:

  • The classpath for Ant must contain ant.jar and any jars/classes needed for your chosen JAXP-compliant XML parser.
  • When you need JDK functionality -(such as for the javac task or the -rmic task), then tools.jar +(such as for the javac task or the +rmic task), then tools.jar must be added. The scripts supplied with Ant, in the bin directory, will add the required JDK classes automatically, if the JAVA_HOME environment variable is set.
  • When you are executing platform-specific applications, such as the -exec task or the -cvs task, the property ant.home +exec task or the +cvs task, the property ant.home must be set to the directory containing where you installed Ant. Again this is set by the Ant scripts to the value of the ANT_HOME environment variable.
    • diff --git a/docs/manual/optionaltasklist.html b/docs/manual/optionaltasklist.html deleted file mode 100644 index fec938732..000000000 --- a/docs/manual/optionaltasklist.html +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - -Apache Ant User Manual - - - - - -

    Table of Contents

    - - -

    Optional Tasks

    - - - - diff --git a/docs/manual/properties.html b/docs/manual/properties.html index b1d8c75a9..441e215f9 100644 --- a/docs/manual/properties.html +++ b/docs/manual/properties.html @@ -29,7 +29,7 @@ expand ${key} to value at runtime.

    There are many tasks that can set properties, the most common one - is the property task. In + is the property task. In addition properties can be defined via command line arguments or similar mechanisms from outside of Ant.

    @@ -40,14 +40,14 @@ defined they are available for any task or target invoked subsequently - it is not possible to set a property in a child build process created via - the ant, antcall or subant tasks + the ant, antcall or subant tasks and make it available to the calling build process, though.

    Starting with Ant 1.8.0 - the local task can be used to + the local task can be used to create properties that are locally scoped to a target or - a sequential element like - the one of the macrodef + a sequential element like + the one of the macrodef task.

    Built-in Properties

    @@ -109,7 +109,7 @@ ant.library.dir the directory that has been used to load Ant's marker interface) to take care of discrete tasks such as property setting, retrieval, parsing, etc. This makes Ant's property handling highly extensible; also of interest is the - new propertyhelper + new propertyhelper task used to manipulate the PropertyHelper and its delegates from the context of the Ant buildfile. @@ -139,7 +139,7 @@ ant.library.dir the directory that has been used to load Ant's would be org.apache.tools.ant.property.LocalProperties which implements storage - for local properties.

    + for local properties.

    Another reason to implement this interface is if you wanted to provide your own "property protocol" like @@ -157,7 +157,7 @@ ant.library.dir the directory that has been used to load Ant's would be org.apache.tools.ant.property.LocalProperties which implements storage - for local properties.

    + for local properties.

    diff --git a/docs/manual/proxy.html b/docs/manual/proxy.html index 1a87037b4..cdc669f63 100644 --- a/docs/manual/proxy.html +++ b/docs/manual/proxy.html @@ -174,7 +174,7 @@ command line.

    SetProxy Task

    - The setproxy task can be used to + The setproxy task can be used to explicitly set a proxy in a build file. This manipulates the many proxy configuration properties of a JVM, and controls the proxy settings for all network operations in the same JVM from that moment. @@ -243,7 +243,7 @@ command line.

    If you wish to have a forked process pick up the Ant's settings, use the - <syspropertyset> + <syspropertyset> element to propagate the normal proxy settings. The following propertyset is a datatype which can be referenced in a <java> task to pass down the current values. diff --git a/docs/manual/running.html b/docs/manual/running.html index 502bbd21d..6c18c2675 100644 --- a/docs/manual/running.html +++ b/docs/manual/running.html @@ -56,7 +56,7 @@ the -Dproperty=value option, where property is the name of the property, and value is the value for that property. If you specify a property that is also set in the build file -(see the property task), +(see the property task), the value specified on the command line will override the value specified in the build file. @@ -67,7 +67,7 @@ the value of environment variables; just pass to Ant. You can then access these variables inside your build file as ${MYVAR}. You can also access environment variables using the - property task's + property task's environment attribute.

    @@ -296,7 +296,7 @@ org.apache.tools.ant.Executor implementation specified here. ant.file read only: full filename of the build file This is set to the name of the build file. In - + <import>-ed files, this is set to the containing build file. @@ -306,7 +306,7 @@ org.apache.tools.ant.Executor implementation specified here. read only: full filename of the build file of Ant projects This is set to the name of a file by project; - this lets you determine the location of + this lets you determine the location of <import>-ed files, @@ -329,7 +329,7 @@ org.apache.tools.ant.Executor implementation specified here. ant.netrexxc.* several formats - Use specified values as defaults for netrexxc. + Use specified values as defaults for netrexxc. @@ -344,7 +344,7 @@ org.apache.tools.ant.Executor implementation specified here. ant.regexp.regexpimpl classname classname for a RegExp implementation; if not set Ant uses JDK 1.4's implementation; - RegExp-Mapper + RegExp-Mapper "Choice of regular expression implementation" @@ -366,49 +366,49 @@ org.apache.tools.ant.Executor implementation specified here. build.compiler name Specify the default compiler to use. - see javac, - EJB Tasks + see javac, + EJB Tasks (compiler attribute), - javah + javah build.compiler.emacs boolean (default false) Enable emacs-compatible error messages. - see javac "Jikes Notes" + see javac "Jikes Notes" build.compiler.fulldepend boolean (default false) Enable full dependency checking - see javac "Jikes Notes" + see javac "Jikes Notes" build.compiler.jvc.extensions boolean (default true) enable Microsoft extensions of their java compiler - see javac "Jvc Notes" + see javac "Jvc Notes" build.compiler.pedantic boolean (default false) Enable pedantic warnings. - see javac "Jikes Notes" + see javac "Jikes Notes" build.compiler.warnings Deprecated flag - see javac "Jikes Notes" + see javac "Jikes Notes" build.rmic name - control the rmic compiler + control the rmic compiler build.sysclasspath @@ -420,7 +420,7 @@ org.apache.tools.ant.Executor implementation specified here. file.encoding name of a supported character set (e.g. UTF-8, ISO-8859-1, US-ASCII) use as default character set of email messages; use as default for source-, dest- and bundleencoding - in translate
    + in translate
    see JavaDoc of java.nio.charset.Charset for more information about character sets (not used in Ant, but has nice docs). @@ -450,14 +450,14 @@ org.apache.tools.ant.Executor implementation specified here. p4.port, p4.client, p4.user several formats Specify defaults for port-, client- and user-setting of the - perforce tasks. + perforce tasks. websphere.home path Points to home directory of websphere. - see EJB Tasks + see EJB Tasks diff --git a/docs/manual/targets.html b/docs/manual/targets.html index 55ffc81ac..01a812e86 100644 --- a/docs/manual/targets.html +++ b/docs/manual/targets.html @@ -131,7 +131,7 @@ option is used.

    It is a good practice to place - your tstamp tasks in a + your tstamp tasks in a so-called initialization target, on which all other targets depend. Make sure that target is always the first one in the depends list of the other targets. In this manual, most @@ -245,7 +245,7 @@

    The main purpose of an extension-point is to act as an extension point for build files designed to - be imported. In the imported + be imported. In the imported file an extension-point defines a state that must be reached and targets from other build files can join the depends list of said extension-point in order to contribute to that state.

    diff --git a/docs/manual/tasklist.html b/docs/manual/tasklist.html new file mode 100644 index 000000000..242ba73d0 --- /dev/null +++ b/docs/manual/tasklist.html @@ -0,0 +1,193 @@ + + + + + + +Apache Ant User Manual + + + + + +

    Table of Contents

    + + + +

    Tasks

    + + + diff --git a/docs/manual/tasksoverview.html b/docs/manual/tasksoverview.html index 61c486b3a..17b9865dd 100644 --- a/docs/manual/tasksoverview.html +++ b/docs/manual/tasksoverview.html @@ -67,109 +67,109 @@ documentation.

    - BUnzip2 + BUnzip2

    Expands a file packed using GZip or BZip2.

    - BZip2 + BZip2

    Packs a file using the GZip or BZip2 algorithm. This task does not do any dependency checking; the output file is always generated

    - Cab + Cab

    Creates Microsoft CAB archive files. It is invoked - similar to the Jar or - Zip tasks. This task will work on + similar to the Jar or + Zip tasks. This task will work on Windows using the external cabarc tool (provided by Microsoft), which must be located in your executable path.

    - Ear -

    An extension of the Jar task with + Ear +

    An extension of the Jar task with special treatment for files that should end up in an Enterprise Application archive.

    - GUnzip + GUnzip

    Expands a GZip file.

    - GZip + GZip

    GZips a set of files.

    - Jar + Jar

    Jars a set of files.

    - Jlink + Jlink

    Deprecated. Use the zipfileset and zipgroupfileset attributes of the - Jar or - Zip tasks instead.

    + Jar or + Zip tasks instead.

    - Manifest + Manifest

    Creates a manifest file.

    - Rpm + Rpm

    Invokes the rpm executable to build a Linux installation file. This task currently only works on Linux or other Unix platforms with RPM support.

    - SignJar + SignJar

    Signs a jar or zip file with the javasign command-line tool.

    - Tar + Tar

    Creates a tar archive.

    - Unjar + Unjar

    Unzips a jarfile.

    - Untar + Untar

    Untars a tarfile.

    - Unwar + Unwar

    Unzips a warfile.

    - Unzip + Unzip

    Unzips a zipfile.

    - War -

    An extension of the Jar task + War +

    An extension of the Jar task with special treatment for files that should end up in the WEB-INF/lib, WEB-INF/classes, or WEB-INF directories of the Web Application Archive.

    - Zip + Zip

    Creates a zipfile.

    @@ -191,7 +191,7 @@ documentation.

    - JDepend + JDepend

    Invokes the JDepend parser. This parser "traverses a set of Java source-file directories and generates design-quality metrics for each Java @@ -217,54 +217,54 @@ documentation.

    - Depend + Depend

    Determines which classfiles are out-of-date with respect to their source, removing the classfiles of any other classes that depend on the out-of-date classes, forcing the re-compile of the removed classfiles. Typically used in conjunction with the - Javac task.

    + Javac task.

    - Javac + Javac

    Compiles the specified source file(s) within the running (Ant) VM, or in another VM if the fork attribute is specified.

    - Apt + Apt

    Runs the annotation processor tool (apt), and then optionally compiles the original code, and any generated source code.

    - JspC + JspC

    Runs the JSP compiler. It can be used to precompile JSP pages for fast initial invocation of JSP pages, deployment on a server without the full JDK installed, or simply to syntax-check the pages without - deploying them. The Javac task + deploying them. The Javac task can be used to compile the generated Java source. (For Weblogic JSP compiles, - see the Wljspc task.)

    + see the Wljspc task.)

    - NetRexxC + NetRexxC

    Compiles a NetRexx source tree within the running (Ant) VM.

    - Rmic + Rmic

    Runs the rmic compiler on the specified file(s).

    - Wljspc + Wljspc

    Compiles JSP pages using Weblogic's JSP compiler, weblogic.jspc. (For non-Weblogic JSP compiles, see the - JspC task.

    + JspC task.

    @@ -286,7 +286,7 @@ documentation.

    - ServerDeploy + ServerDeploy

    Task to run a "hot" deployment tool for vendor-specific J2EE server.

    @@ -310,7 +310,7 @@ documentation.

    - Javadoc/Javadoc2 + Javadoc/Javadoc2

    Generates code documentation using the javadoc tool. The Javadoc2 task is deprecated; use the Javadoc task instead.

    @@ -334,7 +334,7 @@ documentation.

    - EJB Tasks + EJB Tasks

    (See the documentation describing the EJB tasks.)

    @@ -356,54 +356,54 @@ documentation.

    - Ant + Ant

    Runs Ant on a supplied buildfile, optionally passing properties (with possibly new values). This task can be used to build sub-projects.

    - AntCall + AntCall

    Runs another target within the same buildfile, optionally passing properties (with possibly new values).

    - Apply/ExecOn + Apply/ExecOn

    Executes a system command. When the os attribute is specified, the command is only executed when Ant is run on one of the specified operating systems.

    - Dependset + Dependset

    This task compares a set of source files with a set of target files. If any of the source files is newer than any of the target files, all the target files are removed.

    - Exec + Exec

    Executes a system command. When the os attribute is specified, the command is only executed when Ant is run on one of the specified operating systems.

    - Java + Java

    Executes a Java class within the running (Ant) VM, or in another VM if the fork attribute is specified.

    - Parallel + Parallel

    A container task that can contain other Ant tasks. Each nested task specified within the <parallel> tag will be executed in its own thread.

    - Sequential + Sequential

    A container task that can contain other Ant tasks. The nested tasks are simply executed in sequence. Its primary use is to support the sequential execution of a subset of tasks within @@ -411,22 +411,22 @@ documentation.

    - Sleep + Sleep

    A task for suspending execution for a specified period of time. Useful when a build or deployment process requires an interval between tasks.

    - Subant + Subant

    Calls a given target for all defined sub-builds. This is an extension of ant for bulk project execution.

    - Waitfor + Waitfor

    Blocks execution until a set of specified conditions become true. This task is intended to be used with the - Parallel task to synchronize + Parallel task to synchronize a set of processes.

    @@ -448,27 +448,27 @@ documentation.

    - Attrib + Attrib

    Changes the permissions and/or attributes of a file or all files inside the specified directories. Currently, it has effect only under Windows.

    - Checksum + Checksum

    Generates a checksum for a file or set of files. This task can also be used to perform checksum verifications.

    - Chgrp + Chgrp

    Changes the group ownership of a file or all files inside the specified directories. Currently, it has effect only under Unix.

    - Chmod + Chmod

    Changes the permissions of a file or all files inside the specified directories. Currently, it has effect only under Unix. The permissions are also UNIX style, like the arguments for the @@ -476,105 +476,105 @@ documentation.

    - Chown + Chown

    Changes the owner of a file or all files inside the specified directories. Currently, it has effect only under Unix.

    - Concat + Concat

    Concatenates multiple files into a single one or to Ant's logging system.

    - Copy + Copy

    Copies a file or Fileset to a new file or directory.

    - Copydir + Copydir

    Deprecated. Use the - Copy task instead.

    + Copy task instead.

    - Copyfile + Copyfile

    Deprecated. Use the - Copy task instead.

    + Copy task instead.

    - Delete + Delete

    Deletes either a single file, all files and sub-directories in a specified directory, or a set of files specified by one or more - FileSets.

    + FileSets.

    - Deltree + Deltree

    Deprecated. Use the - Delete task instead.

    + Delete task instead.

    - Filter + Filter

    Sets a token filter for this project, or reads multiple token filters from a specified file and sets these as filters. Token filters are used by all tasks that perform file-copying operations.

    - FixCRLF + FixCRLF

    Modifies a file to add or remove tabs, carriage returns, linefeeds, and EOF characters.

    - Get + Get

    Gets a file from a URL.

    - Mkdir + Mkdir

    Creates a directory. Non-existent parent directories are created, when necessary.

    - Move + Move

    Moves a file to a new file or directory, or a set(s) of file(s) to a new directory.

    - Patch + Patch

    Applies a "diff" file to originals.

    - Rename -

    Deprecated. Use the Move + Rename +

    Deprecated. Use the Move task instead.

    - + RenameExtensions -

    Deprecated. Use the Move - task with a glob mapper +

    Deprecated. Use the Move + task with a glob mapper instead.

    - Replace + Replace

    Replace is a directory-based task for replacing the occurrence of a given string with another string in selected file.

    - + ReplaceRegExp

    Directory-based task for replacing the occurrence of a given regular expression with a substitution pattern in a file or set of @@ -582,18 +582,18 @@ documentation.

    - Sync + Sync

    Synchronize two directory trees.

    - Tempfile + Tempfile

    Generates a name for a new temporary file and sets the specified property to that name.

    - Touch + Touch

    Changes the modification time of a file and possibly creates it at the same time.

    @@ -617,7 +617,7 @@ documentation.

    - Jarlib-available + Jarlib-available

    Check whether an extension is present in a FileSet or an ExtensionSet. If the extension is present, the specified property is set.

    @@ -626,7 +626,7 @@ documentation.

    - Jarlib-display + Jarlib-display

    Display the "Optional Package" and "Package Specification" information contained within the specified jars.

    @@ -635,7 +635,7 @@ documentation.

    - Jarlib-manifest + Jarlib-manifest

    Task to generate a manifest that declares all the dependencies in manifest. The dependencies are determined by looking in the specified path and searching for Extension/"Optional Package" @@ -645,7 +645,7 @@ documentation.

    - Jarlib-resolve + Jarlib-resolve

    Try to locate a jar to satisfy an extension, and place the location of the jar into the specified property.

    @@ -670,7 +670,7 @@ documentation.

    - Record + Record

    Runs a listener that records the logging output of the build-process events to a file. Several recorders can exist at the same time. Each recorder is associated with a file.

    @@ -694,13 +694,13 @@ documentation.

    - Mail + Mail

    A task to send SMTP email.

    - MimeMail -

    Deprecated. Use the Mail + MimeMail +

    Deprecated. Use the Mail task instead.

    @@ -723,60 +723,60 @@ documentation.

    - Defaultexcludes + Defaultexcludes

    Modify the list of default exclude patterns from within your build file.

    - Echo + Echo

    Echoes text to System.out or to a file.

    - Fail + Fail

    Exits the current build by throwing a BuildException, optionally printing additional information.

    - GenKey + GenKey

    Generates a key in keystore.

    - HostInfo + HostInfo

    Sets properties related to the provided host, or to the host the process is run on.

    - Input + Input

    Allows user interaction during the build process by displaying a message and reading a line of input from the console.

    - Script + Script

    Executes a script in a Apache BSF-supported language.

    - Sound + Sound

    Plays a sound file at the end of the build, according to whether the build failed or succeeded.

    - Splash + Splash

    Displays a splash screen.

    - Sql + Sql

    Executes a series of SQL statements via JDBC to a database. Statements can either be read in from a text file using the src attribute, or from between the enclosing SQL @@ -784,26 +784,26 @@ documentation.

    - Taskdef + Taskdef

    Adds a task definition to the current project, such that this new task can be used in the current project.

    - TStamp + TStamp

    Sets the DSTAMP, TSTAMP, and TODAY properties in the current project, based on the current date and time.

    - Typedef + Typedef

    Adds a data-type definition to the current project, such that this new type can be used in the current project.

    - XmlValidate + XmlValidate

    Checks that XML files are valid (or only well-formed). This task uses the XML parser that is currently used by Ant by default, but any SAX1/2 parser can be specified, if needed.

    @@ -827,42 +827,42 @@ documentation.

    - ANTLR + ANTLR

    Invokes the ANTLR Translator generator on a grammar file.

    - AntStructure + AntStructure

    Generates a DTD for Ant buildfiles that contains information about all tasks currently known to Ant.

    - Import + Import

    Import another build file and potentially override targets in it with targets of your own.

    - Include + Include

    Include another build file.

    - JavaCC + JavaCC

    Invokes the JavaCC compiler-compiler on a grammar file.

    - Javah + Javah

    Generates JNI headers from a Java class.

    - JJDoc + JJDoc

    Invokes the JJDoc documentation generator for the JavaCC compiler-compiler. JJDoc takes a JavaCC parser specification and produces documentation @@ -872,7 +872,7 @@ documentation.

    - JJTree + JJTree

    Invokes the JJTree preprocessor for the JavaCC compiler-compiler. It inserts parse-tree building actions at various places in the JavaCC source that @@ -882,12 +882,12 @@ documentation.

    - Macrodef + Macrodef

    Define a new task as a macro built-up upon other tasks.

    - + Native2Ascii

    Converts files from native encodings to ASCII with escaped Unicode. A common usage is to convert source files maintained in a native @@ -895,19 +895,19 @@ documentation.

    - Presetdef + Presetdef

    Define a new task by instrumenting an existing task with default values for attributes or child elements.

    - Translate + Translate

    Identifies keys in files, delimited by special tokens, and translates them with values read from resource bundles.

    - XSLT + XSLT

    Processes a set of documents via XSLT.

    @@ -930,49 +930,49 @@ documentation.

    - Available + Available

    Sets a property if a specified file, directory, class in the classpath, or JVM system resource is available at runtime.

    - Basename + Basename

    Sets a property to the last element of a specified path. - BuildNumber + BuildNumber

    Task that can be used to track build numbers. - Condition + Condition

    Sets a property if a certain condition holds true; this is a - generalization of Available and - Uptodate.

    + generalization of Available and + Uptodate.

    - Dirname + Dirname

    Sets a property to the value of the specified file up to, but not including, the last path element. - Echoproperties
    + Echoproperties

    Lists the current properties.

    - LoadFile + LoadFile

    Loads a file into a property.

    - LoadProperties + LoadProperties

    Load a file's contents as Ant properties. This task is equivalent to using <property file="..."/> except that it supports nested <filterchain> elements, @@ -980,12 +980,12 @@ documentation.

    - MakeURL + MakeURL

    Creates a URL (list) from a file/fileset or path

    - PathConvert + PathConvert

    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 @@ -993,13 +993,13 @@ documentation.

    - Property + Property

    Sets a property (by name and value), or set of properties (from a file or resource) in the project.

    - + PropertyFile

    Creates or modifies property files. Useful when wanting to make unattended modifications to configuration files for application @@ -1009,18 +1009,18 @@ documentation.

    - Uptodate + Uptodate

    Sets a property if a given target file is newer than a set of source files.

    - Whichresource + Whichresource

    Find a class or resource.

    - XmlProperty + XmlProperty

    Loads property values from a well-formed XML file.

    @@ -1042,34 +1042,34 @@ documentation.

    - FTP + FTP

    Implements a basic FTP client that can send, receive, list, and delete files, and create directories.

    - Rexec + Rexec

    Task to automate a remote rexec session.

    - Scp + Scp

    Copy files to or from a remote server using SSH.

    - setproxy + setproxy

    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.

    - Sshexec + Sshexec

    Execute a command on a remote server using SSH.

    - Telnet + Telnet

    Task to automate a remote telnet session. This task uses nested <read> and <write> tags to indicate strings to wait for and specify text to send.

    @@ -1094,47 +1094,47 @@ documentation.

    - Cvs + Cvs

    Handles packages/modules retrieved from a CVS repository.

    - CvsChangeLog + CvsChangeLog

    Generates an XML report of the changes recorded in a CVS repository.

    - CVSPass + CVSPass

    Adds entries to a .cvspass file. Adding entries to this file has the same affect as a cvs login command.

    - CvsTagDiff + CvsTagDiff

    Generates an XML-formatted report file of the changes between two tags or dates recorded in a CVS repository.

    - ClearCase + ClearCase

    Tasks to perform the ClearCase cleartool checkin, checkout, uncheckout, update, lock, unlock, mklbtype, rmtype, mklabel, mkattr, mkdir, mkelem, and mkbl commands.

    - Continuus/Synergy + Continuus/Synergy

    Tasks to perform the Continuus ccmcheckin, ccmcheckout, ccmcheckintask, ccmreconfigure, and ccmcreateTask commands.

    - + Microsoft Visual SourceSafe

    Tasks to perform the Visual SourceSafe vssget, vsslabel, vsshistory, vsscheckin, @@ -1143,7 +1143,7 @@ documentation.

    - Perforce + Perforce

    Tasks to perform the Perforce p4sync, p4change, p4edit, p4submit, p4have, p4label, p4counter, p4reopen, p4revert, and p4add @@ -1151,13 +1151,13 @@ documentation.

    - Pvcs + Pvcs

    Allows the user extract the latest edition of the source code from a PVCS repository.

    - SourceOffSite + SourceOffSite

    Tasks to perform the SourceOffSite sosget, soslabel, soscheckin, and soscheckout commands.

    @@ -1181,16 +1181,16 @@ documentation.

    - Junit + Junit

    Runs tests from the Junit testing framework. This task has been tested with JUnit 3.0 up to JUnit 3.7; it won't work with versions prior to JUnit 3.0.

    - JunitReport + JunitReport

    Merges the individual XML files generated by the - Junit task and applies a + Junit task and applies a stylesheet on the resulting merged document to provide a browsable report of the testcases results.

    diff --git a/docs/manual/tutorial-HelloWorldWithAnt.html b/docs/manual/tutorial-HelloWorldWithAnt.html index 4eb0e5567..eefc3e6c7 100644 --- a/docs/manual/tutorial-HelloWorldWithAnt.html +++ b/docs/manual/tutorial-HelloWorldWithAnt.html @@ -408,7 +408,7 @@ public class HelloWorldTest extends junit.framework.TestCase { }

    Because we dont have real business logic to test, this test class is very small: just show how to start. For -further information see the JUnit documentation [3] and the manual of junit task. +further information see the JUnit documentation [3] and the manual of junit task. Now we add a junit instruction to our buildfile:

    diff --git a/docs/manual/tutorial-tasks-filesets-properties.html b/docs/manual/tutorial-tasks-filesets-properties.html
index 8bd40cbba..7812cfea6 100644
--- a/docs/manual/tutorial-tasks-filesets-properties.html
+++ b/docs/manual/tutorial-tasks-filesets-properties.html
@@ -551,7 +551,7 @@ form you do that depends on your favourite. But inside Ant there is a common for
 it has advantages if you use that: all task users know that form, this form is requested if
 you decide to contribute your task. So we will doc our task in that form.
    
 
-
    If you have a look at the manual page of the Java task [5]
+
    If you have a look at the manual page of the Java task [5]
    you will see that it:
      
 
    • is plain html
      • 
 
    • starts with the name
      • 
@@ -715,8 +715,7 @@ information on that.
      
 
    • Patch files generated using cvs diff -u to do
      • 
 
    • patch files include a patch to defaults.properties to register the
 tasks to do
      • 
-
    • patch files include a patch to coretasklist.html or
-optionaltasklist.html to link to the new task page to do
      • 
+
    • patch files include a patch to tasklist.html to link to the new task page to do
      • 
 
    • Message to dev contains [SUBMIT] and task name in subject to do
      • 
 
    • Message body contains a rationale for the task to do
      • 
 
    • Message attachments contain the required files -source, documentation,
@@ -783,9 +782,9 @@ necessary and saves a lot of work if you modify existing source :-).
 
    • delete the dependency to "use.init" in the find.xml 
      • 
 
    • in FindTest.java change the line configureProject("build.xml"); to
     configureProject("src/etc/testcases/taskdefs/find.xml"); 
      • 
-
    • move the find.html to ANTHOME/docs/manual/CoreTasks/find.html 
      • 
-
    • add a <a href="CoreTasks/find.html">Find</a><br>
-    in the ANTHOME/docs/manual/coretasklist.html 
      • 
+
    • move the find.html to ANTHOME/docs/manual/Tasks/find.html 
      • 
+
    • add a <a href="Tasks/find.html">Find</a><br>
+    in the ANTHOME/docs/manual/tasklist.html 
      • 
 
    
 
 Now our modifications are done and we will retest it:
@@ -954,7 +953,7 @@ Now the new task is uploaded into the bug database.
   [2] tutorial-tasks-filesets-properties.zip
    
   [3] properties.html#built-in-props
    
   [4] http://ant-contrib.sourceforge.net/
    
-  [5] CoreTasks/java.html
    
+  [5] Tasks/java.html
    
   [6] http://ant.apache.org/ant_task_guidelines.html
    
   [7] http://ant.apache.org/cvs.html
    
   [8] http://java.sun.com/products/archive/index.html
    
diff --git a/docs/manual/tutorial-writing-tasks.html b/docs/manual/tutorial-writing-tasks.html
index 86bc920af..a50b31da4 100644
--- a/docs/manual/tutorial-writing-tasks.html
+++ b/docs/manual/tutorial-writing-tasks.html
@@ -127,7 +127,7 @@ its depends-clause the "compile" is executed before).
 
    Use the Task
    
 
    But after creating the jar we want to use our new Task. Therefore we need a
 new target "use". Before we can use our new task we have to declare it with
-
+
 <taskdef> [2]. And for easier process we change the default clause:
 
     <?xml version="1.0" encoding="ISO-8859-1"?>
@@ -284,7 +284,7 @@ arguments of the set-method:
 Before calling the set-method all properties are resolved. So a <helloworld message="${msg}"/>
@@ -756,7 +756,7 @@ The last sources and the buildfile are also available
 
 Used Links:
    
   [1] http://ant.apache.org/manual/properties.html#built-in-props
    
-  [2] http://ant.apache.org/manual/CoreTasks/taskdef.html
    
+  [2] http://ant.apache.org/manual/Tasks/taskdef.html
    
   [3] http://ant.apache.org/manual/develop.html#set-magic
    
   [4] http://ant.apache.org/manual/develop.html#nested-elements
    
   [5] http://gump.covalent.net/jars/latest/ant/ant-testutil.jar
    
diff --git a/docs/manual/using.html b/docs/manual/using.html
index 5bd4983de..4c12ff71d 100644
--- a/docs/manual/using.html
+++ b/docs/manual/using.html
@@ -67,7 +67,7 @@ to be unique. (For additional information, see the
 
 
    Optionally, a description for the project can be provided as a
 top-level <description> element (see the description type).
    
+href="Types/description.html">description type).
    
 
 
    Each project defines one or more targets.
 A target is a set of tasks you want
@@ -101,9 +101,7 @@ resolved before the task is executed.
    
 
    where name is the name of the task,
 attributeN is the attribute name, and
 valueN is the value for this attribute.
    
-
    There is a set of built-in tasks, along with a
-number of
- optional tasks, but it is also very
+
    There is a set of built-in tasks, but it is also very
 easy to write your own.
    
 
    All tasks share a task name attribute. The value of
 this attribute will be used in the logging messages generated by
@@ -146,7 +144,7 @@ task instances at all, only proxies.
   inside a build file.
    
 
 
    In its most simple form properties are defined in the build file
-  (for example by the property
+  (for example by the property
   task) or might be set outside Ant.  A property has a name and a
   value; the name is case-sensitive. Properties may be used in the
   value of task attributes or in the nested text of tasks that support
@@ -225,7 +223,7 @@ should be stored in a directory tree which matches the package names. Check the
 
    A project can have a set of tokens that might be automatically expanded if
 found when a file is copied, when the filtering-copy behavior is selected in the
 tasks that support this. These might be set in the buildfile
-by the filter task.
    
+by the filter task.
    
 
    Since this can potentially be a very harmful behavior,
 the tokens in the files must
 be of the form @token@, where
@@ -277,14 +275,14 @@ supports path and
     <classpath path="${classpath}"/>
 
    
 
    In addition, one or more
-Resource Collections
+Resource Collections
 can be specified as nested elements (these must consist of
-file-type resources only).
+file-type resources only).
 Additionally, it should be noted that although resource collections are
 processed in the order encountered, certain resource collection types
-such as fileset,
-dirset and
-files
+such as fileset,
+dirset and
+files
 are undefined in terms of order.
    
 
         <classpath>
@@ -502,15 +500,15 @@ replicate the same snippet of XML over and over again--using a
 </project>
 
    
 
    All tasks that use nested elements for 
-PatternSets, 
-FileSets, 
-ZipFileSets or 
+PatternSets, 
+FileSets, 
+ZipFileSets or 
 path-like structures accept references to these structures 
 as shown in the examples. Using refid on a task will ordinarily 
 have the same effect (referencing a task already declared), but the user 
 should be aware that the interpretation of this attribute is dependent on the 
 implementation of the element upon which it is specified. Some tasks (the 
-property task is a handy example) 
+property task is a handy example) 
 deliberately assign a different meaning to refid.
    
 
 
@@ -532,7 +530,7 @@ for adding libraries:
 For the declaration there are several ways:
 
      
   
    • declare a single task per using instruction using  
-      <taskdef name="taskname" 
+      <taskdef name="taskname" 
       classname="ImplementationClass"/>
       
      
       <taskdef name="for" classname="net.sf.antcontrib.logic.For" /> 
@@ -544,14 +542,14 @@ For the declaration there are several ways:
       <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> 
       <for ... />
   
      • 
-  
    • declare a bundle of tasks using a xml-file holding these  
+  
    • declare a bundle of tasks using a xml-file holding these  
       taskname-ImplementationClass-pairs and <taskdef>
       
      
       <taskdef resource="net/sf/antcontrib/antlib.xml" /> 
       <for ... />
   
      • 
   
    • declare a bundle of tasks using a xml-file named antlib.xml, XML-namespace and 
-      antlib: protocoll handler 
+      antlib: protocoll handler 
       
      
       <project xmlns:ac="antlib:net.sf.antconrib"/> 
       <ac:for ... />
diff --git a/xdocs/antlibs/svn/index.xml b/xdocs/antlibs/svn/index.xml
index 86dda6a72..da61d1c0a 100644
--- a/xdocs/antlibs/svn/index.xml
+++ b/xdocs/antlibs/svn/index.xml
@@ -42,14 +42,14 @@
       
         
      A very thin layer on top of the command line executable,
         comparable to the CVS
+        href="http://ant.apache.org/manual/Tasks/cvs.html">the CVS
         task.
      
             
 
       
         
      Creates a log of change comments between two revisions,
         comparable to CvsChangeLog.
      
+        href="http://ant.apache.org/manual/Tasks/changelog.html">CvsChangeLog.
      
             
 
       
@@ -60,7 +60,7 @@
         for the changes between two revisions.
      
 
         
      Together comparable to CvsTagDiff.
      
+        href="http://ant.apache.org/manual/Tasks/cvstagdiff.html">CvsTagDiff.
      
             
     
 
diff --git a/xdocs/faq.xml b/xdocs/faq.xml
index f0dbea786..615adde2e 100644
--- a/xdocs/faq.xml
+++ b/xdocs/faq.xml
@@ -335,7 +335,7 @@ Apache Ant version 1.6.2 compiled on July 16 2004
     
       How to I precompile Java Server Pages (JSPs)?
       
-        
      Ant has a built in optional task <jspc>
+        
      Ant has a built in optional task <jspc>
         which was intended for that. But this task is deprecated.
         Here the alternative suggested by the manual:
      
         
      Instead of relying on container specific JSP-compilers we suggest deploying
@@ -682,7 +682,7 @@ shell-prompt> m4 foo.m4 > foo
         course, comes with the overhead of adding JAR files to support
         the language, to say nothing of the added maintenance in requiring
         two languages to implement a single system. See the
-        
+        
         <script> task documentation for more
         details.
      
             
diff --git a/xdocs/resources.xml b/xdocs/resources.xml
index 1f2bce37f..b1ed58f8e 100644
--- a/xdocs/resources.xml
+++ b/xdocs/resources.xml
@@ -56,7 +56,7 @@
       
         
      Benoit Moussaud, the original author of the Borland
         Application Server specific EJB tasks has put
+        href="manual/Tasks/ejb.html#ejbtasks">EJB tasks has put
         together a FAQ for this specific subtask.