diff --git a/WHATSNEW b/WHATSNEW index 918de29a0..11f20da08 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -15,7 +15,7 @@ Fixed bugs: Bugzilla Reports 52738, 52740, 52742, 52743. * Updated documentation to fix spelling errors / broken links. - Bugzilla Reports 53215, + Bugzilla Reports 53215, 53291 (excluding api) Other changes: -------------- diff --git a/manual/Tasks/ccm.html b/manual/Tasks/ccm.html index 714a4eeb5..92c13fd87 100644 --- a/manual/Tasks/ccm.html +++ b/manual/Tasks/ccm.html @@ -35,7 +35,7 @@
These Apache Ant tasks are wrappers around Continuus Source Manager. They have been tested against versions 5.1/6.2 on Windows 2000, but should work on other platforms with ccm installed.
-author: Benoit Mousaud (benoit.moussaud@criltelecom.com)
+author: Benoit Moussaud (benoit.moussaud@criltelecom.com)
Important: This task needs "cvs
" on the path. If it isn't, you will get
an error (such as error 2
on windows). If <cvs>
doesn't work, try to execute cvs.exe
from the command line in the target directory in which you are working.
-Also note that this task assumes that the cvs exceutable is compatible
+Also note that this task assumes that the cvs executable is compatible
with the Unix version from cvshome.org, this is not completely true
for certain other cvs clients - like CVSNT for example - and some
operation may fail when using such an incompatible client.
diff --git a/manual/Tasks/clearcase.html b/manual/Tasks/clearcase.html
index e59a75a81..902d5efe0 100644
--- a/manual/Tasks/clearcase.html
+++ b/manual/Tasks/clearcase.html
@@ -872,7 +872,7 @@ Since ant 1.6.1
diff --git a/manual/Tasks/componentdef.html b/manual/Tasks/componentdef.html index 173c5bd0c..e28e68130 100644 --- a/manual/Tasks/componentdef.html +++ b/manual/Tasks/componentdef.html @@ -28,7 +28,7 @@<ccmkdir viewpath="c:/views/viewdir/adir" - nochcekout="true" + nocheckout="true" comment="Some comment text"/>
Adds a component definition to the current project. - A compenent definition is the same as a + A component definition is the same as a typedef except:
How the Reader class deals with these illegal sequences is up to the implementation - of the character decoder. The current Sun Java implemenation is to + of the character decoder. The current Sun Java implementation is to map them to legal characters. Previous Sun Java (1.3 and lower) threw - a MalformedInputException. IBM Java 1.4 also thows this exception. + a MalformedInputException. IBM Java 1.4 also throws this exception. It is the mapping of the characters that cause the corruption.
diff --git a/manual/Tasks/cvs.html b/manual/Tasks/cvs.html index deac33d8e..e941ed6d4 100644 --- a/manual/Tasks/cvs.html +++ b/manual/Tasks/cvs.html @@ -31,7 +31,7 @@
Important: This task needs "cvs
" on the path. If it isn't, you will get
an error (such as error 2
on windows). If <cvs>
doesn't work, try to execute cvs.exe
from the command line in the target directory in which you are working.
-Also note that this task assumes that the cvs exceutable is compatible
+Also note that this task assumes that the cvs executable is compatible
with the Unix version from cvshome.org, this is not completely true
for certain other cvs clients - like CVSNT for example - and some
operation may fail when using such an incompatible client.
diff --git a/manual/Tasks/cvstagdiff.html b/manual/Tasks/cvstagdiff.html
index e2dd3d3a2..5350d8efc 100644
--- a/manual/Tasks/cvstagdiff.html
+++ b/manual/Tasks/cvstagdiff.html
@@ -28,7 +28,7 @@
Important: This task needs "cvs
" on the path. If it isn't, you will get
an error (such as error 2
on windows). If <cvs>
doesn't work, try to execute cvs.exe
from the command line in the target directory in which you are working.
-Also note that this task assumes that the cvs exceutable is compatible
+Also note that this task assumes that the cvs executable is compatible
with the Unix version from cvshome.org, this is not completely true
for certain other cvs clients - like CVSNT for example - and some
operation may fail when using such an incompatible client.
diff --git a/manual/Tasks/depend.html b/manual/Tasks/depend.html
index 55017becf..682725532 100644
--- a/manual/Tasks/depend.html
+++ b/manual/Tasks/depend.html
@@ -36,7 +36,7 @@ respect to their source and then removing the class files of any other
classes which depend on the out-of-date classes.
To determine the class dependencies, the depend task analyses the class +
To determine the class dependencies, the depend task analyzes the class files of all class files passed to it. Depend does not parse your source code in any way but relies upon the class references encoded into the class files by the compiler. This is generally faster than parsing the Java source.
diff --git a/manual/Tasks/echoproperties.html b/manual/Tasks/echoproperties.html index 9511a2f9d..ec1e4b44e 100644 --- a/manual/Tasks/echoproperties.html +++ b/manual/Tasks/echoproperties.html @@ -92,7 +92,7 @@ files. 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. +shortcuts that use propertysets internally.since Ant 1.6.
diff --git a/manual/Tasks/ejb.html b/manual/Tasks/ejb.html index d66602bd8..503da28a3 100644 --- a/manual/Tasks/ejb.html +++ b/manual/Tasks/ejb.html @@ -69,7 +69,7 @@ In general these tasks are specific to the particular vendor's EJB Server. Vendors such as BEA and IBM now provide custom Ant tasks to work with their particular products. More importantly, EJB3.0 renders this whole process obsolete. - Accordingly, developement of these tasks is effectively frozen. Bug reports + Accordingly, development of these tasks is effectively frozen. Bug reports and especially patches are welcome, but there is no pressing need to add support for new application servers. Nobody should be writing new EJB2.x applications and definitely not new EJB2.x servers. @@ -1386,7 +1386,7 @@ the classpath of the ejbdeploy tool and set the websphere.home property ( in the descriptor dir:- <property name="webpshere.home" value="${was4.home}"/> + <property name="websphere.home" value="${was4.home}"/> <ejbjar srcdir="${build.class}" descriptordir="etc/ejb"> <include name="*-ejb-jar.xml"/> <websphere dbvendor="DB2UDBOS390_V6" diff --git a/manual/Tasks/exec.html b/manual/Tasks/exec.html index c25334a18..e1dbbcc3d 100644 --- a/manual/Tasks/exec.html +++ b/manual/Tasks/exec.html @@ -75,7 +75,7 @@ types listed in the environment variable PATHEXT. That is only used by the shellA common problem is not having the executable on the PATH. In case you get an error message Cannot run program "...":CreateProcess error=2. The system cannot find the path specified. have a look at your PATH variable. Just type the command directly on -the command line and if Windows finds it, Ant should do it too. (Otherwise ask on the user mailinglist for help.) If Windows can not execute the program add the directory of the programm +the command line and if Windows finds it, Ant should do it too. (Otherwise ask on the user mailinglist for help.) If Windows can not execute the program add the directory of the program to the PATH (set PATH=%PATH%;dirOfProgram) or specify the absolute path in the executable attribute in your buildfile.
diff --git a/manual/Tasks/ftp.html b/manual/Tasks/ftp.html index 1b6a8df0a..7d1700b04 100644 --- a/manual/Tasks/ftp.html +++ b/manual/Tasks/ftp.html @@ -248,7 +248,7 @@ try to set up a new connection.enableRemoteVerification -Whether data connection sshould be verified to + Whether data connection should be verified to connect to the same host as the control connection. This is a security measure that is enabled by default, but it may be useful to disable it in certain firewall scenarios. @@ -291,7 +291,7 @@ try to set up a new connection. Specifies the type of system in use on the server. Supported values are diff --git a/manual/Tasks/import.html b/manual/Tasks/import.html index 8cc52655f..4cf8de086 100644 --- a/manual/Tasks/import.html +++ b/manual/Tasks/import.html @@ -79,7 +79,7 @@ This enables the new implementation to call the old target, thus enhancing it with tasks called before or after it."UNIX", "VMS", "WINDOWS", "OS/2", "OS/400", "MVS".
If not specified, (or specified as""
) and if - no other xxxConfig attributes are specified, the autodectection mechanism + no other xxxConfig attributes are specified, the autodetection mechanism based on the FTP SYST command will be used.
Since ant 1.7If you use the as attribute of the task, its value will be - used to prefix the overriden target's name instead of the name + used to prefix the overridden target's name instead of the name attribute of the project tag.
Special Properties
@@ -199,7 +199,7 @@ project).Specifies the prefix prepended to the target names. If - ommitted, the name attribute of the project tag of the + omitted, the name attribute of the project tag of the imported file will be used. No diff --git a/manual/Tasks/include.html b/manual/Tasks/include.html index 8778ae64a..e2109235d 100644 --- a/manual/Tasks/include.html +++ b/manual/Tasks/include.html @@ -194,7 +194,7 @@ project).Specifies the prefix prepended to the target names. If - ommitted, the name attribute of the project tag of the + omitted, the name attribute of the project tag of the included file will be used. Yes, if the included file's diff --git a/manual/Tasks/input.html b/manual/Tasks/input.html index 0e4629c71..b04affc5c 100644 --- a/manual/Tasks/input.html +++ b/manual/Tasks/input.html @@ -41,7 +41,7 @@ one of the predefined. Optionally a property can be created from the value entered by the user. This property can then be used during the following build run. Input behaves according to property -task which means that existing properties cannot be overriden. +task which means that existing properties cannot be overridden. Since Apache Ant 1.6,
diff --git a/manual/Tasks/jar.html b/manual/Tasks/jar.html index 28f503c88..65eca04b2 100644 --- a/manual/Tasks/jar.html +++ b/manual/Tasks/jar.html @@ -314,7 +314,7 @@ to a value other than its default,<input>
will not prompt for input if a property should be set by the task that has already been set in the project (and the task wouldn't have any effect)."add"
.flattenAttributes -Whether to merge attributes occuring more than + Whether to merge attributes occurring more than once in a section (this can only happen for the Class-Path attribute) into a single attribute. Since Ant 1.8.0. @@ -538,7 +538,7 @@ Sealed: falseService Provider
- The following shows how to create a jar file specifing a service + The following shows how to create a jar file specifying a service with an implementation of the JDK6 scripting interface:
<jar jarfile="pinky.jar"> diff --git a/manual/Tasks/javac.html b/manual/Tasks/javac.html index edada062c..2315aca48 100644 --- a/manual/Tasks/javac.html +++ b/manual/Tasks/javac.html @@ -182,7 +182,7 @@ invoking the compiler.bootclasspath Location of bootstrap class files. (See below - for using the -X and -J-X parameters for specifing + for using the -X and -J-X parameters for specifying the bootstrap classpath). No diff --git a/manual/Tasks/junit.html b/manual/Tasks/junit.html index c6ab95a82..b27543c38 100644 --- a/manual/Tasks/junit.html +++ b/manual/Tasks/junit.html @@ -627,7 +627,7 @@ supported. different classloader (and thus may be unable to load the tast class).- It cannot determine which test was run when the timeout/crash - occured if the forked VM was running multiple test. I.e. the + occurred if the forked VM was running multiple test. I.e. the formatter cannot work with any
diff --git a/manual/Tasks/manifest.html b/manual/Tasks/manifest.html index b85c66686..457eb3bb3 100644 --- a/manual/Tasks/manifest.html +++ b/manual/Tasks/manifest.html @@ -95,7 +95,7 @@ line.forkMode
other thanperTest
and it won't do anything if the test class contains asuite()
method.flattenAttributes -Whether to merge attributes occuring more than + Whether to merge attributes occurring more than once in a section (this can only happen for the Class-Path attribute) into a single attribute. Since Ant 1.8.0. diff --git a/manual/Tasks/manifestclasspath.html b/manual/Tasks/manifestclasspath.html index 5857f811e..2c193b8a3 100644 --- a/manual/Tasks/manifestclasspath.html +++ b/manual/Tasks/manifestclasspath.html @@ -81,7 +81,7 @@ defined property is re-referenced. The maximum number of parent directories one is allowed to traverse to navigate from the jar file to the path entry. Put differently, the maximum number of .. which is allowed in the relative path from the - jar file to a given class path enty. Specify 0 to enforce a path + jar file to a given class path entry. Specify 0 to enforce a path entry to be in the same directory (or one of its sub-directories) as the jar file itself. Defaults to 2 levels.No diff --git a/manual/Tasks/netrexxc.html b/manual/Tasks/netrexxc.html index c492af9c6..8102b7271 100644 --- a/manual/Tasks/netrexxc.html +++ b/manual/Tasks/netrexxc.html @@ -189,7 +189,7 @@ or from the command line as
removeKeepExtension -Tells wether the trailing .keep in nocompile-mode should + Tells whether the trailing .keep in nocompile-mode should be removed so that the resulting java source really ends on .java. This facilitates the use of the javadoc tool lateron. No @@ -309,7 +309,7 @@ or from the command line as
diff --git a/manual/Tasks/parallel.html b/manual/Tasks/parallel.html index 87a7baf10..6dbd78acb 100644 --- a/manual/Tasks/parallel.html +++ b/manual/Tasks/parallel.html @@ -226,7 +226,7 @@ threadsPerProcessor attributes. Spinning up all 40 of those tasks could cripple the system for memory and CPU time. By limiting the number of concurrent executions you can reduce contention for CPU, memory and disk IO, and so actually finish faster. This is also a good -candidiate for use of threadCount (and possibly threadsPerProcessor) because +candidate for use of threadCount (and possibly threadsPerProcessor) because each task is independent (every new JVM is forked) and has no dependencies on the other tasks. diff --git a/manual/Tasks/recorder.html b/manual/Tasks/recorder.html index 7a0b2d558..dfbfc0d5a 100644 --- a/manual/Tasks/recorder.html +++ b/manual/Tasks/recorder.html @@ -143,7 +143,7 @@ future. They include things like the following: suppressExceptionNotSignalled Tells whether we should filter out the - &Exception is declared, but not signaled within the method& + &Exception is declared, but not signalled within the method& messages in strictsignal mode. No A comma-separated list of task to automatically record or not. This could be difficult as it could conflict with the includetarget/excludetarget
. (e.g.: -includetarget="compile" exlcudetask="javac"
, what should +includetarget="compile" excludetask="javac"
, what should happen?)no diff --git a/manual/Tasks/renameextensions.html b/manual/Tasks/renameextensions.html index d2cbcdb39..ed3bfbba0 100644 --- a/manual/Tasks/renameextensions.html +++ b/manual/Tasks/renameextensions.html @@ -70,7 +70,7 @@ supports most attributes of<fileset>
No - diff --git a/manual/Tasks/rpm.html b/manual/Tasks/rpm.html index 61cde7189..691d391d5 100644 --- a/manual/Tasks/rpm.html +++ b/manual/Tasks/rpm.html @@ -105,7 +105,7 @@fromExtention +fromExtension The string that files must end in to be renamed Yes diff --git a/manual/Tasks/scriptdef.html b/manual/Tasks/scriptdef.html index 1746128ad..38c3ffff0 100644 --- a/manual/Tasks/scriptdef.html +++ b/manual/Tasks/scriptdef.html @@ -139,7 +139,7 @@ more information on writing scripts, please refer to the failOnError Stop the buildprocess if the RPM build command exits with - a non-zero retuncode. Defaults to false + a non-zero returncode. Defaults to falseNo loaderRef the name of the loader that is used to load the script, constructed from the specified - classpath. This allows multiple script defintions + classpath. This allows multiple script definitions to reuse the same class loader. No diff --git a/manual/Tasks/signjar.html b/manual/Tasks/signjar.html index 87cb460ce..d6f84be4a 100644 --- a/manual/Tasks/signjar.html +++ b/manual/Tasks/signjar.html @@ -263,7 +263,7 @@ SHA256withRSA.Timestamped JAR files are a new feature in Java1.5; a feature supported in Ant since -Ant 1.7. Ant does not yet support proxy setup for this singing process. +Ant 1.7. Ant does not yet support proxy setup for this signing process.
diff --git a/manual/Tasks/sql.html b/manual/Tasks/sql.html index da6c3a339..4f6e4e4d4 100644 --- a/manual/Tasks/sql.html +++ b/manual/Tasks/sql.html @@ -210,8 +210,8 @@ and abort execution and transaction and fail task.diff --git a/manual/Tasks/style.html b/manual/Tasks/style.html index 5ade572de..8ea94935b 100644 --- a/manual/Tasks/style.html +++ b/manual/Tasks/style.html @@ -193,7 +193,7 @@ element which is used to perform Entity and URI resolution. strictDelimiterMatching If false, delimiters will be searched - for in a case-insesitive manner (i.e. delimer="go" matches "GO") - and surrounding whitespace will be ignored (delimter="go" matches + for in a case-insensitive manner (i.e. delimiter="go" matches "GO") + and surrounding whitespace will be ignored (delimiter="go" matches "GO "). Since Ant 1.8.0. No, default true reloadstylesheet Control whether the stylesheet transformer is created - anew for every transform opertaion. If you set this to true, performance may + anew for every transform operation. If you set this to true, performance may suffer, but you may work around a bug in certain Xalan-J versions. Default is false
. Since Ant 1.5.2.No @@ -235,7 +235,7 @@ element which is used to perform Entity and URI resolution.failOnError Whether the build should fail if any error - occurs. Note that transformation errors can still be surpressed by + occurs. Note that transformation errors can still be suppressed by setting failOnTransformationError to false even if this attribute is true. Since Ant 1.8.0. diff --git a/manual/Tasks/typedef.html b/manual/Tasks/typedef.html index de8686654..524390a65 100644 --- a/manual/Tasks/typedef.html +++ b/manual/Tasks/typedef.html @@ -79,7 +79,7 @@ possible, the second best option is to use the loaderref attribute and specify the same name for each and every typedef/taskdef - this way the classes will share the same ClassLoader. Note that - the typedef/taskdef tasks must use identical classpath defintions + the typedef/taskdef tasks must use identical classpath definitions (this includes the order of path components) for the loaderref attribute to work. diff --git a/manual/Tasks/unzip.html b/manual/Tasks/unzip.html index 1fc4c3958..f88f8597d 100644 --- a/manual/Tasks/unzip.html +++ b/manual/Tasks/unzip.html @@ -121,7 +121,7 @@ archive.stripAbsolutePathSpec whether Ant should remove leading '/' or '\' - characters from the extracted file name before extracing it. + characters from the extracted file name before extracting it. Note that this changes the entry's name before applying include/exclude patterns and before using the nested mappers (if any). since Ant 1.8.0 diff --git a/manual/Tasks/vss.html b/manual/Tasks/vss.html index f91c082d2..2c0ed68c1 100644 --- a/manual/Tasks/vss.html +++ b/manual/Tasks/vss.html @@ -49,7 +49,7 @@ vss functionality as well as some Apache Ant tasks encapsulating frequently used Although it is possible to use these commands on the desktop, they were primarily intended to be used by automated build systems.-If you get a CreateProcesss IOError=2 when running these, it means +If you get a CreateProcess IOError=2 when running these, it means that ss.exe was not found. Check to see if you can run it from the command line -you may need to alter your path, or set the ssdir property. diff --git a/manual/Tasks/war.html b/manual/Tasks/war.html index 20eac3766..f29774496 100644 --- a/manual/Tasks/war.html +++ b/manual/Tasks/war.html @@ -261,7 +261,7 @@ to a value other than its default,
"add"
.flattenAttributes -Whether to merge attributes occuring more than + Whether to merge attributes occurring more than once in a section (this can only happen for the Class-Path attribute) into a single attribute. Since Ant 1.8.0. @@ -339,7 +339,7 @@ using Ant's default manifest file. The content ofWEB-INF/web.xml
is identical tosrc/metadata/myapp.xml
. -We regulary receive bug reports that this task is creating the WEB-INF +
We regularly receive bug reports that this task is creating the WEB-INF directory as web-inf (all lower case), and thus it is our fault your webapp doesn't work. The cause of these complaints lies in WinZip, which turns an all upper-case directory into an all lower case one in a fit of helpfulness. Please check that diff --git a/manual/Tasks/zip.html b/manual/Tasks/zip.html index a378a9a2c..37e2bc746 100644 --- a/manual/Tasks/zip.html +++ b/manual/Tasks/zip.html @@ -311,7 +311,7 @@ archive.
zip family of tasks support an optioncreateUnicodeExtraFields
since Ant 1.8.0 which makes Ant write these extra fields either for all entries ("always") - or only those whose name cannot be encoded using the spcified + or only those whose name cannot be encoded using the specified encoding (not-encodeable), it defaults to "never" since the extra fields create bigger archives. @@ -464,7 +464,7 @@ The code </zip>-
zips all files in the
htdocs/manual
directory into thedocs/user-guide
directory in the archive and includes all the files in any file that machesexamples*.zip
, such as all files withinexamples1.zip
orexamples_for_brian.zip
. +zips all files in the
htdocs/manual
directory into thedocs/user-guide
directory in the archive and includes all the files in any file that matchesexamples*.zip
, such as all files withinexamples1.zip
orexamples_for_brian.zip
. The same can be achieved with<zip destfile="${dist}/manual.zip"> diff --git a/manual/Types/antlib.html b/manual/Types/antlib.html index 3b06a162d..3b1f40817 100644 --- a/manual/Types/antlib.html +++ b/manual/Types/antlib.html @@ -159,7 +159,7 @@Load antlib from inside of the buildfile
- If you want to seperate the antlib from your local Ant installation, e.g. because you + If you want to separate the antlib from your local Ant installation, e.g. because you want to hold that jar in your projects SCM system, you have to specify a classpath, so that Ant could find that jar. The best solution is loading the antlib with <taskdef>.
@@ -190,7 +190,7 @@ Definitions defined in antlibs may be used in antlibs. However the namespace that definitions are placed in are dependent on the<typedef>
that uses the antlib. To deal with this - problem, the definitions are placed in the namepace URI ant:current + problem, the definitions are placed in the namespace URI ant:current for the duration of the antlib execution. For example the following antlib defines the task<if>
, the type<isallowed>
and a macro diff --git a/manual/Types/classfileset.html b/manual/Types/classfileset.html index 22bd70092..6145d9795 100644 --- a/manual/Types/classfileset.html +++ b/manual/Types/classfileset.html @@ -23,7 +23,7 @@ClassFileSet
-A classfileset is a specialised type of fileset which, given a set of +
A classfileset is a specialized type of fileset which, given a set of "root" classes, will include all of the class files upon which the root classes depend. This is typically used to create a jar with all of the required classes for a particular application. diff --git a/manual/Types/filterchain.html b/manual/Types/filterchain.html index 0a06c7155..33e69025e 100644 --- a/manual/Types/filterchain.html +++ b/manual/Types/filterchain.html @@ -178,7 +178,7 @@ distribution. a class. However the bytes arrive to the filter as a sequence of characters. This means that one must be careful on the choice of character encoding to use. Most encoding lose information - on conversion from an arbitary sequence of bytes to characters + on conversion from an arbitrary sequence of bytes to characters and back again to bytes. In particular the usual default character encodings (CP152 and UTF-8) do. For this reason, since Ant 1.7, the character @@ -1042,12 +1042,12 @@ a token and either returns a string or a null. It the string is not null it is passed to the next filter. This proceeds until all the filters are called. If a string is returned after all the filters, the string is -outputs with its associated token delimitier +outputs with its associated token delimiter (if one is present). The trailing delimiter may be overridden by the delimOutput attribute.
-blackslash interpretation +backslash interpretation A number of attributes (including delimOutput) interpret backslash escapes. The following are understood: \n, \r, \f, \t and \\. @@ -1344,7 +1344,7 @@ concerning the choice of regular expression implementation.
@@ -1650,7 +1650,7 @@ order and copy them into build location. Sort all files replace The substitution pattern to replace the matched - regular expression. When omitted the orignal token is returned. + regular expression. When omitted the original token is returned. No *.txt
from src location using as sorting criteriumEvenFirstCmp
class, that sorts the file lines putting even lines first then odd lines for example. The modified files -are copied into build location. TheEventFirstCmp
, +are copied into build location. TheEvenFirstCmp
, has to an instanciable class viaClass.newInstance()
, therefore in case of inner class has to be static. It also has to implementjava.util.Comparator
interface, for example: diff --git a/manual/Types/namespace.html b/manual/Types/namespace.html index 07b7d3c0f..33a214245 100644 --- a/manual/Types/namespace.html +++ b/manual/Types/namespace.html @@ -185,7 +185,7 @@ be woven together under certain circumstances. This has a lot to do with the Ant 1.6 add type introspection rules: - Ant types and tasks are now free to accept arbritrary named types as + Ant types and tasks are now free to accept arbitrary named types as nested elements, as long as the concrete type implements the interface expected by the task/type. The most obvious example for this is the<condition>
task, which supports various nested conditions, all diff --git a/manual/Types/permissions.html b/manual/Types/permissions.html index 6e7f2649e..f7b90b783 100644 --- a/manual/Types/permissions.html +++ b/manual/Types/permissions.html @@ -113,7 +113,7 @@ If the name is left empty all names match, and are revoked. If the actions are left empty all actions match, and are revoked.Base set
-A permissions set implictly contains the following permissions: +A permissions set implicitly contains the following permissions:<grant class="java.net.SocketPermission" name="localhost:1024-" actions="listen"> <grant class="java.util.PropertyPermission" name="java.version" actions="read"> diff --git a/manual/Types/selectors-program.html b/manual/Types/selectors-program.html index c93c14e8f..8e16b0338 100644 --- a/manual/Types/selectors-program.html +++ b/manual/Types/selectors-program.html @@ -160,7 +160,7 @@ special testenvironment got a new name: bed. Like you initialize the test environment by calling setUp() and cleaning by calling tearDown() (or like to make your bed before go sleeping) you have to do that work with your - bed by calling makeBed() respecitive cleanupBed(). + bed by calling makeBed() respective cleanupBed().A usual test scenario is
- make the bed
diff --git a/manual/Types/selectors.html b/manual/Types/selectors.html index b4aa8b641..1ce803282 100644 --- a/manual/Types/selectors.html +++ b/manual/Types/selectors.html @@ -789,7 +789,7 @@selres -Should Resources whithout an InputStream, and + Should Resources without an InputStream, and therefore without checking, be selected? (boolean) No, defaults to true. Only relevant when used as ResourceSelector. @@ -816,7 +816,7 @@- comparatorclass : same as attribute comparatorclass
- update : same as attribute update
- seldirs : same as attribute seldirs
-- algorithm.* : Value is transfered to the algorithm via its +
- algorithm.* : Value is transferred to the algorithm via its setXX-methods
- cache.* : Value is transfered to the cache via its setXX-methods
@@ -957,7 +957,7 @@@@ -972,7 +972,7 @@<modified cacheclassname="com.mycompany.MyCache"> <classpath> - <pathelement location="lib/mycompony-antutil.jar"/> + <pathelement location="lib/mycompany-antutil.jar"/> </classpath> </modified>Signed Selector
- The
<signedselector>
tag selects signed files and optionaly + The<signedselector>
tag selects signed files and optionally signed with a certain name.@@ -1117,7 +1117,7 @@
The
self
bean maps to the selector, which has the following - attributes. Only theselected
flag is writeable, the rest + attributes. Only theselected
flag is writable, the rest are read only via their getter methods.diff --git a/manual/develop.html b/manual/develop.html index 3c20cb986..774961ca8 100644 --- a/manual/develop.html +++ b/manual/develop.html @@ -80,7 +80,7 @@ good convention, though. The xml element that contains the tag corresponding to the task gets converted to an UnknownElement at parser time. This UnknownElement gets placed in a list within a target - object, or recursivly within another UnknownElement. + object, or recursively within another UnknownElement.
- When the target is executed, each UnknownElement is invoked @@ -262,7 +262,7 @@ the methods will be called, but we don't know which, this depends on the implementation of your Java virtual machine.
Nested Types
-If your task needs to nest an arbitary type that has been defined +If your task needs to nest an arbitrary type that has been defined using<typedef>
you have two options.
- @@ -510,7 +510,7 @@ If you wish to attach a listener from the command line you may use the
public void add(Type type)
will run Ant with a listener that generates an XML representation of the build progress. This listener is included with Ant, as is the default listener, which generates the logging to standard output.
-Note: A listener must not access System.out and System.err directly since ouput on +
Note: A listener must not access System.out and System.err directly since output on these streams is redirected by Ant's core to the build event system. Accessing these streams can cause an infinite loop in Ant. Depending on the version of Ant, this will either cause the build to terminate or the Java VM to run out of Stack space. A logger, also, may diff --git a/manual/dirtasks.html b/manual/dirtasks.html index c11f4df5c..5c232298b 100644 --- a/manual/dirtasks.html +++ b/manual/dirtasks.html @@ -282,7 +282,7 @@ directory-based tasks. As of Ant 1.8.1 they are:
**/.svn/** **/.DS_Store -Ant 1.8.2 adds the folllowing default excludes:
+Ant 1.8.2 adds the following default excludes:
**/.git **/.git/** diff --git a/manual/install.html b/manual/install.html index 7cb1e638d..8000d3821 100644 --- a/manual/install.html +++ b/manual/install.html @@ -167,7 +167,7 @@ files are organized as follows.ant-current-src.zip ZIP-Archive containing the sources of Ant. If you have this you could compile Ant itself. - If you do not have the required dependencies, the classes depeding on them are just not + If you do not have the required dependencies, the classes depending on them are just not built. Again, it is preferred to use the standard way of getting the source package described above to make your download quicker and to reduce the load on Apache servers. @@ -308,7 +308,7 @@ installed in a short, 8.3 path, such as C:\Ant.@@ -888,7 +888,7 @@ you need jakarta-oro 2.0.8 or later, and commons-net< On these systems you will also need to configure more environment - space to cater for the environment variables used in the Ant lauch script. + space to cater for the environment variables used in the Ant launch script. To do this, you will need to add or update the following line in the
@@ -381,7 +381,7 @@ Apache Ant version 1.7.1 compiled on June 27 2008 ANT_HOME is used by the launcher script for finding the libraries. JAVA_HOME is used by the launcher for finding the JDK/JRE to use. (JDK is recommended as some tasks require the java tools.) If not set, the launcher tries to find one via the %PATH% environment variable. -PATH is set for user convinience. With that set you can just start ant instead of always typing +PATH is set for user convenience. With that set you can just start ant instead of always typing the/complete/path/to/your/ant/installation/bin/ant. @@ -878,7 +878,7 @@ you need jakarta-oro 2.0.8 or later, and commons-net< of rhino's javascript.config.sys
file- Note: BSF 2.4.0 uses jakarata-commons-logging + Note: BSF 2.4.0 uses jakarta-commons-logging so it needs the commons-logging.jar.
Groovy jars Groovy with script and scriptdef tasks
You need to get the groovy jar and two asm jars from a groovy - installation. The jars are groovy-[version].jar, asm-[vesion].jar and + installation. The jars are groovy-[version].jar, asm-[version].jar and asm-util-[version].jar and antlr-[version].jar. As of groovy version 1.0-JSR-06, the jars are groovy-1.0-JSR-06.jar, antlr-2.7.5.jar, asm-2.2.jar and asm-util-2.2.jar. @@ -926,7 +926,7 @@ you need jakarta-oro 2.0.8 or later, and commons-net<jpython.jar -Python with script task deprecated, jython is the prefered engine +Python with script task deprecated, jython is the preferred engine http://www.jpython.org/ @@ -1049,7 +1049,7 @@ absent. - JVM system properties
-- The status of the temp directory. If this is not writeable, or its clock is +
- The status of the temp directory. If this is not writable, or its clock is horribly wrong (possible if it is on a network drive), a lot of tasks will fail with obscure error messages.
@@ -1067,7 +1067,7 @@ your location, then dependency logic may get confused.- For under-IDE diagostics, use the <diagnostics> task to run the same + For under-IDE diagnostics, use the <diagnostics> task to run the same tests as an ant task. This can be added to a diagnostics target in a build file to see what tasks are available under the IDE, what the XML parser and classpath is, etc. diff --git a/manual/listeners.html b/manual/listeners.html index 4f04724f1..2a5cc737d 100644 --- a/manual/listeners.html +++ b/manual/listeners.html @@ -298,7 +298,7 @@ AnsiColorLogger.DEBUG_COLOR=2;34
Each key takes as value a color combination defined as Attribute;Foreground;Background. In the above example, background value has not been used.
-This file must be specfied as the value of a system variable +
This file must be specified as the value of a system variable named ant.logger.defaults and passed as an argument using the -D option to the java command that invokes the Ant application. An easy way to achieve this is to add -Dant.logger.defaults= diff --git a/manual/platform.html b/manual/platform.html index be452fd15..8b38731aa 100644 --- a/manual/platform.html +++ b/manual/platform.html @@ -36,7 +36,7 @@ for example) may not work against the shipping XSL engine.
- You should use a GNU version of tar to untar the Apache Ant source tree, if you have downloaded this as a tar file. If you get -wierd errors about missing files, this is the problem. +weird errors about missing files, this is the problem.
- Ant does not preserve file permissions when a file is copied, moved or archived, because Java does not let it read or write the permissions. diff --git a/manual/proxy.html b/manual/proxy.html index 864534255..b6f730bb1 100644 --- a/manual/proxy.html +++ b/manual/proxy.html @@ -50,7 +50,7 @@ proxy configuration.
This is a long standing problem with Java and Ant. The only way to fix - it is to explictly configure Ant with the proxy settings, either + it is to explicitly configure Ant with the proxy settings, either by passing down the proxy details as JVM properties, or to tell Ant on a Java1.5+ system to have the JVM work it out for itself. diff --git a/manual/running.html b/manual/running.html index ebe173212..68d57940b 100644 --- a/manual/running.html +++ b/manual/running.html @@ -155,7 +155,7 @@ default directories scanned are ANT_HOME/lib and a user specific directory, ${user.home}/.ant/lib. This arrangement allows the Ant installation to be shared by many users while still allowing each user to deploy additional jars. Such additional jars could be support jars for Ant's optional tasks or jars -containing third-party tasks to be used in the build. It also allows the main Ant installation to be locked down which will please system adminstrators. +containing third-party tasks to be used in the build. It also allows the main Ant installation to be locked down which will please system administrators.
@@ -470,7 +470,7 @@ org.apache.tools.ant.Executor implementation specified here.
diff --git a/manual/tutorial-HelloWorldWithAnt.html b/manual/tutorial-HelloWorldWithAnt.html index d367f548d..babd9b43c 100644 --- a/manual/tutorial-HelloWorldWithAnt.html +++ b/manual/tutorial-HelloWorldWithAnt.html @@ -356,7 +356,7 @@ For another layout ... have a look inside Log4J's documentation about using othe ant.project-helper-repo.debug
boolean (default 'false') -Set it to true to enable debuging with Ant's + Set it to true to enable debugging with Ant's ProjectHelper internal repository. Configuration files
Why we have used Log4J? "It's highly configurable"? No - all is hard coded! But that is not the debt of Log4J - it's ours. We had coded BasicConfigurator.configure(); which implies a simple, but hard coded configuration. More -confortable would be using a property file. In the java source delete the BasicConfiguration-line from the main() method +comfortable would be using a property file. In the java source delete the BasicConfiguration-line from the main() method (and the related import-statement). Log4J will search then for a configuration as described in it's manual. Then create a new file src/log4j.properties. That's the default name for Log4J's configuration and using that name would make life easier - not only the framework knows what is inside, you too!
diff --git a/manual/tutorial-tasks-filesets-properties.html b/manual/tutorial-tasks-filesets-properties.html index 526408bdb..007657911 100644 --- a/manual/tutorial-tasks-filesets-properties.html +++ b/manual/tutorial-tasks-filesets-properties.html @@ -301,7 +301,7 @@ can implement our task, so that these test cases will pass. is a common way, because we separate the prerequisites from the real work. On //2 we iterate over all nested filesets. If we don't want to handle multiple filesets, the addFileset() method has to reject the further calls. We can get the result of a fileset via its DirectoryScanner -like done in //3. After that we create a plattform independend String representation of +like done in //3. After that we create a platform independend String representation of the file path (//4, can be done in other ways of course). We have to do the replace(), because we work with a simple string comparison. Ant itself is platform independant and can therefore run on filesystems with slash (/, e.g. Linux) or backslash (\, e.g. Windows) as @@ -313,7 +313,7 @@ location of the file as property, if we had found one (//6).Ok, much more easier in this simple case would be to add the file as additional include element to all filesets. But I wanted to show how to handle complex situations -whithout being complex :-)
+without being complex :-)The test case uses the ant property ant.home as reference. This property is set by the Launcher class which starts ant. We can use that property in our buildfiles as a @@ -744,7 +744,7 @@ cd ant //3 cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic update //4
-We use the -d flag on //1 to specifiy the cvs directory. You can +
We use the -d flag on //1 to specify the cvs directory. You can specify the environment variable CVSROOT with that value and after that you haven�t to use that flag any more. On //2 we get the whole cvs tree of ant. (Sorry, but that uses a lot of time ... 10 up to 30 minutes are not unusual ... but this has @@ -905,7 +905,7 @@ entry. For both we need some information:
all locations as a property. See the included manual for details.- @@ -926,9 +926,9 @@ and the steps described there if you haven't one.attachements +attachments all files needed to apply the path Archive containing a patch with the new and modified resources - Choose "Ant" as product
- Version is the last "Alpha (nightly)" (at this time 1.7)
- Component is "Core tasks"
-- Plattform and Severity are ok with "Other" and "Normal"
+- Platform and Severity are ok with "Other" and "Normal"
- Initial State is ok with "New"
-- Same with the empy "Assigned to"
+- Same with the empty "Assigned to"
- It is not required to add yourself as CC, because you are the reporter and therefore will be informed on changes
- URL: no url required
diff --git a/manual/tutorial-writing-tasks.html b/manual/tutorial-writing-tasks.html index b7edb7210..c4881e949 100644 --- a/manual/tutorial-writing-tasks.html +++ b/manual/tutorial-writing-tasks.html @@ -79,7 +79,7 @@ So the buildfile contains three targets. This buildfile uses often the same value (src, classes, MyTask.jar), so we should rewrite that using<property>
s. On second there are some handicaps:<javac>
requires that the destination directory exists; a call of "clean" with a non existing classes directory will fail; "jar" requires -the execution of some steps bofore. So the refactored code is: +the execution of some steps before. So the refactored code is:<?xml version="1.0" encoding="ISO-8859-1"?> @@ -208,7 +208,7 @@ Here is project 'MyTask'.Deriving from Ant's Task
Ok, that works ... But usually you will extend org.apache.tools.ant.Task. That class is integrated in Ant, get's the project-reference, provides documentation -fiels, provides easier access to the logging facility and (very useful) gives you +fields, provides easier access to the logging facility and (very useful) gives you the exact location where in the buildfile this task instance is used.
Oki-doki - let's us use some of these:
diff --git a/manual/using.html b/manual/using.html index 836296586..653c34541 100644 --- a/manual/using.html +++ b/manual/using.html @@ -558,9 +558,9 @@ For the declaration there are several ways: <for ... />- declare a bundle of tasks using a xml-file named antlib.xml, XML-namespace and -
antlib:
protocoll handler +antlib:
protocol handler
-<project xmlns:ac="antlib:net.sf.antconrib"/> +
<project xmlns:ac="antlib:net.sf.antcontrib"/> <ac:for ... />