diff --git a/manual/Tasks/ejb.html b/manual/Tasks/ejb.html index c72abe1a7..303cb01d5 100644 --- a/manual/Tasks/ejb.html +++ b/manual/Tasks/ejb.html @@ -534,7 +534,7 @@ to extract all dependent classes. This means that, in addition to the classes th the deployment descriptor, any classes that these depend on are also automatically included in the jar file.

-

Naming Convention

+

Naming convention

Ejbjar handles the processing of multiple beans, and it uses a set of naming conventions to determine the name of the generated EJB jars. The naming convention that is used is @@ -716,7 +716,7 @@ not, ejbjar will drop back to the behaviour corresponding to the va

In addition to the vendor specific nested elements, the ejbjar task provides three nested elements.

-

Classpath

+

classpath

The <classpath> nested element allows the classpath to be set. It is useful when setting the classpath from a reference path. In all other respects the behaviour is the same as diff --git a/manual/Tasks/ftp.html b/manual/Tasks/ftp.html index c48e3d07a..0ded19d2f 100644 --- a/manual/Tasks/ftp.html +++ b/manual/Tasks/ftp.html @@ -393,7 +393,7 @@ files to be retrieved, or deleted, or listed, or whose mode you want to change.< to false. On remote filesets hidden files are not checked for being symbolic links. Hidden files are currently assumed to not be symbolic links.

-

Sending Files

+

Sending files

The easiest way to describe how to send files is with a couple of examples:

 <ftp server="ftp.apache.org"
@@ -465,7 +465,7 @@ the /pub/incoming directory. The files are transferred in text mode
 password java1 and uploads all HTML files in the htdocs/manual directory
 to the c:\uploads directory.  Progress messages are displayed as each file is
 uploaded.

-

Getting Files

+

Getting files

Getting files from an FTP server works pretty much the same way as sending them does. The only difference is that the nested filesets use the remotedir attribute as the base directory for the files on the FTP server, and the dir attribute as the local directory to put the @@ -514,7 +514,7 @@ names in Standard European format, as anonymous, and recursively do all .html files from default directory for that user into the htdocs/manual directory on the local machine.

-

Deleting Files

+

Deleting files

As you've probably guessed by now, you use nested fileset elements to select the files to delete from the remote FTP server. Again, the filesets are relative to the remote directory, not a local directory. In fact, the dir attribute of the fileset is ignored completely.

@@ -546,7 +546,7 @@ to delete a file, a BuildException is thrown.

relative to the default directory of the anonymous user. The listing is in whatever format the FTP server normally lists files.

-

Creating Directories

+

Creating directories

Note that with the mkdir action, the directory to create is specified using the remotedir attribute.

@@ -558,7 +558,7 @@ the remotedir attribute.

This creates the directory some/remote/dir beneath the default root directory. As with all other actions, the directory separator character must be correct according to the desires of the FTP server.

-

Removing Directories

+

Removing directories

This action uses nested fileset elements to select the directories to remove from the remote FTP server. The filesets are relative to the remote directory, not a local directory. The dir attribute of the fileset is ignored completely. The directories to be removed diff --git a/manual/Tasks/image.html b/manual/Tasks/image.html index 6d8d4f0d8..519906496 100644 --- a/manual/Tasks/image.html +++ b/manual/Tasks/image.html @@ -117,7 +117,7 @@ and <patternset> elements.

ImageOperation

Adds an ImageOperation to chain.

-
Nested Elements
+
Nested elements

ImageOperation can handle nested Rotate, Draw, Rectangle, Text and Scale objects.

diff --git a/manual/Tasks/import.html b/manual/Tasks/import.html index 0a75d878c..c01b1bddb 100644 --- a/manual/Tasks/import.html +++ b/manual/Tasks/import.html @@ -65,7 +65,7 @@ overridden target's name instead of the name attribute of the project tag.

-

Special Properties

+

Special properties

Imported files are treated as they are present in the main buildfile. This makes it easy to understand, but it makes it impossible for them to reference files and resources relative to diff --git a/manual/Tasks/include.html b/manual/Tasks/include.html index e09391c75..100ce18be 100644 --- a/manual/Tasks/include.html +++ b/manual/Tasks/include.html @@ -62,7 +62,7 @@

<import> contribute to the prefix as well, but only if their as attribute has been specified. -

Special Properties

+

Special properties

