Browse Source

PR 56748 Spelling fixes, submitted by Ville Skyttä

master
Ville Skyttä Stefan Bodewig 11 years ago
parent
commit
43844a7e6b
42 changed files with 59 additions and 59 deletions
  1. +4
    -4
      WHATSNEW
  2. +1
    -1
      manual/Tasks/ear.html
  3. +2
    -2
      manual/Tasks/javac.html
  4. +1
    -1
      manual/Tasks/junit.html
  5. +1
    -1
      manual/Types/propertyset.html
  6. +3
    -3
      manual/Types/selectors.html
  7. +2
    -2
      manual/argumentprocessor.html
  8. +2
    -2
      src/main/org/apache/tools/ant/DemuxOutputStream.java
  9. +1
    -1
      src/main/org/apache/tools/ant/filters/FixCrLfFilter.java
  10. +1
    -1
      src/main/org/apache/tools/ant/filters/SortFilter.java
  11. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/Execute.java
  12. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/MacroDef.java
  13. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/ManifestTask.java
  14. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/Replace.java
  15. +2
    -2
      src/main/org/apache/tools/ant/taskdefs/SignJar.java
  16. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
  17. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/condition/Os.java
  18. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
  19. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
  20. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
  21. +2
    -2
      src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
  22. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
  23. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java
  24. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/extension/LibFileSet.java
  25. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
  26. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java
  27. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapter.java
  28. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java
  29. +2
    -2
      src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
  30. +2
    -2
      src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
  31. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
  32. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
  33. +4
    -4
      src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
  34. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java
  35. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java
  36. +1
    -1
      src/main/org/apache/tools/ant/types/PropertySet.java
  37. +1
    -1
      src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java
  38. +1
    -1
      src/main/org/apache/tools/ant/util/DateUtils.java
  39. +2
    -2
      src/main/org/apache/tools/ant/util/LineOrientedOutputStream.java
  40. +1
    -1
      src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java
  41. +2
    -2
      src/main/org/apache/tools/bzip2/BlockSort.java
  42. +1
    -1
      src/main/org/apache/tools/mail/MailMessage.java

+ 4
- 4
WHATSNEW View File

@@ -1416,7 +1416,7 @@ Fixed bugs:
have full control. have full control.
Bugzilla Report 34638. Bugzilla Report 34638.


* <sql> would fail if the executed statment didn't return a result
* <sql> would fail if the executed statement didn't return a result
set with some JDBC driver that dissalow Statement.getResultSet to set with some JDBC driver that dissalow Statement.getResultSet to
be called in such a situation. be called in such a situation.
Bugzilla Report 36265 Bugzilla Report 36265
@@ -2582,7 +2582,7 @@ Fixed bugs:
* OOM caused by IH holding on to classes and thus their classloaders. * OOM caused by IH holding on to classes and thus their classloaders.
Bugzilla 28283 and 33061. Bugzilla 28283 and 33061.


* <delete> doesnt delete when defaultexcludes="false" and no includes is set
* <delete> doesn't delete when defaultexcludes="false" and no includes is set
fixed. Bugzilla 40313. fixed. Bugzilla 40313.


* Behavior change of DirectoryScanner/AbstractFileset when conditional include * Behavior change of DirectoryScanner/AbstractFileset when conditional include
@@ -2868,7 +2868,7 @@ Other changes:
distribution. Bugzilla 40980. distribution. Bugzilla 40980.


* Roll back automatic proxy enabling on Java 1.5. It broke things like * Roll back automatic proxy enabling on Java 1.5. It broke things like
Oracle JDBC drivers, and Ant itself on IBM's JVM on AIX, and didnt
Oracle JDBC drivers, and Ant itself on IBM's JVM on AIX, and didn't
seem to work to well the rest of the time. seem to work to well the rest of the time.
To enable the feature, use the -autoproxy command line option. To enable the feature, use the -autoproxy command line option.


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


* <jdepend> now supports a new nested element <classespath> which is * <jdepend> now supports a new nested element <classespath> which is
the same as <sourcespath> but point to compiled classes (the the same as <sourcespath> but point to compiled classes (the
prefered mode of operation for JDepend > 2.5). Additionally, nested
preferred mode of operation for JDepend > 2.5). Additionally, nested
<exclude> elements can be used to exclude certain packages from <exclude> elements can be used to exclude certain packages from
being parsed. Bugzilla Report 17134. being parsed. Bugzilla Report 17134.




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

