Return-Path: Delivered-To: apmail-ant-notifications-archive@minotaur.apache.org Received: (qmail 41352 invoked from network); 26 May 2010 20:34:25 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 26 May 2010 20:34:25 -0000 Received: (qmail 82268 invoked by uid 500); 26 May 2010 20:34:25 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 82232 invoked by uid 500); 26 May 2010 20:34:25 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 82222 invoked by uid 99); 26 May 2010 20:34:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 May 2010 20:34:25 +0000 X-ASF-Spam-Status: No, hits=-1500.7 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 May 2010 20:34:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id ABBD023889DA; Wed, 26 May 2010 20:33:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r948574 [1/3] - in /ant/core/trunk: docs/ docs/manual/ docs/manual/CoreTasks/ docs/manual/CoreTypes/ docs/manual/OptionalTasks/ docs/manual/OptionalTypes/ docs/manual/Tasks/ docs/manual/Types/ xdocs/ xdocs/antlibs/svn/ Date: Wed, 26 May 2010 20:33:55 -0000 To: notifications@ant.apache.org From: jglick@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100526203357.ABBD023889DA@eris.apache.org> Author: jglick Date: Wed May 26 20:33:51 2010 New Revision: 948574 URL: http://svn.apache.org/viewvc?rev=948574&view=rev Log: Obliterating "core" vs. "optional" distinction for tasks and types in manual and associated doc files. Added: ant/core/trunk/docs/manual/Tasks/ - copied from r948529, ant/core/trunk/docs/manual/CoreTasks/ ant/core/trunk/docs/manual/Tasks/BorlandEJBTasks.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/BorlandEJBTasks.html ant/core/trunk/docs/manual/Tasks/BorlandGenerateClient.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/BorlandGenerateClient.html ant/core/trunk/docs/manual/Tasks/antlr.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/antlr.html ant/core/trunk/docs/manual/Tasks/attrib.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/attrib.html ant/core/trunk/docs/manual/Tasks/cab.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/cab.html ant/core/trunk/docs/manual/Tasks/ccm.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/ccm.html ant/core/trunk/docs/manual/Tasks/chgrp.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/chgrp.html ant/core/trunk/docs/manual/Tasks/chown.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/chown.html ant/core/trunk/docs/manual/Tasks/clearcase.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/clearcase.html ant/core/trunk/docs/manual/Tasks/depend.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/depend.html ant/core/trunk/docs/manual/Tasks/echoproperties.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/echoproperties.html ant/core/trunk/docs/manual/Tasks/ejb.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/ejb.html ant/core/trunk/docs/manual/Tasks/ftp.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/ftp.html ant/core/trunk/docs/manual/Tasks/image-classdiagram.gif - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/image-classdiagram.gif ant/core/trunk/docs/manual/Tasks/image.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/image.html ant/core/trunk/docs/manual/Tasks/jarlib-available.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/jarlib-available.html ant/core/trunk/docs/manual/Tasks/jarlib-display.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/jarlib-display.html ant/core/trunk/docs/manual/Tasks/jarlib-manifest.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/jarlib-manifest.html ant/core/trunk/docs/manual/Tasks/jarlib-resolve.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/jarlib-resolve.html ant/core/trunk/docs/manual/Tasks/javacc.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/javacc.html ant/core/trunk/docs/manual/Tasks/javah.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/javah.html ant/core/trunk/docs/manual/Tasks/jdepend.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/jdepend.html ant/core/trunk/docs/manual/Tasks/jjdoc.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/jjdoc.html ant/core/trunk/docs/manual/Tasks/jjtree.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/jjtree.html ant/core/trunk/docs/manual/Tasks/jlink.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/jlink.html ant/core/trunk/docs/manual/Tasks/jspc.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/jspc.html ant/core/trunk/docs/manual/Tasks/junit.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/junit.html ant/core/trunk/docs/manual/Tasks/junitreport.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/junitreport.html ant/core/trunk/docs/manual/Tasks/mimemail.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/mimemail.html ant/core/trunk/docs/manual/Tasks/native2ascii.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/native2ascii.html ant/core/trunk/docs/manual/Tasks/netrexxc.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/netrexxc.html ant/core/trunk/docs/manual/Tasks/perforce.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/perforce.html ant/core/trunk/docs/manual/Tasks/propertyfile.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/propertyfile.html ant/core/trunk/docs/manual/Tasks/pvcstask.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/pvcstask.html ant/core/trunk/docs/manual/Tasks/renameextensions.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/renameextensions.html ant/core/trunk/docs/manual/Tasks/replaceregexp.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/replaceregexp.html ant/core/trunk/docs/manual/Tasks/rexec.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/rexec.html ant/core/trunk/docs/manual/Tasks/rpm.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/rpm.html ant/core/trunk/docs/manual/Tasks/schemavalidate.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/schemavalidate.html ant/core/trunk/docs/manual/Tasks/scp.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/scp.html ant/core/trunk/docs/manual/Tasks/script.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/script.html ant/core/trunk/docs/manual/Tasks/scriptdef.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/scriptdef.html ant/core/trunk/docs/manual/Tasks/serverdeploy.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/serverdeploy.html ant/core/trunk/docs/manual/Tasks/setproxy.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/setproxy.html ant/core/trunk/docs/manual/Tasks/sos.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/sos.html ant/core/trunk/docs/manual/Tasks/sound.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/sound.html ant/core/trunk/docs/manual/Tasks/splash.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/splash.html ant/core/trunk/docs/manual/Tasks/sshexec.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/sshexec.html ant/core/trunk/docs/manual/Tasks/sshsession.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/sshsession.html ant/core/trunk/docs/manual/Tasks/starteam.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/starteam.html ant/core/trunk/docs/manual/Tasks/symlink.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/symlink.html ant/core/trunk/docs/manual/Tasks/telnet.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/telnet.html ant/core/trunk/docs/manual/Tasks/translate.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/translate.html ant/core/trunk/docs/manual/Tasks/vss.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/vss.html ant/core/trunk/docs/manual/Tasks/wljspc.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTasks/wljspc.html ant/core/trunk/docs/manual/Tasks/xmlvalidate.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTasks/xmlvalidate.html ant/core/trunk/docs/manual/Types/ - copied from r948529, ant/core/trunk/docs/manual/CoreTypes/ ant/core/trunk/docs/manual/Types/classfileset.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTypes/classfileset.html ant/core/trunk/docs/manual/Types/extension.html - copied unchanged from r948529, ant/core/trunk/docs/manual/OptionalTypes/extension.html ant/core/trunk/docs/manual/Types/extensionset.html - copied, changed from r948529, ant/core/trunk/docs/manual/OptionalTypes/extensionset.html ant/core/trunk/docs/manual/tasklist.html - copied, changed from r948529, ant/core/trunk/docs/manual/coretasklist.html Removed: ant/core/trunk/docs/manual/CoreTasks/ ant/core/trunk/docs/manual/CoreTypes/ ant/core/trunk/docs/manual/OptionalTasks/ ant/core/trunk/docs/manual/OptionalTypes/ ant/core/trunk/docs/manual/coretasklist.html ant/core/trunk/docs/manual/optionaltasklist.html Modified: ant/core/trunk/docs/ant_in_anger.html ant/core/trunk/docs/ant_task_guidelines.html ant/core/trunk/docs/manual/Tasks/ant.html ant/core/trunk/docs/manual/Tasks/antcall.html ant/core/trunk/docs/manual/Tasks/antstructure.html ant/core/trunk/docs/manual/Tasks/apply.html ant/core/trunk/docs/manual/Tasks/buildnumber.html ant/core/trunk/docs/manual/Tasks/checksum.html ant/core/trunk/docs/manual/Tasks/chmod.html ant/core/trunk/docs/manual/Tasks/componentdef.html ant/core/trunk/docs/manual/Tasks/concat.html ant/core/trunk/docs/manual/Tasks/conditions.html ant/core/trunk/docs/manual/Tasks/copy.html ant/core/trunk/docs/manual/Tasks/copydir.html ant/core/trunk/docs/manual/Tasks/delete.html ant/core/trunk/docs/manual/Tasks/dependset.html ant/core/trunk/docs/manual/Tasks/ear.html ant/core/trunk/docs/manual/Tasks/echo.html ant/core/trunk/docs/manual/Tasks/exec.html ant/core/trunk/docs/manual/Tasks/fixcrlf.html ant/core/trunk/docs/manual/Tasks/get.html ant/core/trunk/docs/manual/Tasks/import.html ant/core/trunk/docs/manual/Tasks/include.html ant/core/trunk/docs/manual/Tasks/jar.html ant/core/trunk/docs/manual/Tasks/java.html ant/core/trunk/docs/manual/Tasks/javac.html ant/core/trunk/docs/manual/Tasks/javadoc.html ant/core/trunk/docs/manual/Tasks/length.html ant/core/trunk/docs/manual/Tasks/loadfile.html ant/core/trunk/docs/manual/Tasks/loadproperties.html ant/core/trunk/docs/manual/Tasks/loadresource.html ant/core/trunk/docs/manual/Tasks/mail.html ant/core/trunk/docs/manual/Tasks/move.html ant/core/trunk/docs/manual/Tasks/pack.html ant/core/trunk/docs/manual/Tasks/pathconvert.html ant/core/trunk/docs/manual/Tasks/replace.html ant/core/trunk/docs/manual/Tasks/resourcecount.html ant/core/trunk/docs/manual/Tasks/rmic.html ant/core/trunk/docs/manual/Tasks/sql.html ant/core/trunk/docs/manual/Tasks/style.html ant/core/trunk/docs/manual/Tasks/subant.html ant/core/trunk/docs/manual/Tasks/sync.html ant/core/trunk/docs/manual/Tasks/tar.html ant/core/trunk/docs/manual/Tasks/touch.html ant/core/trunk/docs/manual/Tasks/truncate.html ant/core/trunk/docs/manual/Tasks/typedef.html ant/core/trunk/docs/manual/Tasks/unpack.html ant/core/trunk/docs/manual/Tasks/unzip.html ant/core/trunk/docs/manual/Tasks/uptodate.html ant/core/trunk/docs/manual/Tasks/war.html ant/core/trunk/docs/manual/Tasks/xmlproperty.html ant/core/trunk/docs/manual/Tasks/zip.html ant/core/trunk/docs/manual/Types/antlib.html ant/core/trunk/docs/manual/Types/assertions.html ant/core/trunk/docs/manual/Types/filterchain.html ant/core/trunk/docs/manual/Types/mapper.html ant/core/trunk/docs/manual/Types/redirector.html ant/core/trunk/docs/manual/Types/regexp.html ant/core/trunk/docs/manual/Types/resources.html ant/core/trunk/docs/manual/Types/selectors.html ant/core/trunk/docs/manual/Types/tarfileset.html ant/core/trunk/docs/manual/Types/zipfileset.html ant/core/trunk/docs/manual/anttaskslist.html ant/core/trunk/docs/manual/clonevm.html ant/core/trunk/docs/manual/conceptstypeslist.html ant/core/trunk/docs/manual/develop.html ant/core/trunk/docs/manual/dirtasks.html ant/core/trunk/docs/manual/install.html ant/core/trunk/docs/manual/properties.html ant/core/trunk/docs/manual/proxy.html ant/core/trunk/docs/manual/running.html ant/core/trunk/docs/manual/targets.html ant/core/trunk/docs/manual/tasksoverview.html ant/core/trunk/docs/manual/tutorial-HelloWorldWithAnt.html ant/core/trunk/docs/manual/tutorial-tasks-filesets-properties.html ant/core/trunk/docs/manual/tutorial-writing-tasks.html ant/core/trunk/docs/manual/using.html ant/core/trunk/xdocs/antlibs/svn/index.xml ant/core/trunk/xdocs/faq.xml ant/core/trunk/xdocs/resources.xml Modified: ant/core/trunk/docs/ant_in_anger.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/ant_in_anger.html?rev=948574&r1=948573&r2=948574&view=diff ============================================================================== --- ant/core/trunk/docs/ant_in_anger.html (original) +++ ant/core/trunk/docs/ant_in_anger.html Wed May 26 20:33:51 2010 @@ -122,7 +122,7 @@ And of course, the ubiquitous cleanant +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, e 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 An 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 o 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 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 call 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 s 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 r

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 t

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. Modified: ant/core/trunk/docs/ant_task_guidelines.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/ant_task_guidelines.html?rev=948574&r1=948573&r2=948574&view=diff ============================================================================== --- ant/core/trunk/docs/ant_task_guidelines.html (original) +++ ant/core/trunk/docs/ant_task_guidelines.html Wed May 26 20:33:51 2010 @@ -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, Modified: ant/core/trunk/docs/manual/Tasks/ant.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/ant.html?rev=948574&r1=948529&r2=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/Tasks/ant.html (original) +++ ant/core/trunk/docs/manual/Tasks/ant.html Wed May 26 20:33:51 2010 @@ -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.

    Modified: ant/core/trunk/docs/manual/Tasks/antcall.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/antcall.html?rev=948574&r1=948529&r2=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/Tasks/antcall.html (original) +++ ant/core/trunk/docs/manual/Tasks/antcall.html Wed May 26 20:33:51 2010 @@ -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.

    Modified: ant/core/trunk/docs/manual/Tasks/antstructure.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/antstructure.html?rev=948574&r1=948529&r2=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/Tasks/antstructure.html (original) +++ ant/core/trunk/docs/manual/Tasks/antstructure.html Wed May 26 20:33:51 2010 @@ -35,7 +35,7 @@ usage of XML cannot be captured with a D 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 Modified: ant/core/trunk/docs/manual/Tasks/apply.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/apply.html?rev=948574&r1=948529&r2=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/Tasks/apply.html (original) +++ ant/core/trunk/docs/manual/Tasks/apply.html Wed May 26 20:33:51 2010 @@ -33,16 +33,16 @@ the command is only executed when Ant is 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 ta 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& 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, Copied: ant/core/trunk/docs/manual/Tasks/attrib.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/attrib.html) URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/attrib.html?p2=ant/core/trunk/docs/manual/Tasks/attrib.html&p1=ant/core/trunk/docs/manual/OptionalTasks/attrib.html&r1=948529&r2=948574&rev=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/OptionalTasks/attrib.html (original) +++ ant/core/trunk/docs/manual/Tasks/attrib.html Wed May 26 20:33:51 2010 @@ -33,14 +33,14 @@ directories. Right now it has effect on 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 exper osfamily OS family as used in - the <os> + the <os> condition. No - defaults to "windows" Modified: ant/core/trunk/docs/manual/Tasks/buildnumber.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/buildnumber.html?rev=948574&r1=948529&r2=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/Tasks/buildnumber.html (original) +++ ant/core/trunk/docs/manual/Tasks/buildnumber.html Wed May 26 20:33:51 2010 @@ -33,7 +33,7 @@ set the property build.number0, 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.)

    Copied: ant/core/trunk/docs/manual/Tasks/cab.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/cab.html) URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/cab.html?p2=ant/core/trunk/docs/manual/Tasks/cab.html&p1=ant/core/trunk/docs/manual/OptionalTasks/cab.html&r1=948529&r2=948574&rev=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/OptionalTasks/cab.html (original) +++ ant/core/trunk/docs/manual/Tasks/cab.html Wed May 26 20:33:51 2010 @@ -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/c

    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 <fi

    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.

    Modified: ant/core/trunk/docs/manual/Tasks/checksum.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/checksum.html?rev=948574&r1=948529&r2=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/Tasks/checksum.html (original) +++ ant/core/trunk/docs/manual/Tasks/checksum.html Wed May 26 20:33:51 2010 @@ -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.

    Copied: ant/core/trunk/docs/manual/Tasks/chgrp.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/chgrp.html) URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/chgrp.html?p2=ant/core/trunk/docs/manual/Tasks/chgrp.html&p1=ant/core/trunk/docs/manual/OptionalTasks/chgrp.html&r1=948529&r2=948574&rev=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/OptionalTasks/chgrp.html (original) +++ ant/core/trunk/docs/manual/Tasks/chgrp.html Wed May 26 20:33:51 2010 @@ -33,14 +33,14 @@ directories. Right now it has effect onl 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 exp osfamily OS family as used in - the <os> + the <os> condition. No - defaults to "unix" Modified: ant/core/trunk/docs/manual/Tasks/chmod.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/chmod.html?rev=948574&r1=948529&r2=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/Tasks/chmod.html (original) +++ ant/core/trunk/docs/manual/Tasks/chmod.html Wed May 26 20:33:51 2010 @@ -34,16 +34,16 @@ tasks, on how the inclusion/exclusio 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 Copied: ant/core/trunk/docs/manual/Tasks/chown.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/chown.html) URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/chown.html?p2=ant/core/trunk/docs/manual/Tasks/chown.html&p1=ant/core/trunk/docs/manual/OptionalTasks/chown.html&r1=948529&r2=948574&rev=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/OptionalTasks/chown.html (original) +++ ant/core/trunk/docs/manual/Tasks/chown.html Wed May 26 20:33:51 2010 @@ -33,14 +33,14 @@ directories. Right now it has effect onl 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 exp osfamily OS family as used in - the <os> + the <os> condition. No - defaults to "unix" Modified: ant/core/trunk/docs/manual/Tasks/componentdef.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/componentdef.html?rev=948574&r1=948529&r2=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/Tasks/componentdef.html (original) +++ ant/core/trunk/docs/manual/Tasks/componentdef.html Wed May 26 20:33:51 2010 @@ -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).

    Modified: ant/core/trunk/docs/manual/Tasks/concat.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/concat.html?rev=948574&r1=948529&r2=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/Tasks/concat.html (original) +++ ant/core/trunk/docs/manual/Tasks/concat.html Wed May 26 20:33:51 2010 @@ -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.

    Modified: ant/core/trunk/docs/manual/Tasks/conditions.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/conditions.html?rev=948574&r1=948529&r2=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/Tasks/conditions.html (original) +++ ant/core/trunk/docs/manual/Tasks/conditions.html Wed May 26 20:33:51 2010 @@ -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 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 dependenci 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 dependenci
    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 rea

    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 byt 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.

    Modified: ant/core/trunk/docs/manual/Tasks/copy.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/copy.html?rev=948574&r1=948529&r2=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/Tasks/copy.html (original) +++ ant/core/trunk/docs/manual/Tasks/copy.html Wed May 26 20:33:51 2010 @@ -31,11 +31,11 @@ only copied if the source file is newer 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. 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 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 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 absolu 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.

    Modified: ant/core/trunk/docs/manual/Tasks/copydir.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/copydir.html?rev=948574&r1=948529&r2=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/Tasks/copydir.html (original) +++ ant/core/trunk/docs/manual/Tasks/copydir.html Wed May 26 20:33:51 2010 @@ -38,7 +38,7 @@ finally with the defaultexcludes 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 Modified: ant/core/trunk/docs/manual/Tasks/delete.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/delete.html?rev=948574&r1=948529&r2=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/Tasks/delete.html (original) +++ ant/core/trunk/docs/manual/Tasks/delete.html Wed May 26 20:33:51 2010 @@ -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 Copied: ant/core/trunk/docs/manual/Tasks/depend.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/depend.html) URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/depend.html?p2=ant/core/trunk/docs/manual/Tasks/depend.html&p1=ant/core/trunk/docs/manual/OptionalTasks/depend.html&r1=948529&r2=948574&rev=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/OptionalTasks/depend.html (original) +++ ant/core/trunk/docs/manual/Tasks/depend.html Wed May 26 20:33:51 2010 @@ -179,7 +179,7 @@ via a nested <classpath>Additionally, this task forms an implicit -FileSet +FileSet and supports most attributes of <fileset> (dir becomes srcdir), as well as the nested <include>, Modified: ant/core/trunk/docs/manual/Tasks/dependset.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/dependset.html?rev=948574&r1=948529&r2=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/Tasks/dependset.html (original) +++ ant/core/trunk/docs/manual/Tasks/dependset.html Wed May 26 20:33:51 2010 @@ -37,7 +37,7 @@ any of the target files, all of the targ

    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 th

    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 ne

    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 <srcfilese

    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. <

    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> 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. Modified: ant/core/trunk/docs/manual/Tasks/ear.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/ear.html?rev=948574&r1=948529&r2=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/Tasks/ear.html (original) +++ ant/core/trunk/docs/manual/Tasks/ear.html Wed May 26 20:33:51 2010 @@ -270,7 +270,7 @@ to a value other than its default, 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.

    Modified: ant/core/trunk/docs/manual/Tasks/echo.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/echo.html?rev=948574&r1=948529&r2=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/Tasks/echo.html (original) +++ ant/core/trunk/docs/manual/Tasks/echo.html Wed May 26 20:33:51 2010 @@ -55,7 +55,7 @@ ignored

    output - the Resource + the Resource to write the message to (see note). Since Ant 1.8 Copied: ant/core/trunk/docs/manual/Tasks/echoproperties.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/echoproperties.html) URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/echoproperties.html?p2=ant/core/trunk/docs/manual/Tasks/echoproperties.html&p1=ant/core/trunk/docs/manual/OptionalTasks/echoproperties.html&r1=948529&r2=948574&rev=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/OptionalTasks/echoproperties.html (original) +++ ant/core/trunk/docs/manual/Tasks/echoproperties.html Wed May 26 20:33:51 2010 @@ -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. Copied: ant/core/trunk/docs/manual/Tasks/ejb.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/ejb.html) URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/ejb.html?p2=ant/core/trunk/docs/manual/Tasks/ejb.html&p1=ant/core/trunk/docs/manual/OptionalTasks/ejb.html&r1=948529&r2=948574&rev=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/OptionalTasks/ejb.html (original) +++ ant/core/trunk/docs/manual/Tasks/ejb.html Wed May 26 20:33:51 2010 @@ -863,7 +863,7 @@ requiring the vendor classes in the clas

    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 Modified: ant/core/trunk/docs/manual/Tasks/exec.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/exec.html?rev=948574&r1=948529&r2=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/Tasks/exec.html (original) +++ ant/core/trunk/docs/manual/Tasks/exec.html Wed May 26 20:33:51 2010 @@ -364,13 +364,13 @@ system command via nested <env&

    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 Modified: ant/core/trunk/docs/manual/Tasks/fixcrlf.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/fixcrlf.html?rev=948574&r1=948529&r2=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/Tasks/fixcrlf.html (original) +++ ant/core/trunk/docs/manual/Tasks/fixcrlf.html Wed May 26 20:33:51 2010 @@ -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

    Copied: ant/core/trunk/docs/manual/Tasks/ftp.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/ftp.html) URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/ftp.html?p2=ant/core/trunk/docs/manual/Tasks/ftp.html&p1=ant/core/trunk/docs/manual/OptionalTasks/ftp.html&r1=948529&r2=948574&rev=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/OptionalTasks/ftp.html (original) +++ ant/core/trunk/docs/manual/Tasks/ftp.html Wed May 26 20:33:51 2010 @@ -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 Modified: ant/core/trunk/docs/manual/Tasks/get.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/get.html?rev=948574&r1=948529&r2=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/Tasks/get.html (original) +++ ant/core/trunk/docs/manual/Tasks/get.html Wed May 26 20:33:51 2010 @@ -43,7 +43,7 @@ plain text' authentication is used. This 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

    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

    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.

    Copied: ant/core/trunk/docs/manual/Tasks/image.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/image.html) URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/image.html?p2=ant/core/trunk/docs/manual/Tasks/image.html&p1=ant/core/trunk/docs/manual/OptionalTasks/image.html&r1=948529&r2=948574&rev=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/OptionalTasks/image.html (original) +++ ant/core/trunk/docs/manual/Tasks/image.html Wed May 26 20:33:51 2010 @@ -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 Modified: ant/core/trunk/docs/manual/Tasks/import.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/import.html?rev=948574&r1=948529&r2=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/Tasks/import.html (original) +++ ant/core/trunk/docs/manual/Tasks/import.html Wed May 26 20:33:51 2010 @@ -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 Modified: ant/core/trunk/docs/manual/Tasks/include.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/include.html?rev=948574&r1=948529&r2=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/Tasks/include.html (original) +++ ant/core/trunk/docs/manual/Tasks/include.html Wed May 26 20:33:51 2010 @@ -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.

    Modified: ant/core/trunk/docs/manual/Tasks/jar.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/jar.html?rev=948574&r1=948529&r2=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/Tasks/jar.html (original) +++ ant/core/trunk/docs/manual/Tasks/jar.html Wed May 26 20:33:51 2010 @@ -38,7 +38,7 @@ finally with the defaultexcludes 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, 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.

    Copied: ant/core/trunk/docs/manual/Tasks/jarlib-available.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/jarlib-available.html) URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/jarlib-available.html?p2=ant/core/trunk/docs/manual/Tasks/jarlib-available.html&p1=ant/core/trunk/docs/manual/OptionalTasks/jarlib-available.html&r1=948529&r2=948574&rev=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/OptionalTasks/jarlib-available.html (original) +++ ant/core/trunk/docs/manual/Tasks/jarlib-available.html Wed May 26 20:33:51 2010 @@ -61,15 +61,15 @@ http://java.sun.com/j2se/1.3/docs/guide/

    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

    Copied: ant/core/trunk/docs/manual/Tasks/jarlib-display.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/jarlib-display.html) URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/jarlib-display.html?p2=ant/core/trunk/docs/manual/Tasks/jarlib-display.html&p1=ant/core/trunk/docs/manual/OptionalTasks/jarlib-display.html&r1=948529&r2=948574&rev=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/OptionalTasks/jarlib-display.html (original) +++ ant/core/trunk/docs/manual/Tasks/jarlib-display.html Wed May 26 20:33:51 2010 @@ -56,7 +56,7 @@ http://java.sun.com/j2se/1.3/docs/guide/

    Parameters specified as nested elements

    fileset

    -

    FileSets contain list of files to +

    FileSets contain list of files to display Extension information about.

    Examples

    Copied: ant/core/trunk/docs/manual/Tasks/jarlib-manifest.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/jarlib-manifest.html) URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/jarlib-manifest.html?p2=ant/core/trunk/docs/manual/Tasks/jarlib-manifest.html&p1=ant/core/trunk/docs/manual/OptionalTasks/jarlib-manifest.html&r1=948529&r2=948574&rev=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/OptionalTasks/jarlib-manifest.html (original) +++ ant/core/trunk/docs/manual/Tasks/jarlib-manifest.html Wed May 26 20:33:51 2010 @@ -57,15 +57,15 @@ http://java.sun.com/j2se/1.3/docs/guide/

    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)

    Copied: ant/core/trunk/docs/manual/Tasks/jarlib-resolve.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/jarlib-resolve.html) URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/jarlib-resolve.html?p2=ant/core/trunk/docs/manual/Tasks/jarlib-resolve.html&p1=ant/core/trunk/docs/manual/OptionalTasks/jarlib-resolve.html&r1=948529&r2=948574&rev=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/OptionalTasks/jarlib-resolve.html (original) +++ ant/core/trunk/docs/manual/Tasks/jarlib-resolve.html Wed May 26 20:33:51 2010 @@ -71,7 +71,7 @@ http://java.sun.com/j2se/1.3/docs/guide/

    Parameters specified as nested elements

    extension

    -

    Extension the extension +

    Extension the extension to resolve. Must be present

    location

    Modified: ant/core/trunk/docs/manual/Tasks/java.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/java.html?rev=948574&r1=948529&r2=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/Tasks/java.html (original) +++ ant/core/trunk/docs/manual/Tasks/java.html Wed May 26 20:33:51 2010 @@ -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 ex

    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. Modified: ant/core/trunk/docs/manual/Tasks/javac.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/javac.html?rev=948574&r1=948529&r2=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/Tasks/javac.html (original) +++ ant/core/trunk/docs/manual/Tasks/javac.html Wed May 26 20:33:51 2010 @@ -36,7 +36,7 @@ or where the class file is older than th 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 Modified: ant/core/trunk/docs/manual/Tasks/javadoc.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/javadoc.html?rev=948574&r1=948529&r2=948574&view=diff ============================================================================== --- ant/core/trunk/docs/manual/Tasks/javadoc.html (original) +++ ant/core/trunk/docs/manual/Tasks/javadoc.html Wed May 26 20:33:51 2010 @@ -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>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>

    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 th 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