Included files are treated as they are present in the main buildfile. This makes it easy to understand, but it makes it impossible for them to reference files and resources relative to diff --git a/manual/Tasks/javac.html b/manual/Tasks/javac.html index da3f8b844..7a8764256 100644 --- a/manual/Tasks/javac.html +++ b/manual/Tasks/javac.html @@ -668,7 +668,7 @@ compilation module set. The { ... , ... } express alternates for e compilation uses application modules located in modules folder.The source level is 9 to enable modules.

-

Jikes Notes

+

Jikes notes

You need Jikes 1.15 or later.

@@ -710,13 +710,13 @@ are false.

-

Jvc Notes

+

Jvc notes

Jvc will enable Microsoft extensions unless you set the property build.compiler.jvc.extensions to false before invoking <javac>.

-

Bootstrap Options

+

Bootstrap options

The Sun javac compiler has a bootclasspath command line option—this corresponds to the bootclasspath attribute/element of the <javac> task. The Sun compiler also allows more control over the boot @@ -733,7 +733,7 @@ references to strings that can by used in an OS independent fashion <compilerarg arg="-Xbootclasspath/p:${toString:lib.path.ref}"/> </javac>

-

OpenJDK Notes

+

OpenJDK notes

The openjdk project has provided the javac compiler as an open source project. The output of this project is a javac.jar which contains diff --git a/manual/Tasks/jjtree.html b/manual/Tasks/jjtree.html index 0c6fc93f0..9e691deef 100644 --- a/manual/Tasks/jjtree.html +++ b/manual/Tasks/jjtree.html @@ -160,7 +160,7 @@ file as the JJTree grammar file with a suffix .jj.

file, Parser.jj, file to build/src. The grammar option NODE_USES_PARSER is set to true when invoking JJTree.

-

Comparison output locations between command line JJTree and different Ant taskdef +

Comparison of output locations between command line JJTree and different Ant taskdef versions

diff --git a/manual/Tasks/junitreport.html b/manual/Tasks/junitreport.html index e4e0a3faf..6f4b79e66 100644 --- a/manual/Tasks/junitreport.html +++ b/manual/Tasks/junitreport.html @@ -119,7 +119,7 @@ using the nested <FileSet>Custom versions of junit-frames.xsl or junit-noframes.xsl must adhere to the above conventions.

-

Nested Element of the report tag

+

Nested element of the report tag

param

Since Ant 1.7, the report tag supports nested param tags. These tags can pass XSL parameters to the stylesheet.

@@ -189,15 +189,15 @@ nested <factory> can be used to specify factory settings.

would generate a TESTS-TestSuites.xml file in the directory reports and generate the default framed report in the directory report/html.

-

Example of report with xsl params

+

Example of report with XSL params

 <junitreport todir="${outputdir}">
     <fileset dir="${jrdir}">
         <include name="TEST-*.xml"/>
     </fileset>
     <report todir="${outputdir}/html"
-        styledir="junitreport"
-        format="frames">
+            styledir="junitreport"
+            format="frames">
         <param name="key1" expression="value1"/>
         <param name="key2" expression="value2"/>
     </report>
diff --git a/manual/Tasks/macrodef.html b/manual/Tasks/macrodef.html
index 6c83bee94..bfdd851ae 100644
--- a/manual/Tasks/macrodef.html
+++ b/manual/Tasks/macrodef.html
@@ -82,7 +82,7 @@
       properties.

The case of the attribute is ignored, so @{myAttribute} is treated the same as @{MyAttribute}.

-

Parameters

+
Parameters
@@ -117,7 +117,7 @@

This is used to specify nested elements of the new task. The contents of the nested elements of the task instance are placed in the templated task at the tag name.

The case of the element name is ignored.

-

Parameters

+
Parameters
Attribute
@@ -155,7 +155,7 @@ the text element is present, then the name becomes an attribute that gets set to the nested text of the macro invocation. Since Ant 1.6.1.

The case of the text name is ignored.

-

Parameters

+
Parameters
Attribute
diff --git a/manual/Tasks/property.html b/manual/Tasks/property.html index cedc323af..6a74890f5 100644 --- a/manual/Tasks/property.html +++ b/manual/Tasks/property.html @@ -236,7 +236,7 @@ personal settings with a file per user.

<property name="foo" location="my/file.txt" relative="true" basedir="cvs"/>