@@ -258,7 +258,7 @@ to a value other than its default, <code>&quot;add&quot;</code>.</b></p>
</tr> </tr>
<tr> <tr>
<td valign="top">flattenAttributes</td> <td valign="top">flattenAttributes</td>
<td valign="top">Whether to merge attributes occuring more than
<td valign="top">Whether to merge attributes occurring more than
once in a section (this can only happen for the Class-Path once in a section (this can only happen for the Class-Path
attribute) into a single attribute. attribute) into a single attribute.
<em>Since Ant 1.8.0</em>.</td> <em>Since Ant 1.8.0</em>.</td>


+ 2
- 2
manual/Tasks/javac.html View File

@@ -428,11 +428,11 @@ invoking the compiler.</p>
The default value of this is "true" and this The default value of this is "true" and this
means that previously compiled classes are on means that previously compiled classes are on
the classpath for the compiler. This means that "greedy" compilers the classpath for the compiler. This means that "greedy" compilers
will not recompile dependant classes that are already compiled.
will not recompile dependent classes that are already compiled.
In general this is a good thing as it stops the compiler In general this is a good thing as it stops the compiler
for doing unnecessary work. However, for some edge cases, for doing unnecessary work. However, for some edge cases,
involving generics, the javac compiler involving generics, the javac compiler
needs to compile the dependant classes to get the generics
needs to compile the dependent classes to get the generics
information. One example is documented in the bug report: information. One example is documented in the bug report:
<a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=40776"> <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=40776">
Bug 40776 - a problem compiling a Java 5 project with generics</a>. Bug 40776 - a problem compiling a Java 5 project with generics</a>.


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

@@ -657,7 +657,7 @@ supported.</p>
<ul> <ul>
<li>It runs in the same Java VM as Ant itself, this is a different <li>It runs in the same Java VM as Ant itself, this is a different
Java VM than the one that was executing the test and it may see a Java VM than the one that was executing the test and it may see a
different classloader (and thus may be unable to load the tast
different classloader (and thus may be unable to load the test
class).</li> class).</li>
<li>It cannot determine which test was run when the timeout/crash <li>It cannot determine which test was run when the timeout/crash
occurred if the forked VM was running multiple test. I.e. the occurred if the forked VM was running multiple test. I.e. the


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

@@ -38,7 +38,7 @@ supports this.</p>
</tr> </tr>
<tr> <tr>
<td valign="top">dynamic</td> <td valign="top">dynamic</td>
<td valign="top">Whether to reevaluate the set everytime the set
<td valign="top">Whether to reevaluate the set every time the set
is used. Default is &quot;<code>true</code>&quot;.</td> is used. Default is &quot;<code>true</code>&quot;.</td>
<td valign="top" align="center">No</td> <td valign="top" align="center">No</td>
</tr> </tr>


+ 3
- 3
manual/Types/selectors.html View File

@@ -828,9 +828,9 @@
<li> <b> seldirs </b>: same as attribute seldirs </li> <li> <b> seldirs </b>: same as attribute seldirs </li>
<li> <b> algorithm.* </b>: Value is transferred to the algorithm via its <li> <b> algorithm.* </b>: Value is transferred to the algorithm via its
<i>set</i>XX-methods </li> <i>set</i>XX-methods </li>
<li> <b> cache.* </b>: Value is transfered to the cache via its
<li> <b> cache.* </b>: Value is transferred to the cache via its
<i>set</i>XX-methods </li> <i>set</i>XX-methods </li>
<li> <b> comparator.* </b>: Value is transfered to the comparator via its
<li> <b> comparator.* </b>: Value is transferred to the comparator via its
<i>set</i>XX-methods </li> <i>set</i>XX-methods </li>
</ul> </ul>


@@ -1248,7 +1248,7 @@ Select files whose filename length is even.
</pre></blockquote> </pre></blockquote>


