You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2014/07/21 07:04:18 UTC
[1/3] git commit: PR 56747 Document which options exit in help output, submitted by Ville Skyttä
Repository: ant
Updated Branches:
refs/heads/master 956b80a68 -> 8a597546b
PR 56747 Document which options exit in help output, submitted by Ville Skyttä
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/47a3b514
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/47a3b514
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/47a3b514
Branch: refs/heads/master
Commit: 47a3b5144e994be76379c2fef3acd1c9ab15e059
Parents: 956b80a
Author: Ville Skyttä <vi...@iki.fi>
Authored: Sun Jul 20 10:17:46 2014 +0300
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Mon Jul 21 06:56:27 2014 +0200
----------------------------------------------------------------------
manual/running.html | 6 +++---
src/main/org/apache/tools/ant/Main.java | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/47a3b514/manual/running.html
----------------------------------------------------------------------
diff --git a/manual/running.html b/manual/running.html
index 46005b5..529afc7 100644
--- a/manual/running.html
+++ b/manual/running.html
@@ -100,11 +100,11 @@ targets, or if Ant is invoked in -verbose or -debug mode).
<h3><a name="options">Command-line Options Summary</a></h3>
<pre>ant [options] [target [target2 [target3] ...]]
Options:
- -help, -h print this message
- -projecthelp, -p print project help information
+ -help, -h print this message and exit
+ -projecthelp, -p print project help information and exit
-version print the version information and exit
-diagnostics print information that might be helpful to
- diagnose or report problems.
+ diagnose or report problems and exit
-quiet, -q be extra quiet
-silent, -S print nothing but task outputs and build failures
-verbose, -v be extra verbose
http://git-wip-us.apache.org/repos/asf/ant/blob/47a3b514/src/main/org/apache/tools/ant/Main.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/Main.java b/src/main/org/apache/tools/ant/Main.java
index b9492ac..a9c23a5 100644
--- a/src/main/org/apache/tools/ant/Main.java
+++ b/src/main/org/apache/tools/ant/Main.java
@@ -1009,11 +1009,11 @@ public class Main implements AntMain {
private static void printUsage() {
System.out.println("ant [options] [target [target2 [target3] ...]]");
System.out.println("Options: ");
- System.out.println(" -help, -h print this message");
- System.out.println(" -projecthelp, -p print project help information");
+ System.out.println(" -help, -h print this message and exit");
+ System.out.println(" -projecthelp, -p print project help information and exit");
System.out.println(" -version print the version information and exit");
System.out.println(" -diagnostics print information that might be helpful to");
- System.out.println(" diagnose or report problems.");
+ System.out.println(" diagnose or report problems and exit");
System.out.println(" -quiet, -q be extra quiet");
System.out.println(" -silent, -S print nothing but task outputs and build failures");
System.out.println(" -verbose, -v be extra verbose");
[3/3] git commit: PR 56749 Javadoc 1.8 fixes, submitted by Ville Skyttä
Posted by bo...@apache.org.
PR 56749 Javadoc 1.8 fixes, submitted by Ville Skyttä
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/8a597546
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/8a597546
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/8a597546
Branch: refs/heads/master
Commit: 8a597546b88bbde571884f302546211236d3e82e
Parents: 43844a7
Author: Ville Skyttä <vi...@iki.fi>
Authored: Sun Jul 20 11:12:46 2014 +0300
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Mon Jul 21 07:03:55 2014 +0200
----------------------------------------------------------------------
src/main/org/apache/tools/ant/launch/Locator.java | 18 +++++++++---------
.../ant/taskdefs/optional/testing/Funtest.java | 2 +-
.../tools/ant/types/resources/selectors/Date.java | 6 +++---
src/main/org/apache/tools/ant/util/DOMUtils.java | 9 ++-------
src/main/org/apache/tools/ant/util/FileUtils.java | 12 ++++++------
.../apache/tools/ant/util/GlobPatternMapper.java | 2 +-
.../tools/ant/util/KeepAliveInputStream.java | 1 -
.../tools/ant/util/KeepAliveOutputStream.java | 3 +--
.../ant/util/LayoutPreservingProperties.java | 4 ++--
.../tools/ant/util/LeadPipeInputStream.java | 2 +-
.../org/apache/tools/ant/util/ProxySetup.java | 1 -
.../apache/tools/ant/util/ScriptFixBSFPath.java | 2 +-
.../org/apache/tools/ant/util/StringUtils.java | 2 +-
src/main/org/apache/tools/ant/util/Watchdog.java | 2 +-
src/main/org/apache/tools/ant/util/WorkerAnt.java | 8 ++++----
.../apache/tools/bzip2/CBZip2OutputStream.java | 2 +-
16 files changed, 34 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/8a597546/src/main/org/apache/tools/ant/launch/Locator.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/launch/Locator.java b/src/main/org/apache/tools/ant/launch/Locator.java
index 035b8b2..4640e70 100644
--- a/src/main/org/apache/tools/ant/launch/Locator.java
+++ b/src/main/org/apache/tools/ant/launch/Locator.java
@@ -31,16 +31,16 @@ import java.util.Locale;
/**
* The Locator is a utility class which is used to find certain items
* in the environment.
- *
+ * <p>
* It is used at boot time in the launcher, and cannot make use of any of Ant's other classes.
- *
- * This is a surprisingly brittle piece of code, and has had lots of bugs filed against it.
- * {@link <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=42275">running ant off a network share can cause Ant to fail</a>}
- * {@link <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=8031">use File.toURI().toURL().toExternalForm()</a>}
- * {@link <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=42222">Locator implementation not encoding URI strings properly: spaces in paths</a>}
- * It also breaks Eclipse 3.3 Betas
- * {@link <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=183283">Exception if installation path has spaces</a>}
- *
+ * <p>
+ * This is a surprisingly brittle piece of code, and has had lots of bugs filed against it:
+ * <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=42275">running ant off a network share can cause Ant to fail</a>,
+ * <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=8031">use File.toURI().toURL().toExternalForm()</a>,
+ * <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=42222">Locator implementation not encoding URI strings properly: spaces in paths</a>.
+ * It also breaks Eclipse 3.3 Betas:
+ * <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=183283">Exception if installation path has spaces</a>.
+ * <p>
* Be very careful when making changes to this class, as a break will upset a lot of people.
* @since Ant 1.6
*/
http://git-wip-us.apache.org/repos/asf/ant/blob/8a597546/src/main/org/apache/tools/ant/taskdefs/optional/testing/Funtest.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/testing/Funtest.java b/src/main/org/apache/tools/ant/taskdefs/optional/testing/Funtest.java
index 9b3c93c..2eb357a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/testing/Funtest.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/testing/Funtest.java
@@ -385,7 +385,7 @@ public class Funtest extends Task {
/**
* Run the functional test sequence.
- * <p/>
+ * <p>
* This is a fairly complex workflow -what is going on is that we try to clean up
* no matter how the run ended, and to retain the innermost exception that got thrown
* during cleanup. That is, if teardown fails after the tests themselves failed, it is the
http://git-wip-us.apache.org/repos/asf/ant/blob/8a597546/src/main/org/apache/tools/ant/types/resources/selectors/Date.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/resources/selectors/Date.java b/src/main/org/apache/tools/ant/types/resources/selectors/Date.java
index c48e4bc..8541e85 100644
--- a/src/main/org/apache/tools/ant/types/resources/selectors/Date.java
+++ b/src/main/org/apache/tools/ant/types/resources/selectors/Date.java
@@ -64,7 +64,7 @@ public class Date implements ResourceSelector {
/**
* Set the date and time as a String.
- * @param s the date & time to use.
+ * @param s the date and time to use.
*/
public synchronized void setDateTime(String s) {
dateTime = s;
@@ -72,8 +72,8 @@ public class Date implements ResourceSelector {
}
/**
- * Get the date & time in String format.
- * @return a String representing a date & time.
+ * Get the date and time in String format.
+ * @return a String representing a date and time.
*/
public synchronized String getDatetime() {
return dateTime;
http://git-wip-us.apache.org/repos/asf/ant/blob/8a597546/src/main/org/apache/tools/ant/util/DOMUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/DOMUtils.java b/src/main/org/apache/tools/ant/util/DOMUtils.java
index 4c3fabe..db00213 100644
--- a/src/main/org/apache/tools/ant/util/DOMUtils.java
+++ b/src/main/org/apache/tools/ant/util/DOMUtils.java
@@ -56,7 +56,7 @@ public class DOMUtils {
* <b/>
* </a>
* </pre>
- * and returns <code><b></code>.</p>
+ * and returns <code><b></code>.
*
* @param parent element that will receive the new element as child.
* @param name name of the new element.
@@ -80,7 +80,6 @@ public class DOMUtils {
* <pre>
* <a>b</a>
* </pre>
- * </p>
*
* @param parent element that will receive the new element as child.
* @param content text content.
@@ -102,7 +101,6 @@ public class DOMUtils {
* <pre>
* <a><[!CDATA[b]]></a>
* </pre>
- * </p>
*
* @param parent element that will receive the new element as child.
* @param content text content.
@@ -126,7 +124,6 @@ public class DOMUtils {
* <b>c</b>
* </a>
* </pre>
- * </p>
*
* @param parent element that will receive the new element as child.
* @param name of the child element.
@@ -148,11 +145,9 @@ public class DOMUtils {
* creates
* <pre>
* <a>
- * <b><![CDATA[c]]></b>
+ * <b><![CDATA[c]]></b>
* </a>
* </pre>
- * </pre>
- * </p>
*
* @param parent element that will receive the new element as child.
* @param name of the child element.
http://git-wip-us.apache.org/repos/asf/ant/blob/8a597546/src/main/org/apache/tools/ant/util/FileUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/FileUtils.java b/src/main/org/apache/tools/ant/util/FileUtils.java
index c963f49..bcef5ec 100644
--- a/src/main/org/apache/tools/ant/util/FileUtils.java
+++ b/src/main/org/apache/tools/ant/util/FileUtils.java
@@ -1346,21 +1346,21 @@ public class FileUtils {
* test whether a file or directory exists, with an error in the
* upper/lower case spelling of the name.
* Using this method is only interesting on case insensitive file systems
- * (Windows).<br/>
+ * (Windows).<br>
* It will return true only if 3 conditions are met :
- * <br/>
+ * <br>
* <ul>
* <li>operating system is case insensitive</li>
* <li>file exists</li>
* <li>actual name from directory reading is different from the
* supplied argument</li>
* </ul>
- * <br/>
+ * <br>
* the purpose is to identify files or directories on case-insensitive
- * filesystems whose case is not what is expected.<br/>
+ * filesystems whose case is not what is expected.<br>
* Possibly to rename them afterwards to the desired upper/lowercase
* combination.
- * <br/>
+ *
* @param localFile file to test
* @return true if the file exists and the case of the actual file
* is not the case of the parameter
@@ -1591,7 +1591,7 @@ public class FileUtils {
/**
* Calculates the relative path between two files.
* <p>
- * Implementation note:<br/> This function may throw an IOException if an I/O error occurs
+ * Implementation note:<br>This function may throw an IOException if an I/O error occurs
* because its use of the canonical pathname may require filesystem queries.
* </p>
*
http://git-wip-us.apache.org/repos/asf/ant/blob/8a597546/src/main/org/apache/tools/ant/util/GlobPatternMapper.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/GlobPatternMapper.java b/src/main/org/apache/tools/ant/util/GlobPatternMapper.java
index 1ba4128..da2a0f1 100644
--- a/src/main/org/apache/tools/ant/util/GlobPatternMapper.java
+++ b/src/main/org/apache/tools/ant/util/GlobPatternMapper.java
@@ -24,7 +24,7 @@ import org.apache.tools.ant.BuildException;
* Implementation of FileNameMapper that does simple wildcard pattern
* replacements.
*
- * <p>This does simple translations like *.foo -> *.bar where the
+ * <p>This does simple translations like *.foo -> *.bar where the
* prefix to .foo will be left unchanged. It only handles a single *
* character, use regular expressions for more complicated
* situations.</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/8a597546/src/main/org/apache/tools/ant/util/KeepAliveInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/KeepAliveInputStream.java b/src/main/org/apache/tools/ant/util/KeepAliveInputStream.java
index fe5e32f..debde59 100644
--- a/src/main/org/apache/tools/ant/util/KeepAliveInputStream.java
+++ b/src/main/org/apache/tools/ant/util/KeepAliveInputStream.java
@@ -32,7 +32,6 @@ import java.io.InputStream;
* in.close();
* }
* </pre>
- * </p>
*
* @since Ant 1.6
*/
http://git-wip-us.apache.org/repos/asf/ant/blob/8a597546/src/main/org/apache/tools/ant/util/KeepAliveOutputStream.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/KeepAliveOutputStream.java b/src/main/org/apache/tools/ant/util/KeepAliveOutputStream.java
index 9f5c06b..27f3d7e 100644
--- a/src/main/org/apache/tools/ant/util/KeepAliveOutputStream.java
+++ b/src/main/org/apache/tools/ant/util/KeepAliveOutputStream.java
@@ -29,11 +29,10 @@ import java.io.PrintStream;
* <p>
* In code-language it means that it is not necessary to do:
* <pre>
- * if (out != System.out && out!= System.err) {
+ * if (out != System.out && out != System.err) {
* out.close();
* }
* </pre>
- * </p>
*
*/
public class KeepAliveOutputStream extends FilterOutputStream {
http://git-wip-us.apache.org/repos/asf/ant/blob/8a597546/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java b/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java
index ea0ea93..aed6f37 100644
--- a/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java
+++ b/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java
@@ -40,7 +40,7 @@ import java.util.Properties;
* class to there, but it also keeps track of the contents of the
* input stream from which it was loaded (if applicable), so that it can
* write out the properties in as close a form as possible to the input.</p>
- * If no changes occur to property values, the output should be the same
+ * <p>If no changes occur to property values, the output should be the same
* as the input, except for the leading date stamp, as normal for a
* properties file. Properties added are appended to the file. Properties
* whose values are changed are changed in place. Properties that are
@@ -63,7 +63,7 @@ import java.util.Properties;
*
* # and finally
* gamma=rays</pre>
- * </p>The resulting collection sequence of logical lines depends on whether
+ * <p>The resulting collection sequence of logical lines depends on whether
* or not <code>removeComments</code> was set at the time the second stream
* is loaded. If it is set, then the resulting list of lines is</p>
* <pre> # the first line
http://git-wip-us.apache.org/repos/asf/ant/blob/8a597546/src/main/org/apache/tools/ant/util/LeadPipeInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/LeadPipeInputStream.java b/src/main/org/apache/tools/ant/util/LeadPipeInputStream.java
index 37650cc..0081912 100644
--- a/src/main/org/apache/tools/ant/util/LeadPipeInputStream.java
+++ b/src/main/org/apache/tools/ant/util/LeadPipeInputStream.java
@@ -103,7 +103,7 @@ public class LeadPipeInputStream extends PipedInputStream {
/**
* Set the size of the buffer.
- * @param size the new buffer size. Ignored if <= current size.
+ * @param size the new buffer size. Ignored if <= current size.
*/
public synchronized void setBufferSize(int size) {
if (size > buffer.length) {
http://git-wip-us.apache.org/repos/asf/ant/blob/8a597546/src/main/org/apache/tools/ant/util/ProxySetup.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/ProxySetup.java b/src/main/org/apache/tools/ant/util/ProxySetup.java
index 5be1e27..f077f87 100644
--- a/src/main/org/apache/tools/ant/util/ProxySetup.java
+++ b/src/main/org/apache/tools/ant/util/ProxySetup.java
@@ -34,7 +34,6 @@ public class ProxySetup {
/**
* Java1.5 property that enables use of system proxies.
- * @value
*/
public static final String USE_SYSTEM_PROXIES = "java.net.useSystemProxies";
/** the http proxyhost property */
http://git-wip-us.apache.org/repos/asf/ant/blob/8a597546/src/main/org/apache/tools/ant/util/ScriptFixBSFPath.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/ScriptFixBSFPath.java b/src/main/org/apache/tools/ant/util/ScriptFixBSFPath.java
index 0b8bf98..ca76e56 100644
--- a/src/main/org/apache/tools/ant/util/ScriptFixBSFPath.java
+++ b/src/main/org/apache/tools/ant/util/ScriptFixBSFPath.java
@@ -86,7 +86,7 @@ public class ScriptFixBSFPath {
* </ol>
*
* Assume a simple model for the loader:
- * thisloader<-customloader
+ * thisloader<-customloader
* or
* thisloader
*
http://git-wip-us.apache.org/repos/asf/ant/blob/8a597546/src/main/org/apache/tools/ant/util/StringUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/StringUtils.java b/src/main/org/apache/tools/ant/util/StringUtils.java
index b11f92a..626fb22 100644
--- a/src/main/org/apache/tools/ant/util/StringUtils.java
+++ b/src/main/org/apache/tools/ant/util/StringUtils.java
@@ -140,7 +140,7 @@ public final class StringUtils {
* xml does not do "c" like interpretation of strings.
* i.e. \n\r\t etc.
* this method processes \n, \r, \t, \f, \\
- * also subs \s -> " \n\r\t\f"
+ * also subs \s -> " \n\r\t\f"
* a trailing '\' will be ignored
*
* @param input raw string with possible embedded '\'s
http://git-wip-us.apache.org/repos/asf/ant/blob/8a597546/src/main/org/apache/tools/ant/util/Watchdog.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/Watchdog.java b/src/main/org/apache/tools/ant/util/Watchdog.java
index 393bc7b..318b526 100644
--- a/src/main/org/apache/tools/ant/util/Watchdog.java
+++ b/src/main/org/apache/tools/ant/util/Watchdog.java
@@ -46,7 +46,7 @@ public class Watchdog implements Runnable {
/**
* Constructor for Watchdog.
- * @param timeout the timeout to use in milliseconds (must be >= 1).
+ * @param timeout the timeout to use in milliseconds (must be >= 1).
*/
public Watchdog(long timeout) {
if (timeout < 1) {
http://git-wip-us.apache.org/repos/asf/ant/blob/8a597546/src/main/org/apache/tools/ant/util/WorkerAnt.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/WorkerAnt.java b/src/main/org/apache/tools/ant/util/WorkerAnt.java
index a304278..288d74d 100644
--- a/src/main/org/apache/tools/ant/util/WorkerAnt.java
+++ b/src/main/org/apache/tools/ant/util/WorkerAnt.java
@@ -26,7 +26,7 @@ import org.apache.tools.ant.Task;
* After the run, any exception thrown is turned into a buildexception, which can be
* rethrown, the finished attribute is set, then notifyAll() is called,
* so that anyone waiting on the same notify object gets woken up.
- * </p>
+ * <p>
* This class is effectively a superset of
* {@link org.apache.tools.ant.taskdefs.Parallel.TaskRunnable}
*
@@ -49,7 +49,7 @@ public class WorkerAnt extends Thread {
/**
* Create the worker.
- * <p/>
+ * <p>
* This does not start the thread, merely configures it.
* @param task the task
* @param notify what to notify
@@ -61,7 +61,7 @@ public class WorkerAnt extends Thread {
/**
* Create the worker, using the worker as the notification point.
- * <p/>
+ * <p>
* This does not start the thread, merely configures it.
* @param task the task
*/
@@ -83,7 +83,7 @@ public class WorkerAnt extends Thread {
/**
* Get whatever was thrown, which may or may not be a buildException.
- * Assertion: getException() instanceof BuildException <=> getBuildException()==getException()
+ * Assertion: getException() instanceof BuildException <=> getBuildException()==getException()
* @return the exception.
*/
public synchronized Throwable getException() {
http://git-wip-us.apache.org/repos/asf/ant/blob/8a597546/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java b/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
index 965b7a2..01e2342 100644
--- a/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
+++ b/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
@@ -613,7 +613,7 @@ public class CBZip2OutputStream extends OutputStream
* @throws IOException
* if an I/O error occurs in the specified stream.
* @throws IllegalArgumentException
- * if <code>(blockSize < 1) || (blockSize > 9)</code>.
+ * if <code>(blockSize < 1) || (blockSize > 9)</code>.
* @throws NullPointerException
* if <code>out == null</code>.
*
[2/3] git commit: PR 56748 Spelling fixes, submitted by Ville Skyttä
Posted by bo...@apache.org.
PR 56748 Spelling fixes, submitted by Ville Skyttä
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/43844a7e
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/43844a7e
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/43844a7e
Branch: refs/heads/master
Commit: 43844a7e6b54e2dd27216b30f6d7b44bb601d29c
Parents: 47a3b51
Author: Ville Skyttä <vi...@iki.fi>
Authored: Sun Jul 20 10:44:18 2014 +0300
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Mon Jul 21 07:01:17 2014 +0200
----------------------------------------------------------------------
WHATSNEW | 8 ++++----
manual/Tasks/ear.html | 2 +-
manual/Tasks/javac.html | 4 ++--
manual/Tasks/junit.html | 2 +-
manual/Types/propertyset.html | 2 +-
manual/Types/selectors.html | 6 +++---
manual/argumentprocessor.html | 4 ++--
src/main/org/apache/tools/ant/DemuxOutputStream.java | 4 ++--
src/main/org/apache/tools/ant/filters/FixCrLfFilter.java | 2 +-
src/main/org/apache/tools/ant/filters/SortFilter.java | 2 +-
src/main/org/apache/tools/ant/taskdefs/Execute.java | 2 +-
src/main/org/apache/tools/ant/taskdefs/MacroDef.java | 2 +-
src/main/org/apache/tools/ant/taskdefs/ManifestTask.java | 2 +-
src/main/org/apache/tools/ant/taskdefs/Replace.java | 2 +-
src/main/org/apache/tools/ant/taskdefs/SignJar.java | 4 ++--
src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java | 2 +-
src/main/org/apache/tools/ant/taskdefs/condition/Os.java | 2 +-
.../org/apache/tools/ant/taskdefs/optional/PropertyFile.java | 2 +-
.../org/apache/tools/ant/taskdefs/optional/TraXLiaison.java | 2 +-
.../apache/tools/ant/taskdefs/optional/XMLValidateTask.java | 2 +-
.../ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java | 4 ++--
.../ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java | 2 +-
.../ant/taskdefs/optional/extension/JarLibResolveTask.java | 2 +-
.../tools/ant/taskdefs/optional/extension/LibFileSet.java | 2 +-
.../apache/tools/ant/taskdefs/optional/i18n/Translate.java | 2 +-
.../tools/ant/taskdefs/optional/jsp/JspNameMangler.java | 2 +-
.../taskdefs/optional/jsp/compilers/JspCompilerAdapter.java | 2 +-
.../tools/ant/taskdefs/optional/junit/FailureRecorder.java | 2 +-
src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java | 4 ++--
.../tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java | 4 ++--
.../org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java | 2 +-
.../tools/ant/taskdefs/optional/sound/AntSoundPlayer.java | 2 +-
src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java | 8 ++++----
src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java | 2 +-
src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java | 2 +-
src/main/org/apache/tools/ant/types/PropertySet.java | 2 +-
.../apache/tools/ant/types/selectors/TokenizedPattern.java | 2 +-
src/main/org/apache/tools/ant/util/DateUtils.java | 2 +-
.../org/apache/tools/ant/util/LineOrientedOutputStream.java | 4 ++--
.../apache/tools/ant/util/regexp/RegexpMatcherFactory.java | 2 +-
src/main/org/apache/tools/bzip2/BlockSort.java | 4 ++--
src/main/org/apache/tools/mail/MailMessage.java | 2 +-
42 files changed, 59 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/WHATSNEW
----------------------------------------------------------------------
diff --git a/WHATSNEW b/WHATSNEW
index 32932e8..5894c07 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1416,7 +1416,7 @@ Fixed bugs:
have full control.
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
be called in such a situation.
Bugzilla Report 36265
@@ -2582,7 +2582,7 @@ Fixed bugs:
* OOM caused by IH holding on to classes and thus their classloaders.
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.
* Behavior change of DirectoryScanner/AbstractFileset when conditional include
@@ -2868,7 +2868,7 @@ Other changes:
distribution. Bugzilla 40980.
* 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.
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
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
being parsed. Bugzilla Report 17134.
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/manual/Tasks/ear.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/ear.html b/manual/Tasks/ear.html
index 5ee8206..de4a962 100644
--- a/manual/Tasks/ear.html
+++ b/manual/Tasks/ear.html
@@ -258,7 +258,7 @@ to a value other than its default, <code>"add"</code>.</b></p>
</tr>
<tr>
<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
attribute) into a single attribute.
<em>Since Ant 1.8.0</em>.</td>
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/manual/Tasks/javac.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/javac.html b/manual/Tasks/javac.html
index 2315aca..6c1d4e6 100644
--- a/manual/Tasks/javac.html
+++ b/manual/Tasks/javac.html
@@ -428,11 +428,11 @@ invoking the compiler.</p>
The default value of this is "true" and this
means that previously compiled classes are on
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
for doing unnecessary work. However, for some edge cases,
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:
<a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=40776">
Bug 40776 - a problem compiling a Java 5 project with generics</a>.
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/manual/Tasks/junit.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/junit.html b/manual/Tasks/junit.html
index 2a328eb..76df9ce 100644
--- a/manual/Tasks/junit.html
+++ b/manual/Tasks/junit.html
@@ -657,7 +657,7 @@ supported.</p>
<ul>
<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
- different classloader (and thus may be unable to load the tast
+ different classloader (and thus may be unable to load the test
class).</li>
<li>It cannot determine which test was run when the timeout/crash
occurred if the forked VM was running multiple test. I.e. the
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/manual/Types/propertyset.html
----------------------------------------------------------------------
diff --git a/manual/Types/propertyset.html b/manual/Types/propertyset.html
index 94fcf44..81d491e 100644
--- a/manual/Types/propertyset.html
+++ b/manual/Types/propertyset.html
@@ -38,7 +38,7 @@ supports this.</p>
</tr>
<tr>
<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 "<code>true</code>".</td>
<td valign="top" align="center">No</td>
</tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/manual/Types/selectors.html
----------------------------------------------------------------------
diff --git a/manual/Types/selectors.html b/manual/Types/selectors.html
index 0c75d4a..560b416 100644
--- a/manual/Types/selectors.html
+++ b/manual/Types/selectors.html
@@ -828,9 +828,9 @@
<li> <b> seldirs </b>: same as attribute seldirs </li>
<li> <b> algorithm.* </b>: Value is transferred to the algorithm via its
<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>
- <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>
</ul>
@@ -1248,7 +1248,7 @@ Select files whose filename length is even.
</pre></blockquote>
<p>Selects all the JAR file larger than 4096 bytes which haven't been update
- since the last millenium.
+ since the last millennium.
</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/manual/argumentprocessor.html
----------------------------------------------------------------------
diff --git a/manual/argumentprocessor.html b/manual/argumentprocessor.html
index 22160cc..2cd5202 100644
--- a/manual/argumentprocessor.html
+++ b/manual/argumentprocessor.html
@@ -37,7 +37,7 @@ Ant behaviour.
<p>
An <code>ArgumentProcessor</code> is called each time Ant parse an unknown
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'
argument name, avoiding for instance one letter arguments.
</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
before the project is being configured (the build file being parsed),
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.
</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/DemuxOutputStream.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/DemuxOutputStream.java b/src/main/org/apache/tools/ant/DemuxOutputStream.java
index cd5a7e9..bd39913 100644
--- a/src/main/org/apache/tools/ant/DemuxOutputStream.java
+++ b/src/main/org/apache/tools/ant/DemuxOutputStream.java
@@ -54,7 +54,7 @@ public class DemuxOutputStream extends OutputStream {
private static final int MAX_SIZE = 1024;
/** Initial buffer size. */
- private static final int INTIAL_SIZE = 132;
+ private static final int INITIAL_SIZE = 132;
/** Carriage return */
private static final int CR = 0x0d;
@@ -100,7 +100,7 @@ public class DemuxOutputStream extends OutputStream {
BufferInfo bufferInfo = (BufferInfo) buffers.get(current);
if (bufferInfo == null) {
bufferInfo = new BufferInfo();
- bufferInfo.buffer = new ByteArrayOutputStream(INTIAL_SIZE);
+ bufferInfo.buffer = new ByteArrayOutputStream(INITIAL_SIZE);
bufferInfo.crSeen = false;
buffers.put(current, bufferInfo);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java b/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java
index 0557200..8a37924 100644
--- a/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java
+++ b/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java
@@ -343,7 +343,7 @@ public final class FixCrLfFilter extends BaseParamFilterReader implements Chaina
/**
* Indicate whether this stream contains Java source.
*
- * This attribute is only used in assocation with the "<i><b>tab</b></i>"
+ * This attribute is only used in association with the "<i><b>tab</b></i>"
* attribute.
*
* @param javafiles
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/filters/SortFilter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/SortFilter.java b/src/main/org/apache/tools/ant/filters/SortFilter.java
index 62bf3c6..471660c 100644
--- a/src/main/org/apache/tools/ant/filters/SortFilter.java
+++ b/src/main/org/apache/tools/ant/filters/SortFilter.java
@@ -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.
*
*/
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/taskdefs/Execute.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Execute.java b/src/main/org/apache/tools/ant/taskdefs/Execute.java
index 15fca40..06596fa 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Execute.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Execute.java
@@ -617,7 +617,7 @@ public class Execute {
for (int i = 0; i < env.length; i++) {
String keyValue = env[i];
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.
// Try without changing case first
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/MacroDef.java b/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
index b38e1c6..63f68c5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
+++ b/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
@@ -695,7 +695,7 @@ public class MacroDef extends AntlibDefinition {
* runtime info.
*
* @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
*/
private boolean sameOrSimilar(Object obj, boolean same) {
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java b/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java
index 2d59580..9b600db 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java
@@ -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>
* name: alphanum *headerchar
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/taskdefs/Replace.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Replace.java b/src/main/org/apache/tools/ant/taskdefs/Replace.java
index 981663e..9aa9fe8 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Replace.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Replace.java
@@ -482,7 +482,7 @@ public class Replace extends MatchingTask {
/**
* Do the execution.
- * @throws BuildException if we cant build
+ * @throws BuildException if we can't build
*/
public void execute() throws BuildException {
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/taskdefs/SignJar.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/SignJar.java b/src/main/org/apache/tools/ant/taskdefs/SignJar.java
index f971001..fc31b1d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/SignJar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/SignJar.java
@@ -395,7 +395,7 @@ public class SignJar extends AbstractJarSignerTask {
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
if (!hasDestDir && hasMapper) {
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
* 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>
*
* <p>If we are signing ourself, the check {@link #isSigned(File)} is used to
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
index 9d10f2c..4fe3126 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
@@ -1131,7 +1131,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
* </ul>
* <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
* boolean.</p>
*
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
index b1f9fca..974c396 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
@@ -266,7 +266,7 @@ public class Os implements Condition {
|| OS_NAME.indexOf("98") >= 0
|| OS_NAME.indexOf("me") >= 0
//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);
isNT = !is9x;
}
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java b/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
index 838f122..162cab1 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
@@ -709,7 +709,7 @@ public class PropertyFile extends Task {
/**
* Convert the value to a Calendar field index.
- * @return the calander value.
+ * @return the calendar value.
*/
public int getCalendarField() {
String key = getValue().toLowerCase();
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
index cf66e91..8d9a44a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
@@ -609,7 +609,7 @@ public class TraXLiaison implements XSLTLiaison4, ErrorListener, XSLTLoggerAware
/**
* 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.
*/
public void configure(final XSLTProcess xsltTask) {
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
index 28b6b5a..e9fed0d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
@@ -98,7 +98,7 @@ public class XMLValidateTask extends Task {
private final Vector propertyList = new Vector();
private XMLCatalog xmlCatalog = new XMLCatalog();
- /** Message for successfull validation */
+ /** Message for successful validation */
public static final String MESSAGE_FILES_VALIDATED
= " file(s) have been successfully validated.";
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
index 62dd640..550f59c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
@@ -698,7 +698,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool {
* weblogic jar file can remain the same. If the Interfaces, ie. the
* method signatures change or if the xml deployment descriptors changed,
* 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
* this point the weblogic jar gets rebuilt if the xml files change at
* all.
@@ -794,7 +794,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool {
}
}
} else {
- // a file doesnt exist rebuild
+ // a file doesn't exist rebuild
log("File " + filepath + " not present in weblogic jar",
Project.MSG_VERBOSE);
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
index 232a1fb..d15f9f5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
@@ -666,7 +666,7 @@ public class WebsphereDeploymentTool extends GenericDeploymentTool {
* websphere jar file can remain the same. If the Interfaces, ie. the
* method signatures change or if the xml deployment descriptors changed,
* 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
* does. At this point the websphere jar gets rebuilt if the xml files
* change at all.
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java
index 40cc50b..c13194f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java
@@ -202,7 +202,7 @@ public class JarLibResolveTask extends Task {
/**
* 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.
*
* @param file the candidate library
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibFileSet.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibFileSet.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibFileSet.java
index 591fda7..b21719e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibFileSet.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibFileSet.java
@@ -21,7 +21,7 @@ import org.apache.tools.ant.types.FileSet;
/**
* 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.
*
*/
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java b/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
index 5cca45c..82731fe 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
@@ -575,7 +575,7 @@ public class Translate extends MatchingTask {
// we found a starttoken, is there an endtoken following?
// start at token+tokenlength because start and end
- // token may be indentical
+ // token may be identical
int endIndex = line.indexOf(endToken, startIndex
+ startToken.length());
if (endIndex < 0) {
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java
index 6aaae5c..6e08e7d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java
@@ -144,7 +144,7 @@ public class JspNameMangler implements JspMangler {
/**
* taking in the substring representing the path relative to the source dir
* 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
* @return null always.
*/
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapter.java
index 34897d5..16b67f9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapter.java
@@ -25,7 +25,7 @@ import org.apache.tools.ant.taskdefs.optional.jsp.JspMangler;
* The interface that all jsp compiler adapters must adher to.
*
* <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
* Jspc task itself, the only thing all adapters need is the jsp
* task, the execute command and a parameterless constructor (for
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java
index 63451e7..3046b75 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java
@@ -279,7 +279,7 @@ public class FailureRecorder extends ProjectComponent implements JUnitResultForm
writer.newLine();
writer.write("public class ");
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.newLine();
// standard String-constructor
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
index 44f50b0..cef9dda 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
@@ -941,7 +941,7 @@ public class FTP extends Task implements FTPTaskConfig {
return relativePath;
}
/**
- * get thge relative path of this file
+ * get the relative path of this file
* @param currentPath base path
* @param currentRelativePath relative path of the base path with regards to remote dir
* @return relative path
@@ -1970,7 +1970,7 @@ public class FTP extends Task implements FTPTaskConfig {
ftp.deleteFile(ftpFiles[0].getName());
}
// 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();
mydelete.bindToOwner(this);
mydelete.setFile(tempFile.getCanonicalFile());
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
index 1115f67..a4f2413 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
@@ -844,7 +844,7 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror {
return relativePath;
}
/**
- * get thge relative path of this file
+ * get the relative path of this file
* @param currentPath base path
* @param currentRelativePath relative path of the base path with regards to remote dir
* @return relative path
@@ -1359,7 +1359,7 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror {
ftp.deleteFile(ftpFiles[0].getName());
}
// 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();
mydelete.bindToOwner(task);
mydelete.setFile(tempFile.getCanonicalFile());
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
index 9bdae6a..dd6016a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
@@ -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
* the repository is platform dependent so use property to specify location of repository.
* <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
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java b/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
index 3f09064..7988bc6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
@@ -198,7 +198,7 @@ public class AntSoundPlayer implements LineListener, BuildListener {
*/
public void buildFinished(BuildEvent event) {
if (event.getException() == null && fileSuccess != null) {
- // build successfull!
+ // build successful!
play(event.getProject(), fileSuccess, loopsSuccess, durationSuccess);
} else if (event.getException() != null && fileFail != null) {
play(event.getProject(), fileFail, loopsFail, durationFail);
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
index 66c9b81..7a09f68 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
@@ -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
* local file with a @ character.
* @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.
* @param aFromUri a string representing the source of the copy.
* @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
* a local directory with a @ character.
* @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.
* @param aToUri a string representing the target of the copy.
* @since Ant 1.6.2
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java b/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java
index 851f3d5..2cabe2f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java
@@ -27,7 +27,7 @@ import org.apache.tools.ant.util.FileNameMapper;
* The interface that all rmic adapters must adhere to.
*
* <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
* Rmic task itself, the only thing all adapters need is the rmic
* task, the execute command and a parameterless constructor (for
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java b/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java
index a5b9ad6..559c769 100644
--- a/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java
+++ b/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java
@@ -21,7 +21,7 @@ import org.apache.tools.ant.types.Commandline;
/**
* 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.
* 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://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/types/PropertySet.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/PropertySet.java b/src/main/org/apache/tools/ant/types/PropertySet.java
index b37602c..f599204 100644
--- a/src/main/org/apache/tools/ant/types/PropertySet.java
+++ b/src/main/org/apache/tools/ant/types/PropertySet.java
@@ -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.
*
* @param dynamic if true, reevaluate the property set each time
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java b/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java
index 82884de..dbe7ec8 100644
--- a/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java
+++ b/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java
@@ -161,7 +161,7 @@ public class TokenizedPattern {
*/
public TokenizedPattern withoutLastToken() {
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) {
return EMPTY_PATTERN;
} else {
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/util/DateUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/DateUtils.java b/src/main/org/apache/tools/ant/util/DateUtils.java
index 1ed95ec..9ce737b 100644
--- a/src/main/org/apache/tools/ant/util/DateUtils.java
+++ b/src/main/org/apache/tools/ant/util/DateUtils.java
@@ -181,7 +181,7 @@ public final class DateUtils {
* + 11/22 for rounding
* </pre>
*
- * @param cal the calander.
+ * @param cal the calendar.
*
* @return The phase of the moon as a number between 0 and 7 with
* 0 meaning new moon and 4 meaning full moon.
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/util/LineOrientedOutputStream.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/LineOrientedOutputStream.java b/src/main/org/apache/tools/ant/util/LineOrientedOutputStream.java
index 1d081bf..073a89f 100644
--- a/src/main/org/apache/tools/ant/util/LineOrientedOutputStream.java
+++ b/src/main/org/apache/tools/ant/util/LineOrientedOutputStream.java
@@ -31,7 +31,7 @@ import java.io.OutputStream;
public abstract class LineOrientedOutputStream extends OutputStream {
/** Initial buffer size. */
- private static final int INTIAL_SIZE = 132;
+ private static final int INITIAL_SIZE = 132;
/** Carriage return */
private static final int CR = 0x0d;
@@ -40,7 +40,7 @@ public abstract class LineOrientedOutputStream extends OutputStream {
private static final int LF = 0x0a;
private ByteArrayOutputStream buffer
- = new ByteArrayOutputStream(INTIAL_SIZE);
+ = new ByteArrayOutputStream(INITIAL_SIZE);
private boolean skip = false;
/**
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java b/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java
index ff221d1..a0a8a15 100644
--- a/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java
+++ b/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java
@@ -104,7 +104,7 @@ public class RegexpMatcherFactory {
public static boolean regexpMatcherPresent(Project project) {
try {
// 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);
return true;
} catch (Throwable ex) {
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/bzip2/BlockSort.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/bzip2/BlockSort.java b/src/main/org/apache/tools/bzip2/BlockSort.java
index f997bab..eb9066e 100644
--- a/src/main/org/apache/tools/bzip2/BlockSort.java
+++ b/src/main/org/apache/tools/bzip2/BlockSort.java
@@ -28,7 +28,7 @@ import java.util.BitSet;
* blocksort.c in his libbzip2</p>
*
* <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
* only keep the last byte of each permutation. E.g. for "Commons
* Compress" you'd get:</p>
@@ -586,7 +586,7 @@ class BlockSort {
*
* <p>
* 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
* JIT compiler of the vm.
* </p>
http://git-wip-us.apache.org/repos/asf/ant/blob/43844a7e/src/main/org/apache/tools/mail/MailMessage.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/mail/MailMessage.java b/src/main/org/apache/tools/mail/MailMessage.java
index 71d0d37..b4173a9 100644
--- a/src/main/org/apache/tools/mail/MailMessage.java
+++ b/src/main/org/apache/tools/mail/MailMessage.java
@@ -327,7 +327,7 @@ public class MailMessage {
// RFC 822 s4.1:
// "Header fields are NOT required to occur in any particular order,
// 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();
for (int i = 0; i < size; i++) {
String name = (String) headersKeys.elementAt(i);