Stores the relative path in foo: cvs/my/file.txt

-

Property Files

+

Property files

As stated, this task will load in a properties file stored in the file system, or as a resource on a classpath. Here are some interesting facts about this feature

diff --git a/manual/Tasks/pvcstask.html b/manual/Tasks/pvcstask.html index 2d3dabe7e..84db7d063 100644 --- a/manual/Tasks/pvcstask.html +++ b/manual/Tasks/pvcstask.html @@ -166,7 +166,7 @@ project within the PVCS repository to extract files from. By nesting multiple <pvcsproject> elements under the <pvcs> task, multiple projects can be specified.

-

Parameters

+
Parameters
Attribute
diff --git a/manual/Tasks/replace.html b/manual/Tasks/replace.html index 3e2d011e6..ec789cb2f 100644 --- a/manual/Tasks/replace.html +++ b/manual/Tasks/replace.html @@ -138,7 +138,7 @@ based resource collections as n

If either the text you want to replace or the replacement text cross line boundaries, you can use nested elements to specify them.

The elements support attributes:

-
+
diff --git a/manual/Tasks/rmic.html b/manual/Tasks/rmic.html index 35c6302de..151653800 100644 --- a/manual/Tasks/rmic.html +++ b/manual/Tasks/rmic.html @@ -72,11 +72,10 @@ documentation to learn how to use it.

CORBA support

-

Java 11 removes the CORBA and JavaEE packages and rmic no longer - supports either iiop nor idl. Starting - with Ant 1.10.3 the rmic task will fail when using either while - running Java11+ unless you fork the task and explicitly specify an - executable.

+

Java 11 removes the CORBA and JavaEE packages and rmic no longer supports +either iiop nor idl. Starting with Ant 1.10.3, the rmic task +will fail when using either while running Java 11+ unless you fork the task and explicitly specify an +executable.

Parameters

Attribute Description
@@ -163,8 +162,8 @@ documentation to learn how to use it.

- + @@ -174,8 +173,8 @@ documentation to learn how to use it.

- + diff --git a/manual/Tasks/scriptdef.html b/manual/Tasks/scriptdef.html index e214a073b..0029ee960 100644 --- a/manual/Tasks/scriptdef.html +++ b/manual/Tasks/scriptdef.html @@ -280,7 +280,7 @@ beanshell jar.

<b1 a="this is an 'a'"/> <b2 a2="this is an 'a2' for b2"/> -

Testing Scripts

+

Testing scripts

The easiest way to test scripts is to use the AntUnit Ant library. This will run all diff --git a/manual/Tasks/serverdeploy.html b/manual/Tasks/serverdeploy.html index 6db2a6459..6aa28ca1e 100644 --- a/manual/Tasks/serverdeploy.html +++ b/manual/Tasks/serverdeploy.html @@ -91,6 +91,8 @@ classpath.

Vendor-specific nested elements

+

Also supported are nested vendor-specific elements.

+

Parameters used for all tools

iiopindicates that portable (RMI/IIOP) stubs should be - generated.
See the note on CORBA support above.
indicates that portable (RMI/IIOP) stubs should be generated.
See the note on CORBA + support above.
No
idlindicates that IDL output files should be generated.
See - the note on CORBA support above.
indicates that IDL output files should be generated.
See the note on CORBA support + above.
No
@@ -121,8 +123,6 @@ classpath.

-

Also supported are nested vendor-specific elements.

-

Generic element

This element is provided for generic Java-based deployment tools. The generic task accepts (but does not require) nested arg and jvmarg elements. A JVM will be spawned @@ -142,7 +142,7 @@ generic one if at all possible.

-

Nested Elements

+

Nested elements

The generic element supports nested <arg> and <jvmarg> elements.

@@ -269,7 +269,7 @@ tool.

-

Nested Elements

+

Nested elements

The jonas element supports nested <arg> and <jvmarg> elements.

diff --git a/manual/Tasks/sound.html b/manual/Tasks/sound.html index 402068074..9a441a261 100644 --- a/manual/Tasks/sound.html +++ b/manual/Tasks/sound.html @@ -41,10 +41,11 @@ executed.

Parameters specified as nested elements

success

Specifies the sound to be played if the build succeeded.

+

fail

Specifies the sound to be played if the build failed.

-

Nested element parameters

+

Nested element parameters