<p>Selects all the JAR file larger than 4096 bytes which haven't been update <p>Selects all the JAR file larger than 4096 bytes which haven't been update
since the last millenium.
since the last millennium.
</p> </p>






+ 2
- 2
manual/argumentprocessor.html View File

@@ -37,7 +37,7 @@ Ant behaviour.
<p> <p>
An <code>ArgumentProcessor</code> is called each time Ant parse an unknown An <code>ArgumentProcessor</code> is called each time Ant parse an unknown
argument, an <code>ArgumentProcessor</code> doesn't take precedence over Ant to argument, an <code>ArgumentProcessor</code> doesn't take precedence over Ant to
parse already suported options. It is then recommended to thrid party
parse already suported options. It is then recommended to third party
<code>ArgumentProcessor</code> implementation to chose specific 'enough' <code>ArgumentProcessor</code> implementation to chose specific 'enough'
argument name, avoiding for instance one letter arguments. argument name, avoiding for instance one letter arguments.
</p> </p>
@@ -47,7 +47,7 @@ It is also called at the different phases so different behaviour can be
implemented. It is called just after every arguments are parsed, just implemented. It is called just after every arguments are parsed, just
before the project is being configured (the build file being parsed), before the project is being configured (the build file being parsed),
and just after. Some of the methods to be implemented return a boolean: and just after. Some of the methods to be implemented return a boolean:
if <code>true</code> is returned, Ant will terminate immediatly, without
if <code>true</code> is returned, Ant will terminate immediately, without
error. error.
</p> </p>




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

