Browse Source

assorted spelling fixes by Lajos Veres - closes #4

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1572981 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 11 years ago
parent
commit
5fc48a4bf9
41 changed files with 79 additions and 74 deletions
  1. +1
    -0
      CONTRIBUTORS
  2. +12
    -12
      WHATSNEW
  3. +4
    -0
      contributors.xml
  4. +5
    -5
      manual/Tasks/conditions.html
  5. +1
    -1
      manual/Tasks/local.html
  6. +1
    -1
      manual/Tasks/style.html
  7. +1
    -1
      manual/Types/patternset.html
  8. +1
    -1
      manual/install.html
  9. +1
    -1
      manual/targets.html
  10. +2
    -2
      manual/tutorial-tasks-filesets-properties.html
  11. +1
    -1
      src/etc/printFailingTests.xsl
  12. +3
    -3
      src/etc/testcases/filters/tokenfilter.xml
  13. +1
    -1
      src/etc/testcases/taskdefs/concat.xml
  14. +1
    -1
      src/etc/testcases/taskdefs/optional/antlr/antlr.xml
  15. +1
    -1
      src/main/org/apache/tools/ant/DirectoryScanner.java
  16. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/Available.java
  17. +2
    -2
      src/main/org/apache/tools/ant/taskdefs/Concat.java
  18. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/Jar.java
  19. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
  20. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
  21. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
  22. +6
    -6
      src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatability.java
  23. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatibility.java
  24. +3
    -3
      src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java
  25. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java
  26. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
  27. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
  28. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java
  29. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
  30. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
  31. +2
    -2
      src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
  32. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java
  33. +1
    -1
      src/main/org/apache/tools/ant/types/Environment.java
  34. +1
    -1
      src/main/org/apache/tools/ant/types/optional/image/ColorMapper.java
  35. +5
    -5
      src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
  36. +2
    -2
      src/main/org/apache/tools/ant/util/ResourceUtils.java
  37. +1
    -1
      src/main/org/apache/tools/bzip2/CBZip2InputStream.java
  38. +1
    -1
      src/main/org/apache/tools/zip/ZipEncodingHelper.java
  39. +3
    -3
      src/tests/antunit/taskdefs/defaultexcludes-test.xml
  40. +1
    -1
      src/tests/junit/org/apache/tools/ant/ProjectHelperRepositoryTest.java
  41. +2
    -2
      src/tests/junit/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java

+ 1
- 0
CONTRIBUTORS View File

@@ -203,6 +203,7 @@ Kevin Z Grey
Kim Hansen Kim Hansen
Kirk Wylie Kirk Wylie
Kyle Adams Kyle Adams
Lajos Veres
Larry Shatzer Larry Shatzer
Larry Streepy Larry Streepy
Les Hughes Les Hughes


+ 12
- 12
WHATSNEW View File

@@ -1224,7 +1224,7 @@ Changes that could break older environments:
Bugzilla Report 46506. Bugzilla Report 46506.


* <copy> silently ignored missing resources even with * <copy> silently ignored missing resources even with
failOnError="true". If your build tries to copy non-existant
failOnError="true". If your build tries to copy non-existent
resources and you relied on this behavior you must now explicitly resources and you relied on this behavior you must now explicitly
set failOnError to false. set failOnError to false.
Bugzilla Report 47362. Bugzilla Report 47362.
@@ -1377,7 +1377,7 @@ Fixed bugs:
Bugzilla Report 45607. Bugzilla Report 45607.


* only <formatter>s that logged to a file were notified if forked VM * only <formatter>s that logged to a file were notified if forked VM
crashed or a timeout occured in <junit>.
crashed or a timeout occurred in <junit>.
Bugzilla Report 37312. Bugzilla Report 37312.


* ant -v -version would print the version information twice. * ant -v -version would print the version information twice.
@@ -1475,7 +1475,7 @@ Fixed bugs:
of the file system). of the file system).
Bugzilla Report 43665. Bugzilla Report 43665.


* <sshexec> didn't store the ouput in outputproperty if the remote
* <sshexec> didn't store the output in outputproperty if the remote
command failed. command failed.
Bugzilla Report 46340. Bugzilla Report 46340.


@@ -1748,7 +1748,7 @@ Other changes:


* A new listener for <junit> has been added that tries to invoke the * A new listener for <junit> has been added that tries to invoke the
tearDown method of a TestCase if that TestCase was run in a forked tearDown method of a TestCase if that TestCase was run in a forked
VM and the VM crashed or a timeout occured. See the <junit> task's
VM and the VM crashed or a timeout occurred. See the <junit> task's
manual page for details. manual page for details.
Bugzilla Report 37241. Bugzilla Report 37241.


@@ -1879,7 +1879,7 @@ Other changes:
* <xslt> now fails early if a specified stylesheet doesn't exist. * <xslt> now fails early if a specified stylesheet doesn't exist.
Bugzilla Report 34525. Bugzilla Report 34525.


* <xslt> now has an option to supress transformer warnings. This
* <xslt> now has an option to suppress transformer warnings. This
option only has an effect for processors that support this feature; option only has an effect for processors that support this feature;
the "trax" processor included with Ant does support it. the "trax" processor included with Ant does support it.
Bugzilla Report 18897. Bugzilla Report 18897.
@@ -2790,7 +2790,7 @@ Other changes:
* Upgraded XML API and parser to Xerces 2.8.1 * Upgraded XML API and parser to Xerces 2.8.1


* A code review of some threaded logic has tightened up the synchronization * A code review of some threaded logic has tightened up the synchronization
of Watchdog, ExecuteWatchdog and ExecuteJava, which could reduce the occurence
of Watchdog, ExecuteWatchdog and ExecuteJava, which could reduce the occurrence
of race conditions here, especially on Java1.5+. of race conditions here, especially on Java1.5+.


* Allow broken reference build files. The defer reference processing would * Allow broken reference build files. The defer reference processing would
@@ -3368,7 +3368,7 @@ Fixed bugs:


* FTP task, getTimeDiff method was returning wrong value. Bugzilla 30595. * FTP task, getTimeDiff method was returning wrong value. Bugzilla 30595.


* make sure that Zip and its derivates call the createEmptyZip method when
* make sure that Zip and its derivatives call the createEmptyZip method when
there are no resources to zip/jar/... there are no resources to zip/jar/...


* Zip task was not zipping when only empty directories were found. * Zip task was not zipping when only empty directories were found.
@@ -3946,7 +3946,7 @@ Fixed bugs:
than seven characters. Bugzilla Report 18105. than seven characters. Bugzilla Report 18105.


* <copy> and <move>'s failonerror didn't apply to filesets pointing to * <copy> and <move>'s failonerror didn't apply to filesets pointing to
non-existant directories. Bugzilla Report 18414.
non-existent directories. Bugzilla Report 18414.


* The <stripjavacomments> filter sometimes removed parts of string * The <stripjavacomments> filter sometimes removed parts of string
constants. Bugzilla Report 17441. constants. Bugzilla Report 17441.
@@ -4061,7 +4061,7 @@ Fixed bugs:
* ftp put with chmod failed when the remote system was UNIX and local system * ftp put with chmod failed when the remote system was UNIX and local system
Windows. Bugzilla Report 23143. Windows. Bugzilla Report 23143.


* ftp did not set the ascii mode explicity, causing problems with ftp servers
* ftp did not set the ascii mode explicitly, causing problems with ftp servers
having binary as default having binary as default


* ftp was not able to download files when they were pointed to by symbolic * ftp was not able to download files when they were pointed to by symbolic
@@ -5204,7 +5204,7 @@ Other changes:
or a file. or a file.


* New tasks <bzip2> and <bunzip2> to pack and unpack files using the * New tasks <bzip2> and <bunzip2> to pack and unpack files using the
BZip2 alogrithm.
BZip2 algorithm.


* New tasks <replaceregexp>, <checksum>, <translate>, <waitfor>, * New tasks <replaceregexp>, <checksum>, <translate>, <waitfor>,
<manifest>, <vsscp>, <vssadd>, <vsscreate>, <splash>, <basename>, <dirname>, <manifest>, <vsscp>, <vssadd>, <vsscreate>, <splash>, <basename>, <dirname>,
@@ -5504,7 +5504,7 @@ Changes that could break older environments:
other tasks. This can break customer listeners which do not expect messages other tasks. This can break customer listeners which do not expect messages
from a task before the previous task has finished. from a task before the previous task has finished.


* Ant now installs its own ouput stream into System.out to route output to the
* Ant now installs its own output stream into System.out to route output to the
task currently executing on the current thread. This also means that all task currently executing on the current thread. This also means that all
output is now routed as Ant message events. Customer listeners and loggers output is now routed as Ant message events. Customer listeners and loggers
should not call System.out at any time. This has always been true but such should not call System.out at any time. This has always been true but such
@@ -5622,7 +5622,7 @@ Other changes:


* added vmlauncher attribute to exec tasks. This defaults to true. If * added vmlauncher attribute to exec tasks. This defaults to true. If
it is set to false, the VM's ability to launch commands in bypassed it is set to false, the VM's ability to launch commands in bypassed
and the OS shell, either directly or through the auxillary antRun
and the OS shell, either directly or through the auxiliary antRun
scripts is used. scripts is used.


* regexp mapper now supports the java.util.regex package of JDK 1.4. * regexp mapper now supports the java.util.regex package of JDK 1.4.


+ 4
- 0
contributors.xml View File

@@ -839,6 +839,10 @@
<first>Kyle</first> <first>Kyle</first>
<last>Adams</last> <last>Adams</last>
</name> </name>
<name>
<first>Lajos</first>
<last>Veres</last>
</name>
<name> <name>
<first>Larry</first> <first>Larry</first>
<last>Shatzer</last> <last>Shatzer</last>


+ 5
- 5
manual/Tasks/conditions.html View File

@@ -255,7 +255,7 @@ TCP/IP listener at the specified host and port.</p>
<h4><a name="filesmatch">filesmatch</a></h4> <h4><a name="filesmatch">filesmatch</a></h4>
<p>Test two files for matching. Nonexistence of one file results in "false", <p>Test two files for matching. Nonexistence of one file results in "false",
although if neither exists they are considered equal in terms of content. although if neither exists they are considered equal in terms of content.
This test does a byte for byte comparision, so test time scales with
This test does a byte for byte comparison, so test time scales with
byte size. NB: if the files are different sizes, one of them is missing 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. or the filenames match the answer is so obvious the detailed test is omitted.


@@ -306,7 +306,7 @@ or the filenames match the answer is so obvious the detailed test is omitted.
</tr> </tr>
<tr> <tr>
<td valign="top">casesensitive</td> <td valign="top">casesensitive</td>
<td valign="top">Perform a case sensitive comparision. Default is
<td valign="top">Perform a case sensitive comparison. Default is
true.</td> true.</td>
<td valign="top" align="center">No</td> <td valign="top" align="center">No</td>
</tr> </tr>
@@ -753,7 +753,7 @@ Probe for the maven repository being reachable using the hostname, ten second ti
<h4><a name="resourcesmatch">resourcesmatch</a></h4> <h4><a name="resourcesmatch">resourcesmatch</a></h4>
<p>Test resources for matching. Nonexistence of one or more resources results in <p>Test resources for matching. Nonexistence of one or more resources results in
"false", although if none exists they are considered equal in terms of content. "false", although if none exists they are considered equal in terms of content.
By default this test does a byte for byte comparision, so test time scales with
By default this test does a byte for byte comparison, so test time scales with
byte size. NB: if the files are different sizes, one of them is missing 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. or the filenames match the answer is so obvious the detailed test is omitted.
The resources to check are specified as nested The resources to check are specified as nested
@@ -805,7 +805,7 @@ must match. <b>Since Ant 1.7</b>
</tr> </tr>
<tr> <tr>
<td valign="top">casesensitive</td> <td valign="top">casesensitive</td>
<td valign="top">Perform a case sensitive comparision. Default is
<td valign="top">Perform a case sensitive comparison. Default is
true.</td> true.</td>
<td valign="top" align="center">No</td> <td valign="top" align="center">No</td>
</tr> </tr>
@@ -1071,7 +1071,7 @@ is redundant and will be ignored.</p>


<h4><a name="resourceexists">resourceexists</a></h4> <h4><a name="resourceexists">resourceexists</a></h4>


<p>Tests a resource for existance. <em>since Ant 1.8.0</em></p>
<p>Tests a resource for existence. <em>since Ant 1.8.0</em></p>


<p>The actual resource to test is specified as a nested element.</p> <p>The actual resource to test is specified as a nested element.</p>




+ 1
- 1
manual/Tasks/local.html View File

@@ -37,7 +37,7 @@ top-level operations are carried out; it will not be defined for other targets
in the buildfile. <b>Since Ant 1.8</b></p> in the buildfile. <b>Since Ant 1.8</b></p>


<p>A property is made local if the <code>&lt;local&gt;</code> task <p>A property is made local if the <code>&lt;local&gt;</code> task
preceedes its definition. See the examples section.</p>
precedes its definition. See the examples section.</p>


<h3>Parameters</h3> <h3>Parameters</h3>
<table border="1" cellpadding="2" cellspacing="0"> <table border="1" cellpadding="2" cellspacing="0">


+ 1
- 1
manual/Tasks/style.html View File

@@ -225,7 +225,7 @@ element which is used to perform Entity and URI resolution.</p>
<td valign="top" align="center">No</td> <td valign="top" align="center">No</td>
</tr> </tr>
<tr> <tr>
<td valign="top">supressWarnings</td>
<td valign="top">suppressWarnings</td>
<td valign="top">Whether processor warnings shall be suppressed. <td valign="top">Whether processor warnings shall be suppressed.
This option requires support by the processor, it is supported by This option requires support by the processor, it is supported by
the trax processor bundled with Ant. the trax processor bundled with Ant.


+ 1
- 1
manual/Types/patternset.html View File

@@ -98,7 +98,7 @@ your build file, you should use the includesfile/excludesfile
attributes or elements. Using the attribute, you can only specify a attributes or elements. Using the attribute, you can only specify a
single file of each type, while the nested elements can be specified single file of each type, while the nested elements can be specified
more than once - the nested elements also support if/unless attributes more than once - the nested elements also support if/unless attributes
you can use to test the existance of a property.</p>
you can use to test the existence of a property.</p>
<table border="1" cellpadding="2" cellspacing="0"> <table border="1" cellpadding="2" cellspacing="0">
<tr> <tr>
<td valign="top"><b>Attribute</b></td> <td valign="top"><b>Attribute</b></td>