Copied: ant/core/trunk/docs/manual/Tasks/jlink.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/jlink.html)
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/jlink.html?p2=ant/core/trunk/docs/manual/Tasks/jlink.html&p1=ant/core/trunk/docs/manual/OptionalTasks/jlink.html&r1=948529&r2=948574&rev=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/OptionalTasks/jlink.html (original)
+++ ant/core/trunk/docs/manual/Tasks/jlink.html Wed May 26 20:33:51 2010
@@ -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:
    

Copied: ant/core/trunk/docs/manual/Tasks/junit.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/junit.html)
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/junit.html?p2=ant/core/trunk/docs/manual/Tasks/junit.html&p1=ant/core/trunk/docs/manual/OptionalTasks/junit.html&r1=948529&r2=948574&rev=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/OptionalTasks/junit.html (original)
+++ ant/core/trunk/docs/manual/Tasks/junit.html Wed May 26 20:33:51 2010
@@ -292,7 +292,7 @@ href="../using.html#arg">Command-line Ar
 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 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 <assertions>
+<assertions>
 subelement.
    
  
 
    Assertion statements are currently ignored in non-forked mode.
    
@@ -501,9 +501,9 @@ the name of the resulting class (without
 
 
    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.
    
 

Copied: ant/core/trunk/docs/manual/Tasks/junitreport.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/junitreport.html)
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/junitreport.html?p2=ant/core/trunk/docs/manual/Tasks/junitreport.html&p1=ant/core/trunk/docs/manual/OptionalTasks/junitreport.html&r1=948529&r2=948574&rev=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/OptionalTasks/junitreport.html (original)
+++ ant/core/trunk/docs/manual/Tasks/junitreport.html Wed May 26 20:33:51 2010
@@ -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.
    

Modified: ant/core/trunk/docs/manual/Tasks/length.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/length.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/length.html (original)
+++ ant/core/trunk/docs/manual/Tasks/length.html Wed May 26 20:33:51 2010
@@ -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
    
 

Modified: ant/core/trunk/docs/manual/Tasks/loadfile.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/loadfile.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/loadfile.html (original)
+++ ant/core/trunk/docs/manual/Tasks/loadfile.html Wed May 26 20:33:51 2010
@@ -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
       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>