The following attributes may be used on the <success> and <fail> elements:

diff --git a/manual/Tasks/sync.html b/manual/Tasks/sync.html index 312409fc6..1de573c62 100644 --- a/manual/Tasks/sync.html +++ b/manual/Tasks/sync.html @@ -101,7 +101,7 @@ present in one of the source directories.

support the dir attribute and the usedefaultexcludes attribute defaults to false.

-
Additional Parameters
+
Additional parameters
diff --git a/manual/Tasks/xmlproperty.html b/manual/Tasks/xmlproperty.html index 40d2e5c8c..94fb688a4 100644 --- a/manual/Tasks/xmlproperty.html +++ b/manual/Tasks/xmlproperty.html @@ -38,7 +38,7 @@

By default, this load does no processing of the input. In particular, unlike the Property task, property references (i.e., ${foo}) are not resolved.

-

Semantic Attributes

+

Semantic attributes

Input processing can be enabled by using the semanticAttributes attribute. If this attribute is set to true (its default is false), the following processing occurs as the input XML file is loaded:/p> @@ -143,9 +143,9 @@ perform entity resolution.

Examples

-

Non-semantic Attributes

+

Non-semantic attributes

-

Here is an example xml file that does not have any semantic attributes.

+

Here is an example XML file that does not have any semantic attributes.

 <root-tag myattr="true">
@@ -163,7 +163,7 @@ root-tag.inner-tag=Text
 root-tag.inner-tag(someattr)=val
 root-tag.a2.a3.a4=false
-
collapseAttributes=false
+
collapseAttributes=false

This entry in a build file:

<xmlproperty file="somefile.xml" collapseAttributes="true"/>

is equivalent to the following properties:

@@ -173,7 +173,7 @@ root-tag.inner-tag=Text root-tag.inner-tag.someatt=val root-tag.a2.a3.a4=false -
keepRoot=false
+
keepRoot=false

This entry in a build file:

<xmlproperty file="somefile.xml" keepRoot="false"/>

is equivalent to the following properties:

@@ -182,9 +182,9 @@ inner-tag=Text inner-tag(someattr)=val a2.a3.a4=false -

Semantic Attributes

+

Semantic attributes

-

Here is an example xml file that has semantic attributes.

+

Here is an example XML file that has semantic attributes.

 <root-tag>
   <version value="0.0.1"/>
@@ -206,7 +206,7 @@ a2.a3.a4=false
</run-time> </root-tag> -
default loading (semanticAttributes=true)
+
default loading (semanticAttributes=true)

This entry in a build file:

 <xmlproperty file="somefile.xml" keepRoot="false"
@@ -229,7 +229,7 @@ a2.a3.a4=false
<pathelement path="${run-time.jars}"/> </path> -
includeSemanticAttribute="true"
+
includeSemanticAttribute=true

This entry in a build file:

 <xmlproperty file="somefile.xml"
diff --git a/manual/Tasks/zip.html b/manual/Tasks/zip.html
index 495837667..a3de99ffb 100644
--- a/manual/Tasks/zip.html
+++ b/manual/Tasks/zip.html
@@ -258,7 +258,7 @@ extract an Ant generated ZIP archive.

Attribute
-

Encoding of File Names

+

Encoding of file names

Traditionally the ZIP archive format uses CodePage 437 as encoding for file name, which is not sufficient for many international character sets.

@@ -300,7 +300,7 @@ filenames that cannot be encoded using the specified encoding.

name information from them, unless you set the optional attribute scanForUnicodeExtraFields to false.

-

Recommendations for Interoperability

+

Recommendations for interoperability

The optimal setting of flags depends on the archivers you expect as consumers/producers of the ZIP archives. Below are some test results which may be superseded with later versions of each diff --git a/manual/Types/classfileset.html b/manual/Types/classfileset.html index 5e592a47a..f394b2dcc 100644 --- a/manual/Types/classfileset.html +++ b/manual/Types/classfileset.html @@ -55,7 +55,7 @@ the standard fileset: -

Nested Elements

+

Nested elements

Root

diff --git a/manual/Types/custom-programming.html b/manual/Types/custom-programming.html index fd776d316..ba743c14c 100644 --- a/manual/Types/custom-programming.html +++ b/manual/Types/custom-programming.html @@ -41,7 +41,7 @@

The old methods of defining custom components are still supported.

-

Definition and use

+