+ 1
- 1
manual/install.html View File

@@ -105,7 +105,7 @@ Choose the format that is best supported for your platform.
runtime. Such distributions are usually unsupported by everyone. Particularly runtime. Such distributions are usually unsupported by everyone. Particularly
troublesome are those products that not only ship with their own Ant release, troublesome are those products that not only ship with their own Ant release,
they add their own version of ANT.BAT or ant.sh to the PATH. If Ant starts they add their own version of ANT.BAT or ant.sh to the PATH. If Ant starts
behaving wierdly after installing something, try the
behaving weirdly after installing something, try the
<a href="#diagnostics">diagnostics</a> advice. <a href="#diagnostics">diagnostics</a> advice.
</p> </p>




+ 1
- 1
manual/targets.html View File

@@ -94,7 +94,7 @@


<p>Only one propertyname can be specified in the if/unless <p>Only one propertyname can be specified in the if/unless
clause. If you want to check multiple conditions, you can use a clause. If you want to check multiple conditions, you can use a
dependend target for computing the result for the check:</p>
dependent target for computing the result for the check:</p>


<blockquote><pre> <blockquote><pre>
&lt;target name="myTarget" depends="myTarget.check" if="myTarget.run"&gt; &lt;target name="myTarget" depends="myTarget.check" if="myTarget.run"&gt;


+ 2
- 2
manual/tutorial-tasks-filesets-properties.html View File

@@ -301,9 +301,9 @@ can implement our task, so that these test cases will pass.</p>
is a common way, because we separate the prerequisites from the real work. On <b>//2</b> we iterate is a common way, because we separate the prerequisites from the real work. On <b>//2</b> we iterate
over all nested filesets. If we don't want to handle multiple filesets, the <tt>addFileset()</tt> over all nested filesets. If we don't want to handle multiple filesets, the <tt>addFileset()</tt>
method has to reject the further calls. We can get the result of a fileset via its DirectoryScanner method has to reject the further calls. We can get the result of a fileset via its DirectoryScanner
like done in <b>//3</b>. After that we create a platform independend String representation of
like done in <b>//3</b>. After that we create a platform independent String representation of
the file path (<b>//4</b>, can be done in other ways of course). We have to do the <tt>replace()</tt>, the file path (<b>//4</b>, can be done in other ways of course). We have to do the <tt>replace()</tt>,
because we work with a simple string comparison. Ant itself is platform independant and can
because we work with a simple string comparison. Ant itself is platform independent and can
therefore run on filesystems with slash (/, e.g. Linux) or backslash (\, e.g. Windows) as therefore run on filesystems with slash (/, e.g. Linux) or backslash (\, e.g. Windows) as
path separator. Therefore we have to unify that. If we found our file we create an absolute path separator. Therefore we have to unify that. If we found our file we create an absolute
path representation on <b>//5</b>, so that we can use that information without knowing the basedir. path representation on <b>//5</b>, so that we can use that information without knowing the basedir.


+ 1
- 1
src/etc/printFailingTests.xsl View File

@@ -37,7 +37,7 @@
| <xsl:value-of select="$testsuite"/>.<xsl:value-of select="@name"/>() : <xsl:value-of select="failure/@message"/><xsl:value-of select="error/@message"/> | <xsl:value-of select="$testsuite"/>.<xsl:value-of select="@name"/>() : <xsl:value-of select="failure/@message"/><xsl:value-of select="error/@message"/>
</xsl:template> </xsl:template>


<!-- Supress log output from the tests like stacktraces -->
<!-- Suppress log output from the tests like stacktraces -->
<xsl:template match="text()"/> <xsl:template match="text()"/>






+ 3
- 3
src/etc/testcases/filters/tokenfilter.xml View File

@@ -184,7 +184,7 @@
</copy> </copy>
</target> </target>


<!-- need to check for existance of regex -->
<!-- need to check for existence of regex -->
<target name="replaceregex"> <target name="replaceregex">
<concat destfile="result/input"> <concat destfile="result/input">
hello Hello HELLO hello hello Hello HELLO hello
@@ -226,7 +226,7 @@
</concat> </concat>
</target> </target>


<!-- need to check for existance of regex -->
<!-- need to check for existence of regex -->
<target name="containsregex"> <target name="containsregex">
<concat destfile="result/input"> <concat destfile="result/input">
hello world hello world
@@ -256,7 +256,7 @@
</target> </target>




<!-- need to check for existance of regex -->
<!-- need to check for existence of regex -->
<target name="containsregex2"> <target name="containsregex2">
<concat destfile="result/input"> <concat destfile="result/input">
SUITE(TestSuite, bits); SUITE(TestSuite, bits);


+ 1
- 1
src/etc/testcases/taskdefs/concat.xml View File

@@ -63,7 +63,7 @@
<filelist dir="${basedir}" files="thisfiledoesnotexist"/> <filelist dir="${basedir}" files="thisfiledoesnotexist"/>
</concat> </concat>
<available file="TESTDEST" property="TESTDEST.was.created"/> <available file="TESTDEST" property="TESTDEST.was.created"/>
<fail message="TESTDEST created for nonexistant files"
<fail message="TESTDEST created for nonexistent files"
if="TESTDEST.was.created"/> if="TESTDEST.was.created"/>
</target> </target>




+ 1
- 1
src/etc/testcases/taskdefs/optional/antlr/antlr.xml View File

@@ -74,7 +74,7 @@
</target> </target>


<target name="test8" depends="setup"> <target name="test8" depends="setup">
<antlr target="extended.calc.g" outputdirectory="${tmp.dir}" glib="non-existant-file.g"/>
<antlr target="extended.calc.g" outputdirectory="${tmp.dir}" glib="non-existent-file.g"/>
</target> </target>


<target name="test9" depends="setup"> <target name="test9" depends="setup">


+ 1
- 1
src/main/org/apache/tools/ant/DirectoryScanner.java View File

@@ -1851,7 +1851,7 @@ public class DirectoryScanner
* *
* <p>Can only happen if the given directory has been seen at * <p>Can only happen if the given directory has been seen at
* least more often than allowed during the current scan and it is * least more often than allowed during the current scan and it is
* a symbolic link and enough other occurences of the same name
* a symbolic link and enough other occurrences of the same name
* higher up are symbolic links that point to the same place.</p> * higher up are symbolic links that point to the same place.</p>
* *
* @since Ant 1.8.0 * @since Ant 1.8.0


+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/Available.java View File

@@ -245,7 +245,7 @@ public class Available extends Task implements Condition {
Project.MSG_WARN); Project.MSG_WARN);
} }
// NB: this makes use of Project#setProperty rather than Project#setNewProperty // NB: this makes use of Project#setProperty rather than Project#setNewProperty
// due to backwards compatiblity reasons
// due to backwards compatibility reasons
ph.setProperty(property, value, true); ph.setProperty(property, value, true);
} }
} finally { } finally {


+ 2
- 2
src/main/org/apache/tools/ant/taskdefs/Concat.java View File

@@ -475,9 +475,9 @@ public class Concat extends Task implements ResourceCollection {
private boolean forceOverwrite = true; private boolean forceOverwrite = true;
/** overwrite read-only files */ /** overwrite read-only files */
private boolean force = false; private boolean force = false;
/** String to place at the start of the concatented stream */
/** String to place at the start of the concatenated stream */
private TextElement footer; private TextElement footer;
/** String to place at the end of the concatented stream */
/** String to place at the end of the concatenated stream */
private TextElement header; private TextElement header;
/** add missing line.separator to files **/ /** add missing line.separator to files **/
private boolean fixLastLine = false; private boolean fixLastLine = false;


+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/Jar.java View File

@@ -825,7 +825,7 @@ public class Jar extends Zip {
// this pass is only there to construct the merged // this pass is only there to construct the merged
// manifest this means we claim an update was needed and // manifest this means we claim an update was needed and
// only include the manifests, skipping any uptodate // only include the manifests, skipping any uptodate
// checks here defering them for the second run
// checks here deferring them for the second run
Resource[][] manifests = grabManifests(rcs); Resource[][] manifests = grabManifests(rcs);
int count = 0; int count = 0;
for (int i = 0; i < manifests.length; i++) { for (int i = 0; i < manifests.length; i++) {


+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java View File

@@ -991,7 +991,7 @@ public class NetRexxC extends MatchingTask {
* Takes a classpath-like string, and adds each element of this string to * Takes a classpath-like string, and adds each element of this string to
* a new classpath, if the components exist. Components that don't exist, * a new classpath, if the components exist. Components that don't exist,
* aren't added. We do this, because jikes issues warnings for * aren't added. We do this, because jikes issues warnings for
* non-existant files/dirs in his classpath, and these warnings are pretty
* non-existent files/dirs in his classpath, and these warnings are pretty
* annoying. * annoying.
* *
* @param target - target classpath * @param target - target classpath


+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java View File

@@ -363,7 +363,7 @@ public class TraXLiaison implements XSLTLiaison4, ErrorListener, XSLTLoggerAware
} }


/** /**
* Sets the paramters for the transformer.
* Sets the parameters for the transformer.
*/ */
private void setTransformationParameters() { private void setTransformationParameters() {
for (final Enumeration enumeration = params.keys(); for (final Enumeration enumeration = params.keys();


+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java View File

@@ -99,7 +99,7 @@ public class XMLValidateTask extends Task {
private final Vector propertyList = new Vector(); private final Vector propertyList = new Vector();


private XMLCatalog xmlCatalog = new XMLCatalog(); private XMLCatalog xmlCatalog = new XMLCatalog();
/** Message for sucessfull validation */
/** Message for successfull validation */
public static final String MESSAGE_FILES_VALIDATED public static final String MESSAGE_FILES_VALIDATED
= " file(s) have been successfully validated."; = " file(s) have been successfully validated.";




+ 6
- 6
src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatability.java View File

@@ -18,7 +18,7 @@
package org.apache.tools.ant.taskdefs.optional.extension; package org.apache.tools.ant.taskdefs.optional.extension;


/** /**
* Enum used in (@link Extension) to indicate the compatability
* Enum used in (@link Extension) to indicate the compatibility
* of one extension to another. See (@link Extension) for instances * of one extension to another. See (@link Extension) for instances
* of object. * of object.
* *
@@ -33,23 +33,23 @@ package org.apache.tools.ant.taskdefs.optional.extension;
*/ */
public final class Compatability { public final class Compatability {
/** /**
* A string representaiton of compatability level.
* A string representation of compatibility level.
*/ */
private final String name; private final String name;


/** /**
* Create a compatability enum with specified name.
* Create a compatibility enum with specified name.
* *
* @param name the name of compatability level
* @param name the name of compatibility level
*/ */
Compatability(final String name) { Compatability(final String name) {
this.name = name; this.name = name;
} }


/** /**
* Return name of compatability level.
* Return name of compatibility level.
* *
* @return the name of compatability level
* @return the name of compatibility level
*/ */
public String toString() { public String toString() {
return name; return name;


+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatibility.java View File

@@ -33,7 +33,7 @@ package org.apache.tools.ant.taskdefs.optional.extension;
*/ */
public final class Compatibility { public final class Compatibility {
/** /**
* A string representaiton of compatibility level.
* A string representation of compatibility level.
*/ */
private final String name; private final String name;




+ 3
- 3
src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java View File

@@ -602,9 +602,9 @@ public final class Extension {
return; return;
} }


final String[] extentions = split(names, " ");
for (int i = 0; i < extentions.length; i++) {
final String prefix = extentions[ i ] + "-";
final String[] extensions = split(names, " ");
for (int i = 0; i < extensions.length; i++) {
final String prefix = extensions[ i ] + "-";
final Extension extension = getExtension(prefix, attributes); final Extension extension = getExtension(prefix, attributes);


if (null != extension) { if (null != extension) {


+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java View File

@@ -253,7 +253,7 @@ public final class JarLibManifestTask extends Task {
* Append an attribute such as "Extension-List: lib0 lib1 lib2" * Append an attribute such as "Extension-List: lib0 lib1 lib2"
* using specified prefix and counting up to specified size. * using specified prefix and counting up to specified size.
* Also use specified extensionKey so that can generate list of * Also use specified extensionKey so that can generate list of
* optional dependencies aswell.
* optional dependencies as well.
* *
* @param size the number of librarys to list * @param size the number of librarys to list
* @param listPrefix the prefix for all librarys * @param listPrefix the prefix for all librarys


+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java View File

@@ -608,7 +608,7 @@ public class JspC extends MatchingTask {
* </ol> * </ol>
* @param srcFile JSP source file * @param srcFile JSP source file
* @param javaFile JSP dest file * @param javaFile JSP dest file
* @return true if a compile is definately needed.
* @return true if a compile is definitely needed.
* *
*/ */
private boolean isCompileNeeded(File srcFile, File javaFile) { private boolean isCompileNeeded(File srcFile, File javaFile) {


+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java View File

@@ -311,7 +311,7 @@ public class WLJspc extends MatchingTask {




/** /**
* Replace occurances of a string with a replacement string.
* Replace occurrences of a string with a replacement string.
* @param inpString the string to convert. * @param inpString the string to convert.
* @param escapeChars the string to replace. * @param escapeChars the string to replace.
* @param replaceChars the string to place. * @param replaceChars the string to place.


+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java View File

@@ -387,7 +387,7 @@ public class RExecTask extends Task {
} }
/** /**
* Process a 'typical' login. If it differs, use the read * Process a 'typical' login. If it differs, use the read
* and write tasks explicitely
* and write tasks explicitly
*/ */
private void login(AntRExecClient rexec) { private void login(AntRExecClient rexec) {
if (addCarriageReturn) { if (addCarriageReturn) {


+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java View File

@@ -131,7 +131,7 @@ public class TelnetTask extends Task {


/** /**
* Process a 'typical' login. If it differs, use the read * Process a 'typical' login. If it differs, use the read
* and write tasks explicitely
* and write tasks explicitly
*/ */
private void login(AntTelnetClient telnet) { private void login(AntTelnetClient telnet) {
if (addCarriageReturn) { if (addCarriageReturn) {


+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java View File

@@ -54,7 +54,7 @@ import org.apache.tools.ant.util.FileUtils;


* *
* <b>19-04-2001</b> <p>The task now has a more robust * <b>19-04-2001</b> <p>The task now has a more robust
* parser. It allows for platform independant file paths
* parser. It allows for platform independent file paths
* and supports file names with <i>()</i>. Thanks to Erik Husby for * and supports file names with <i>()</i>. Thanks to Erik Husby for
* bringing the bug to my attention. * bringing the bug to my attention.
* *


+ 2
- 2
src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java View File

@@ -757,7 +757,7 @@ public abstract class MSVSS extends Task implements MSVSSConstants {
} }


/** /**
* Extention of EnumeratedAttribute to hold the values for file time stamp.
* Extension of EnumeratedAttribute to hold the values for file time stamp.
*/ */
public static class CurrentModUpdated extends EnumeratedAttribute { public static class CurrentModUpdated extends EnumeratedAttribute {
/** /**
@@ -770,7 +770,7 @@ public abstract class MSVSS extends Task implements MSVSSConstants {
} }


/** /**
* Extention of EnumeratedAttribute to hold the values for writable filess.
* Extension of EnumeratedAttribute to hold the values for writable filess.
*/ */
public static class WritableFiles extends EnumeratedAttribute { public static class WritableFiles extends EnumeratedAttribute {
/** /**


+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java View File

@@ -185,7 +185,7 @@ public class MSVSSHISTORY extends MSVSS {
} }


/** /**
* Extention of EnumeratedAttribute to hold the values for style.
* Extension of EnumeratedAttribute to hold the values for style.
*/ */
public static class BriefCodediffNofile extends EnumeratedAttribute { public static class BriefCodediffNofile extends EnumeratedAttribute {
/** /**


+ 1
- 1
src/main/org/apache/tools/ant/types/Environment.java View File

@@ -106,7 +106,7 @@ public class Environment {
} }


/** /**
* get the assigment string
* get the assignment string
* This is not ready for insertion into a property file without following * This is not ready for insertion into a property file without following
* the escaping rules of the properties class. * the escaping rules of the properties class.
* @return a string of the form key=value. * @return a string of the form key=value.


+ 1
- 1
src/main/org/apache/tools/ant/types/optional/image/ColorMapper.java View File

@@ -40,7 +40,7 @@ public final class ColorMapper {
public static final String COLOR_GRAY = "gray"; public static final String COLOR_GRAY = "gray";
/** lightgray string */ /** lightgray string */
public static final String COLOR_LIGHTGRAY = "lightgray"; public static final String COLOR_LIGHTGRAY = "lightgray";
// Gotta atleast put in the proper spelling :-P
// Gotta at least put in the proper spelling :-P
/** darkgrey string */ /** darkgrey string */
public static final String COLOR_DARKGREY = "darkgrey"; public static final String COLOR_DARKGREY = "darkgrey";
/** grey string */ /** grey string */


+ 5
- 5
src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java View File

@@ -817,7 +817,7 @@ public class ModifiedSelector extends BaseExtendSelector


/** /**
* Signals that a target has finished. * Signals that a target has finished.
* @param event recieved BuildEvent
* @param event received BuildEvent
*/ */
public void targetFinished(BuildEvent event) { public void targetFinished(BuildEvent event) {
if (getDelayUpdate()) { if (getDelayUpdate()) {
@@ -828,7 +828,7 @@ public class ModifiedSelector extends BaseExtendSelector


/** /**
* Signals that a task has finished. * Signals that a task has finished.
* @param event recieved BuildEvent
* @param event received BuildEvent
*/ */
public void taskFinished(BuildEvent event) { public void taskFinished(BuildEvent event) {
if (getDelayUpdate()) { if (getDelayUpdate()) {
@@ -839,7 +839,7 @@ public class ModifiedSelector extends BaseExtendSelector


/** /**
* Signals that a build has started. * Signals that a build has started.
* @param event recieved BuildEvent
* @param event received BuildEvent
*/ */
public void buildStarted(BuildEvent event) { public void buildStarted(BuildEvent event) {
// no-op // no-op
@@ -858,7 +858,7 @@ public class ModifiedSelector extends BaseExtendSelector


/** /**
* Signals that a task is starting. * Signals that a task is starting.
* @param event recieved BuildEvent
* @param event received BuildEvent
*/ */
public void taskStarted(BuildEvent event) { public void taskStarted(BuildEvent event) {
// no-op // no-op
@@ -867,7 +867,7 @@ public class ModifiedSelector extends BaseExtendSelector


/** /**
* Signals a message logging event. * Signals a message logging event.
* @param event recieved BuildEvent
* @param event received BuildEvent
*/ */
public void messageLogged(BuildEvent event) { public void messageLogged(BuildEvent event) {
// no-op // no-op


+ 2
- 2
src/main/org/apache/tools/ant/util/ResourceUtils.java View File

@@ -567,9 +567,9 @@ public class ResourceUtils {
/** /**
* Binary compares the contents of two Resources. * Binary compares the contents of two Resources.
* <p> * <p>
* simple but sub-optimal comparision algorithm. written for working
* simple but sub-optimal comparison algorithm. written for working
* rather than fast. Better would be a block read into buffers followed * rather than fast. Better would be a block read into buffers followed
* by long comparisions apart from the final 1-7 bytes.
* by long comparisons apart from the final 1-7 bytes.
* </p> * </p>
* *
* @param r1 the Resource whose content is to be compared. * @param r1 the Resource whose content is to be compared.


+ 1
- 1
src/main/org/apache/tools/bzip2/CBZip2InputStream.java View File

@@ -1031,7 +1031,7 @@ public class CBZip2InputStream extends InputStream implements BZip2Constants {
* *
* This method is called when the required length of the array * This method is called when the required length of the array
* is known. I don't initialize it at construction time to * is known. I don't initialize it at construction time to
* avoid unneccessary memory allocation when compressing small
* avoid unnecessary memory allocation when compressing small
* files. * files.
*/ */
final int[] initTT(int length) { final int[] initTT(int length) {


+ 1
- 1
src/main/org/apache/tools/zip/ZipEncodingHelper.java View File

@@ -194,7 +194,7 @@ public abstract class ZipEncodingHelper {
static final String UTF8 = "UTF8"; static final String UTF8 = "UTF8";


/** /**
* variant name of the encoding UTF-8 used for comparisions.
* variant name of the encoding UTF-8 used for comparisons.
*/ */
private static final String UTF_DASH_8 = "utf-8"; private static final String UTF_DASH_8 = "utf-8";




+ 3
- 3
src/tests/antunit/taskdefs/defaultexcludes-test.xml View File

@@ -23,7 +23,7 @@
<available property="in working copy" file=".svn"/> <available property="in working copy" file=".svn"/>
</target> </target>


<target name="testCopyNoExplictExcludes" depends="setUp"
<target name="testCopyNoExplicitExcludes" depends="setUp"
if="in working copy"> if="in working copy">
<copy todir="${output}"> <copy todir="${output}">
<fileset dir="."/> <fileset dir="."/>
@@ -32,7 +32,7 @@
<au:assertFileDoesntExist file="${output}/.svn/entries"/> <au:assertFileDoesntExist file="${output}/.svn/entries"/>
</target> </target>


<target name="testCopyExplictExcludes" depends="setUp"
<target name="testCopyExplicitExcludes" depends="setUp"
if="in working copy"> if="in working copy">
<copy todir="${output}"> <copy todir="${output}">
<fileset dir="." defaultexcludes="true"/> <fileset dir="." defaultexcludes="true"/>
@@ -41,7 +41,7 @@
<au:assertFileDoesntExist file="${output}/.svn/entries"/> <au:assertFileDoesntExist file="${output}/.svn/entries"/>
</target> </target>


<target name="testCopyExplictNoExcludes" depends="setUp"
<target name="testCopyExplicitNoExcludes" depends="setUp"
if="in working copy"> if="in working copy">
<copy todir="${output}"> <copy todir="${output}">
<fileset dir="." defaultexcludes="false"/> <fileset dir="." defaultexcludes="false"/>


+ 1
- 1
src/tests/junit/org/apache/tools/ant/ProjectHelperRepositoryTest.java View File

@@ -71,7 +71,7 @@ public class ProjectHelperRepositoryTest extends TestCase {
assertTrue(helper instanceof ProjectHelper2); assertTrue(helper instanceof ProjectHelper2);
} }


public void testNoDefaultContructor() throws Exception {
public void testNoDefaultConstructor() throws Exception {
class IncrrectHelper extends ProjectHelper { class IncrrectHelper extends ProjectHelper {
// the default constructor is not visible to ant here // the default constructor is not visible to ant here
} }


+ 2
- 2
src/tests/junit/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java View File

@@ -25,7 +25,7 @@ import java.util.Properties;
import org.apache.tools.ant.BuildFileTest; import org.apache.tools.ant.BuildFileTest;


/** /**
* JUnit testcase that excercises the optional PropertyFile task in ant.
* JUnit testcase that exercises the optional PropertyFile task in ant.
* (this is really more of a functional test so far.., but it's enough to let * (this is really more of a functional test so far.., but it's enough to let
* me start refactoring...) * me start refactoring...)
* *
@@ -70,7 +70,7 @@ public class PropertyFileTest extends BuildFileTest {
} }


/** /**
* A unit test for JUnit- Excercises the propertyfile tasks ability to
* A unit test for JUnit- Exercises the propertyfile tasks ability to
* update properties that are already defined- * update properties that are already defined-
*/ */
public void testUpdatesExistingProperties() throws Exception { public void testUpdatesExistingProperties() throws Exception {


Loading…
Cancel
Save