@@ -54,7 +54,7 @@ public class DemuxOutputStream extends OutputStream {
private static final int MAX_SIZE = 1024; private static final int MAX_SIZE = 1024;


/** Initial buffer size. */ /** Initial buffer size. */
private static final int INTIAL_SIZE = 132;
private static final int INITIAL_SIZE = 132;


/** Carriage return */ /** Carriage return */
private static final int CR = 0x0d; private static final int CR = 0x0d;
@@ -100,7 +100,7 @@ public class DemuxOutputStream extends OutputStream {
BufferInfo bufferInfo = (BufferInfo) buffers.get(current); BufferInfo bufferInfo = (BufferInfo) buffers.get(current);
if (bufferInfo == null) { if (bufferInfo == null) {
bufferInfo = new BufferInfo(); bufferInfo = new BufferInfo();
bufferInfo.buffer = new ByteArrayOutputStream(INTIAL_SIZE);
bufferInfo.buffer = new ByteArrayOutputStream(INITIAL_SIZE);
bufferInfo.crSeen = false; bufferInfo.crSeen = false;
buffers.put(current, bufferInfo); buffers.put(current, bufferInfo);
} }


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

@@ -343,7 +343,7 @@ public final class FixCrLfFilter extends BaseParamFilterReader implements Chaina
/** /**
* Indicate whether this stream contains Java source. * Indicate whether this stream contains Java source.
* *
* This attribute is only used in assocation with the &quot;<i><b>tab</b></i>&quot;
* This attribute is only used in association with the &quot;<i><b>tab</b></i>&quot;
* attribute. * attribute.
* *
* @param javafiles * @param javafiles


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

@@ -353,7 +353,7 @@ public final class SortFilter extends BaseParamFilterReader
} }


/** /**
* Sorts the read lines (<code>lines</code>)acording to the sorting
* Sorts the read lines (<code>lines</code>) according to the sorting
* criteria defined by the user. * criteria defined by the user.
* *
*/ */


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

@@ -617,7 +617,7 @@ public class Execute {
for (int i = 0; i < env.length; i++) { for (int i = 0; i < env.length; i++) {
String keyValue = env[i]; String keyValue = env[i];
String key = keyValue.substring(0, keyValue.indexOf('=')); String key = keyValue.substring(0, keyValue.indexOf('='));
// Find the key in the current enviroment copy
// Find the key in the current environment copy
// and remove it. // and remove it.


// Try without changing case first // Try without changing case first


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

@@ -695,7 +695,7 @@ public class MacroDef extends AntlibDefinition {
* runtime info. * runtime info.
* *
* @param obj an <code>Object</code> value * @param obj an <code>Object</code> value
* @param same if true test for sameness, otherwise just similiar
* @param same if true test for sameness, otherwise just similar
* @return a <code>boolean</code> value * @return a <code>boolean</code> value
*/ */
private boolean sameOrSimilar(Object obj, boolean same) { private boolean sameOrSimilar(Object obj, boolean same) {


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

@@ -136,7 +136,7 @@ public class ManifestTask extends Task {
} }


/** /**
* Checks the attribute agains the Jar-specification.
* Checks the attribute against the Jar-specification.
* *
* Jar-Specification <i>"Name-Value pairs and Sections"</i>: <pre> * Jar-Specification <i>"Name-Value pairs and Sections"</i>: <pre>
* name: alphanum *headerchar * name: alphanum *headerchar


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

@@ -482,7 +482,7 @@ public class Replace extends MatchingTask {


/** /**
* Do the execution. * Do the execution.
* @throws BuildException if we cant build
* @throws BuildException if we can't build
*/ */
public void execute() throws BuildException { public void execute() throws BuildException {




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

@@ -395,7 +395,7 @@ public class SignJar extends AbstractJarSignerTask {
throw new BuildException(ERROR_SIGNEDJAR_AND_PATHS); throw new BuildException(ERROR_SIGNEDJAR_AND_PATHS);
} }


//this isnt strictly needed, but by being fussy now,
//this isn't strictly needed, but by being fussy now,
//we can change implementation details later //we can change implementation details later
if (!hasDestDir && hasMapper) { if (!hasDestDir && hasMapper) {
throw new BuildException(ERROR_MAPPER_WITHOUT_DEST); throw new BuildException(ERROR_MAPPER_WITHOUT_DEST);
@@ -569,7 +569,7 @@ public class SignJar extends AbstractJarSignerTask {
/** /**
* <p>Compare a jar file with its corresponding signed jar. The logic for this * <p>Compare a jar file with its corresponding signed jar. The logic for this
* is complex, and best explained in the source itself. Essentially if * is complex, and best explained in the source itself. Essentially if
* either file doesnt exist, or the destfile has an out of date timestamp,
* either file doesn't exist, or the destfile has an out of date timestamp,
* then the return value is false.</p> * then the return value is false.</p>
* *
* <p>If we are signing ourself, the check {@link #isSigned(File)} is used to * <p>If we are signing ourself, the check {@link #isSigned(File)} is used to


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

@@ -1131,7 +1131,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
* </ul> * </ul>
* <p>The parameter will be then passed to the XSLT template.</p> * <p>The parameter will be then passed to the XSLT template.</p>
* *
* <p>Default type (if omited) is primitive String. So if the expression is e.g
* <p>Default type (if omitted) is primitive String. So if the expression is e.g
* "true" with no type, in XSLT it will be only a text string, not true * "true" with no type, in XSLT it will be only a text string, not true
* boolean.</p> * boolean.</p>
* *


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

@@ -266,7 +266,7 @@ public class Os implements Condition {
|| OS_NAME.indexOf("98") >= 0 || OS_NAME.indexOf("98") >= 0
|| OS_NAME.indexOf("me") >= 0 || OS_NAME.indexOf("me") >= 0
//wince isn't really 9x, but crippled enough to //wince isn't really 9x, but crippled enough to
//be a muchness. Ant doesnt run on CE, anyway.
//be a muchness. Ant doesn't run on CE, anyway.
|| OS_NAME.indexOf("ce") >= 0); || OS_NAME.indexOf("ce") >= 0);
isNT = !is9x; isNT = !is9x;
} }


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

@@ -709,7 +709,7 @@ public class PropertyFile extends Task {


/** /**
* Convert the value to a Calendar field index. * Convert the value to a Calendar field index.
* @return the calander value.
* @return the calendar value.
*/ */
public int getCalendarField() { public int getCalendarField() {
String key = getValue().toLowerCase(); String key = getValue().toLowerCase();


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

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


/** /**
* Specific configuration for the TRaX liaison. * Specific configuration for the TRaX liaison.
* @param xsltTask the XSLTProcess task instance from which this liasion
* @param xsltTask the XSLTProcess task instance from which this liaison
* is to be configured. * is to be configured.
*/ */
public void configure(final XSLTProcess xsltTask) { public void configure(final XSLTProcess xsltTask) {


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

@@ -98,7 +98,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 successfull validation */
/** Message for successful 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.";




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

@@ -698,7 +698,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool {
* weblogic jar file can remain the same. If the Interfaces, ie. the * weblogic jar file can remain the same. If the Interfaces, ie. the
* method signatures change or if the xml deployment descriptors changed, * method signatures change or if the xml deployment descriptors changed,
* the whole jar needs to be rebuilt with ejbc. This is not strictly true * the whole jar needs to be rebuilt with ejbc. This is not strictly true
* for the xml files. If the JNDI name changes then the jar doesnt have to
* for the xml files. If the JNDI name changes then the jar doesn't have to
* be rebuild, but if the resources references change then it does. At * be rebuild, but if the resources references change then it does. At
* this point the weblogic jar gets rebuilt if the xml files change at * this point the weblogic jar gets rebuilt if the xml files change at
* all. * all.
@@ -794,7 +794,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool {
} }
} }
} else { } else {
// a file doesnt exist rebuild
// a file doesn't exist rebuild


log("File " + filepath + " not present in weblogic jar", log("File " + filepath + " not present in weblogic jar",
Project.MSG_VERBOSE); Project.MSG_VERBOSE);


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

@@ -666,7 +666,7 @@ public class WebsphereDeploymentTool extends GenericDeploymentTool {
* websphere jar file can remain the same. If the Interfaces, ie. the * websphere jar file can remain the same. If the Interfaces, ie. the
* method signatures change or if the xml deployment descriptors changed, * method signatures change or if the xml deployment descriptors changed,
* the whole jar needs to be rebuilt with ejbdeploy. This is not strictly * the whole jar needs to be rebuilt with ejbdeploy. This is not strictly
* true for the xml files. If the JNDI name changes then the jar doesnt
* true for the xml files. If the JNDI name changes then the jar doesn't
* have to be rebuild, but if the resources references change then it * have to be rebuild, but if the resources references change then it
* does. At this point the websphere jar gets rebuilt if the xml files * does. At this point the websphere jar gets rebuilt if the xml files
* change at all. * change at all.


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

@@ -202,7 +202,7 @@ public class JarLibResolveTask extends Task {


/** /**
* Check if specified file satisfies extension. * Check if specified file satisfies extension.
* If it does then set the relevent property
* If it does then set the relevant property
* else throw a BuildException. * else throw a BuildException.
* *
* @param file the candidate library * @param file the candidate library


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

@@ -21,7 +21,7 @@ import org.apache.tools.ant.types.FileSet;


/** /**
* LibFileSet represents a fileset containing libraries. * LibFileSet represents a fileset containing libraries.
* Asociated with the libraries is data pertaining to
* Associated with the libraries is data pertaining to
* how they are to be handled when building manifests. * how they are to be handled when building manifests.
* *
*/ */


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

@@ -575,7 +575,7 @@ public class Translate extends MatchingTask {


// we found a starttoken, is there an endtoken following? // we found a starttoken, is there an endtoken following?
// start at token+tokenlength because start and end // start at token+tokenlength because start and end
// token may be indentical
// token may be identical
int endIndex = line.indexOf(endToken, startIndex int endIndex = line.indexOf(endToken, startIndex
+ startToken.length()); + startToken.length());
if (endIndex < 0) { if (endIndex < 0) {


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

@@ -144,7 +144,7 @@ public class JspNameMangler implements JspMangler {
/** /**
* taking in the substring representing the path relative to the source dir * taking in the substring representing the path relative to the source dir
* return a new string representing the destination path * return a new string representing the destination path
* not supported, as jasper in tomcat4.0 doesnt either
* not supported, as jasper in tomcat4.0 doesn't either
* @param path not used * @param path not used
* @return null always. * @return null always.
*/ */


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

@@ -25,7 +25,7 @@ import org.apache.tools.ant.taskdefs.optional.jsp.JspMangler;
* The interface that all jsp compiler adapters must adher to. * The interface that all jsp compiler adapters must adher to.
* *
* <p>A compiler adapter is an adapter that interprets the jspc's * <p>A compiler adapter is an adapter that interprets the jspc's
* parameters in preperation to be passed off to the compiler this
* parameters in preparation to be passed off to the compiler this
* adapter represents. As all the necessary values are stored in the * adapter represents. As all the necessary values are stored in the
* Jspc task itself, the only thing all adapters need is the jsp * Jspc task itself, the only thing all adapters need is the jsp
* task, the execute command and a parameterless constructor (for * task, the execute command and a parameterless constructor (for


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

@@ -279,7 +279,7 @@ public class FailureRecorder extends ProjectComponent implements JUnitResultForm
writer.newLine(); writer.newLine();
writer.write("public class "); writer.write("public class ");
writer.write(className); writer.write(className);
// If this class does not extend TC, Ant doesnt run these
// If this class does not extend TC, Ant doesn't run these
writer.write(" extends TestCase {"); writer.write(" extends TestCase {");
writer.newLine(); writer.newLine();
// standard String-constructor // standard String-constructor


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

@@ -941,7 +941,7 @@ public class FTP extends Task implements FTPTaskConfig {
return relativePath; return relativePath;
} }
/** /**
* get thge relative path of this file
* get the relative path of this file
* @param currentPath base path * @param currentPath base path
* @param currentRelativePath relative path of the base path with regards to remote dir * @param currentRelativePath relative path of the base path with regards to remote dir
* @return relative path * @return relative path
@@ -1970,7 +1970,7 @@ public class FTP extends Task implements FTPTaskConfig {
ftp.deleteFile(ftpFiles[0].getName()); ftp.deleteFile(ftpFiles[0].getName());
} }
// delegate the deletion of the local temp file to the delete task // delegate the deletion of the local temp file to the delete task
// because of race conditions occuring on Windows
// because of race conditions occurring on Windows
Delete mydelete = new Delete(); Delete mydelete = new Delete();
mydelete.bindToOwner(this); mydelete.bindToOwner(this);
mydelete.setFile(tempFile.getCanonicalFile()); mydelete.setFile(tempFile.getCanonicalFile());


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

@@ -844,7 +844,7 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror {
return relativePath; return relativePath;
} }
/** /**
* get thge relative path of this file
* get the relative path of this file
* @param currentPath base path * @param currentPath base path
* @param currentRelativePath relative path of the base path with regards to remote dir * @param currentRelativePath relative path of the base path with regards to remote dir
* @return relative path * @return relative path
@@ -1359,7 +1359,7 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror {
ftp.deleteFile(ftpFiles[0].getName()); ftp.deleteFile(ftpFiles[0].getName());
} }
// delegate the deletion of the local temp file to the delete task // delegate the deletion of the local temp file to the delete task
// because of race conditions occuring on Windows
// because of race conditions occurring on Windows
Delete mydelete = new Delete(); Delete mydelete = new Delete();
mydelete.bindToOwner(task); mydelete.bindToOwner(task);
mydelete.setFile(tempFile.getCanonicalFile()); mydelete.setFile(tempFile.getCanonicalFile());


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

@@ -51,7 +51,7 @@ import org.apache.tools.ant.util.FileUtils;
* of PVCS (get and pcli) and must have access to the repository. Note that the way to specify * of PVCS (get and pcli) and must have access to the repository. Note that the way to specify
* the repository is platform dependent so use property to specify location of repository. * the repository is platform dependent so use property to specify location of repository.
* <br> * <br>
* This version has been tested agains PVCS version 6.5 and 6.6 under Windows and Solaris.
* This version has been tested against PVCS version 6.5 and 6.6 under Windows and Solaris.


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


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

@@ -198,7 +198,7 @@ public class AntSoundPlayer implements LineListener, BuildListener {
*/ */
public void buildFinished(BuildEvent event) { public void buildFinished(BuildEvent event) {
if (event.getException() == null && fileSuccess != null) { if (event.getException() == null && fileSuccess != null) {
// build successfull!
// build successful!
play(event.getProject(), fileSuccess, loopsSuccess, durationSuccess); play(event.getProject(), fileSuccess, loopsSuccess, durationSuccess);
} else if (event.getException() != null && fileFail != null) { } else if (event.getException() != null && fileFail != null) {
play(event.getProject(), fileFail, loopsFail, durationFail); play(event.getProject(), fileFail, loopsFail, durationFail);


+ 4
- 4
src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java View File

@@ -82,7 +82,7 @@ public class Scp extends SSHBase {
} }


/** /**
* Similiar to {@link #setFile setFile} but explicitly states that
* Similar to {@link #setFile setFile} but explicitly states that
* the file is a local file. This is the only way to specify a * the file is a local file. This is the only way to specify a
* local file with a @ character. * local file with a @ character.
* @param aFromUri a string representing the source of the copy. * @param aFromUri a string representing the source of the copy.
@@ -94,7 +94,7 @@ public class Scp extends SSHBase {
} }


/** /**
* Similiar to {@link #setFile setFile} but explicitly states that
* Similar to {@link #setFile setFile} but explicitly states that
* the file is a remote file. * the file is a remote file.
* @param aFromUri a string representing the source of the copy. * @param aFromUri a string representing the source of the copy.
* @since Ant 1.6.2 * @since Ant 1.6.2
@@ -106,7 +106,7 @@ public class Scp extends SSHBase {
} }


/** /**
* Similiar to {@link #setTodir setTodir} but explicitly states
* Similar to {@link #setTodir setTodir} but explicitly states
* that the directory is a local. This is the only way to specify * that the directory is a local. This is the only way to specify
* a local directory with a @ character. * a local directory with a @ character.
* @param aToUri a string representing the target of the copy. * @param aToUri a string representing the target of the copy.
@@ -127,7 +127,7 @@ public class Scp extends SSHBase {
} }


/** /**
* Similiar to {@link #setTodir setTodir} but explicitly states
* Similar to {@link #setTodir setTodir} but explicitly states
* that the directory is a remote. * that the directory is a remote.
* @param aToUri a string representing the target of the copy. * @param aToUri a string representing the target of the copy.
* @since Ant 1.6.2 * @since Ant 1.6.2


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

@@ -27,7 +27,7 @@ import org.apache.tools.ant.util.FileNameMapper;
* The interface that all rmic adapters must adhere to. * The interface that all rmic adapters must adhere to.
* *
* <p>A rmic adapter is an adapter that interprets the rmic's * <p>A rmic adapter is an adapter that interprets the rmic's
* parameters in preperation to be passed off to the compiler this
* parameters in preparation to be passed off to the compiler this
* adapter represents. As all the necessary values are stored in the * adapter represents. As all the necessary values are stored in the
* Rmic task itself, the only thing all adapters need is the rmic * Rmic task itself, the only thing all adapters need is the rmic
* task, the execute command and a parameterless constructor (for * task, the execute command and a parameterless constructor (for


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

@@ -21,7 +21,7 @@ import org.apache.tools.ant.types.Commandline;


/** /**
* Run rmic in a new process with -Xnew set. * Run rmic in a new process with -Xnew set.
* This switches rmic to use a new compiler, one that doesnt work in-process
* This switches rmic to use a new compiler, one that doesn't work in-process
* on ant on java1.6. * on ant on java1.6.
* see: <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=38732"> * see: <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=38732">
* http://issues.apache.org/bugzilla/show_bug.cgi?id=38732</a> * http://issues.apache.org/bugzilla/show_bug.cgi?id=38732</a>


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

@@ -224,7 +224,7 @@ public class PropertySet extends DataType implements ResourceCollection {
} }


/** /**
* Set whether to reevaluate the set everytime the set is used.
* Set whether to reevaluate the set every time the set is used.
* Default is true. * Default is true.
* *
* @param dynamic if true, reevaluate the property set each time * @param dynamic if true, reevaluate the property set each time


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

@@ -161,7 +161,7 @@ public class TokenizedPattern {
*/ */
public TokenizedPattern withoutLastToken() { public TokenizedPattern withoutLastToken() {
if (tokenizedPattern.length == 0) { if (tokenizedPattern.length == 0) {
throw new IllegalStateException("cant strip a token from nothing");
throw new IllegalStateException("can't strip a token from nothing");
} else if (tokenizedPattern.length == 1) { } else if (tokenizedPattern.length == 1) {
return EMPTY_PATTERN; return EMPTY_PATTERN;
} else { } else {


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

@@ -181,7 +181,7 @@ public final class DateUtils {
* + 11/22 for rounding * + 11/22 for rounding
* </pre> * </pre>
* *
* @param cal the calander.
* @param cal the calendar.
* *
* @return The phase of the moon as a number between 0 and 7 with * @return The phase of the moon as a number between 0 and 7 with
* 0 meaning new moon and 4 meaning full moon. * 0 meaning new moon and 4 meaning full moon.


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

@@ -31,7 +31,7 @@ import java.io.OutputStream;
public abstract class LineOrientedOutputStream extends OutputStream { public abstract class LineOrientedOutputStream extends OutputStream {


/** Initial buffer size. */ /** Initial buffer size. */
private static final int INTIAL_SIZE = 132;
private static final int INITIAL_SIZE = 132;


/** Carriage return */ /** Carriage return */
private static final int CR = 0x0d; private static final int CR = 0x0d;
@@ -40,7 +40,7 @@ public abstract class LineOrientedOutputStream extends OutputStream {
private static final int LF = 0x0a; private static final int LF = 0x0a;


private ByteArrayOutputStream buffer private ByteArrayOutputStream buffer
= new ByteArrayOutputStream(INTIAL_SIZE);
= new ByteArrayOutputStream(INITIAL_SIZE);
private boolean skip = false; private boolean skip = false;


/** /**


+ 1
- 1
src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java View File

@@ -104,7 +104,7 @@ public class RegexpMatcherFactory {
public static boolean regexpMatcherPresent(Project project) { public static boolean regexpMatcherPresent(Project project) {
try { try {
// The factory throws a BuildException if no usable matcher // The factory throws a BuildException if no usable matcher
// cant be instantiated. We dont need the matcher itself here.
// cannot be instantiated. We dont need the matcher itself here.
new RegexpMatcherFactory().newRegexpMatcher(project); new RegexpMatcherFactory().newRegexpMatcher(project);
return true; return true;
} catch (Throwable ex) { } catch (Throwable ex) {


+ 2
- 2
src/main/org/apache/tools/bzip2/BlockSort.java View File

@@ -28,7 +28,7 @@ import java.util.BitSet;
* blocksort.c in his libbzip2</p> * blocksort.c in his libbzip2</p>
* *
* <p>The Burrows-Wheeler transform is a reversible transform of the * <p>The Burrows-Wheeler transform is a reversible transform of the
* original data that is supposed to group similiar bytes close to
* original data that is supposed to group similar bytes close to
* each other. The idea is to sort all permutations of the input and * each other. The idea is to sort all permutations of the input and
* only keep the last byte of each permutation. E.g. for "Commons * only keep the last byte of each permutation. E.g. for "Commons
* Compress" you'd get:</p> * Compress" you'd get:</p>
@@ -586,7 +586,7 @@ class BlockSort {
* *
* <p> * <p>
* This is the version using unrolled loops. Normally I never use such ones * This is the version using unrolled loops. Normally I never use such ones
* in Java code. The unrolling has shown a noticable performance improvement
* in Java code. The unrolling has shown a noticeable performance improvement
* on JRE 1.4.2 (Linux i586 / HotSpot Client). Of course it depends on the * on JRE 1.4.2 (Linux i586 / HotSpot Client). Of course it depends on the
* JIT compiler of the vm. * JIT compiler of the vm.
* </p> * </p>


+ 1
- 1
src/main/org/apache/tools/mail/MailMessage.java View File

@@ -327,7 +327,7 @@ public class MailMessage {
// RFC 822 s4.1: // RFC 822 s4.1:
// "Header fields are NOT required to occur in any particular order, // "Header fields are NOT required to occur in any particular order,
// except that the message body MUST occur AFTER the headers" // except that the message body MUST occur AFTER the headers"
// (the same section specifies a reccommended order, which we ignore)
// (the same section specifies a recommended order, which we ignore)
final int size = headersKeys.size(); final int size = headersKeys.size();
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
String name = (String) headersKeys.elementAt(i); String name = (String) headersKeys.elementAt(i);


Loading…
Cancel
Save