Definition and Use

A custom component is a normal Java class that implements a particular interface or extends a particular class, or has been adapted to the diff --git a/manual/Types/extensionset.html b/manual/Types/extensionset.html index d32c2f7b6..ae14d0566 100644 --- a/manual/Types/extensionset.html +++ b/manual/Types/extensionset.html @@ -31,7 +31,7 @@ file guide/extensions/versioning.html or online at Package Versioning documentation.

-

Nested Elements

+

Nested elements

extension

Extension object to add to set.

@@ -40,7 +40,7 @@ Versioning documentation.

FileSets all files contained contained within set that are jars and implement an extension are added to extension set.

-

LibFileSet

+

libfileset

All files contained contained within set that are jars and implement an extension are added to extension set. However, the extension information may be modified by attributes of libfileset.

diff --git a/manual/Types/filelist.html b/manual/Types/filelist.html index 638b3828b..d77fd2d1a 100644 --- a/manual/Types/filelist.html +++ b/manual/Types/filelist.html @@ -50,10 +50,10 @@ support this feature or as stand-alone types.

Yes, unless there is a nested file element -

Nested Element: file

+

Nested element: file

+

Since Apache Ant 1.6.2

This represents a file name. The nested element allows filenames containing white space and commas.

-

Since Apache Ant 1.6.2

diff --git a/manual/Types/filterchain.html b/manual/Types/filterchain.html index 9238b93a5..b4327c2f6 100644 --- a/manual/Types/filterchain.html +++ b/manual/Types/filterchain.html @@ -136,7 +136,7 @@ implement org.apache.tools.type.Parameterizable.

Attribute
-

Nested Elements

+

Nested elements

<filterreader> supports <classpath> and <param> as nested elements. Each <param> element may take in the following attributes—name, type and value.

diff --git a/manual/Types/multirootfileset.html b/manual/Types/multirootfileset.html index 79006cb8b..ece02a64e 100644 --- a/manual/Types/multirootfileset.html +++ b/manual/Types/multirootfileset.html @@ -123,7 +123,7 @@ an <and> selector container.

In addition basedirs for the MultiRootFileSet can be specified as nested basedir elements that have a single file attribute.

-

Examples

+

Examples

 <multirootfileset basedirs="${build.dir},${other.project.dir}">
diff --git a/manual/Types/namespace.html b/manual/Types/namespace.html
index eb40b591e..d6711bef3 100644
--- a/manual/Types/namespace.html
+++ b/manual/Types/namespace.html
@@ -95,7 +95,7 @@
       element and all its descendants.
     

-

Default namespace

+

Default Namespace

The default namespace used by Ant is antlib:org.apache.tools.ant.

diff --git a/manual/Types/xmlcatalog.html b/manual/Types/xmlcatalog.html index c586a7816..c0c0e6319 100644 --- a/manual/Types/xmlcatalog.html +++ b/manual/Types/xmlcatalog.html @@ -89,7 +89,7 @@ and URI respectively. By contrast, external catalog files may use types defined in the OASIS specification.

-

Entity/DTD/URI Resolution Algorithm

+

Entity/DTD/URI resolution algorithm

When an entity, DTD, or URI is looked up by the XML processor, the XMLCatalog searches its list of entries to see if any match. That is, it attempts to match the publicId attribute of each entry with the PublicID or URI of the entity to be resolved. Assuming a diff --git a/manual/conceptstypeslist.html b/manual/conceptstypeslist.html index 342e51881..ae6ca1a85 100644 --- a/manual/conceptstypeslist.html +++ b/manual/conceptstypeslist.html @@ -53,7 +53,7 @@

  • FilterSet
  • MultiRootFileSet
  • PatternSet
  • -
  • PATH-like Structures
  • +
  • Path-like Structures
  • Permissions
  • PropertySet
  • I/O Redirectors
  • diff --git a/manual/dirtasks.html b/manual/dirtasks.html index d611c3715..739344659 100644 --- a/manual/dirtasks.html +++ b/manual/dirtasks.html @@ -198,7 +198,7 @@ selection criteria for the files the task should work with. See the Selector documentation for more information.

    -

    Standard Tasks/Filesets

    +

    Standard Tasks/FileSets

    Many of the standard tasks in ant take one or more filesets which follow the rules given here. This list, a subset of those, is a list of standard ant tasks that can act as an implicit fileset: