Submitted by: Larry Shatzer (Larry dot Shatzer At Spirent Dot Com) git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275235 13f79535-47bb-0310-9956-ffa450edef68master
@@ -877,7 +877,7 @@ public class DirectoryScanner | |||||
} | } | ||||
} catch (IOException ioe) { | } catch (IOException ioe) { | ||||
String msg = "IOException caught while checking " | String msg = "IOException caught while checking " | ||||
+ "for links, couldn't get cannonical path!"; | |||||
+ "for links, couldn't get canonical path!"; | |||||
// will be caught and redirected to Ant's logging system | // will be caught and redirected to Ant's logging system | ||||
System.err.println(msg); | System.err.println(msg); | ||||
noLinks.addElement(newfiles[i]); | noLinks.addElement(newfiles[i]); | ||||
@@ -1108,7 +1108,7 @@ public class DirectoryScanner | |||||
* performing a slow scan if one has not already been completed. | * performing a slow scan if one has not already been completed. | ||||
* | * | ||||
* @return the names of the files which matched at least one of the | * @return the names of the files which matched at least one of the | ||||
* include patterns and at at least one of the exclude patterns. | |||||
* include patterns and at least one of the exclude patterns. | |||||
* | * | ||||
* @see #slowScan | * @see #slowScan | ||||
*/ | */ | ||||
@@ -1385,7 +1385,7 @@ public class DirectoryScanner | |||||
} | } | ||||
} catch (IOException ioe) { | } catch (IOException ioe) { | ||||
String msg = "IOException caught while checking " | String msg = "IOException caught while checking " | ||||
+ "for links, couldn't get cannonical path!"; | |||||
+ "for links, couldn't get canonical path!"; | |||||
// will be caught and redirected to Ant's logging system | // will be caught and redirected to Ant's logging system | ||||
System.err.println(msg); | System.err.println(msg); | ||||
return false; | return false; | ||||
@@ -1402,8 +1402,8 @@ public class DirectoryScanner | |||||
private Set scannedDirs = new HashSet(); | private Set scannedDirs = new HashSet(); | ||||
/** | /** | ||||
* Has the directorty with the given path relative to the base | |||||
* directory allready been scanned? | |||||
* Has the directory with the given path relative to the base | |||||
* directory already been scanned? | |||||
* | * | ||||
* <p>Registers the given directory as scanned as a side effect.</p> | * <p>Registers the given directory as scanned as a side effect.</p> | ||||
* | * | ||||
@@ -1,7 +1,7 @@ | |||||
/* | /* | ||||
* The Apache Software License, Version 1.1 | * The Apache Software License, Version 1.1 | ||||
* | * | ||||
* Copyright (c) 2000-2002 The Apache Software Foundation. All rights | |||||
* Copyright (c) 2000-2003 The Apache Software Foundation. All rights | |||||
* reserved. | * reserved. | ||||
* | * | ||||
* Redistribution and use in source and binary forms, with or without | * Redistribution and use in source and binary forms, with or without | ||||
@@ -91,7 +91,7 @@ public interface FileScanner { | |||||
* The names are relative to the base directory. | * The names are relative to the base directory. | ||||
* | * | ||||
* @return the names of the files which matched at least one of the | * @return the names of the files which matched at least one of the | ||||
* include patterns and at at least one of the exclude patterns. | |||||
* include patterns and at least one of the exclude patterns. | |||||
* | * | ||||
*/ | */ | ||||
String[] getExcludedFiles(); | String[] getExcludedFiles(); | ||||
@@ -146,7 +146,7 @@ public final class IntrospectionHelper implements BuildListener { | |||||
// distinction between addConfigured and add. It's obvious what the | // distinction between addConfigured and add. It's obvious what the | ||||
// code *here* does (addConfigured sets both a creator method which | // code *here* does (addConfigured sets both a creator method which | ||||
// calls a no-arg constructor and a storer method which calls the | // calls a no-arg constructor and a storer method which calls the | ||||
// method we're looking at, whlie add just sets a creator method | |||||
// method we're looking at, while add just sets a creator method | |||||
// which calls the method we're looking at) but it's not at all | // which calls the method we're looking at) but it's not at all | ||||
// obvious what the difference in actual *effect* will be later | // obvious what the difference in actual *effect* will be later | ||||
// on. I can't see any mention of addConfiguredXXX in "Developing | // on. I can't see any mention of addConfiguredXXX in "Developing | ||||
@@ -1071,7 +1071,7 @@ public final class IntrospectionHelper implements BuildListener { | |||||
if (polyType != null) { | if (polyType != null) { | ||||
if (!nestedCreator.isPolyMorphic()) { | if (!nestedCreator.isPolyMorphic()) { | ||||
throw new BuildException( | throw new BuildException( | ||||
"Not allowed to use the polymorhic form" | |||||
"Not allowed to use the polymorphic form" | |||||
+ " for this element"); | + " for this element"); | ||||
} | } | ||||
Class elementClass = nestedCreator.getElementClass(); | Class elementClass = nestedCreator.getElementClass(); | ||||
@@ -1111,8 +1111,8 @@ public final class IntrospectionHelper implements BuildListener { | |||||
} | } | ||||
/** | /** | ||||
* Stores the nested elemtnt object using a storage method | |||||
* detimined by introspection. | |||||
* Stores the nested element object using a storage method | |||||
* determined by introspection. | |||||
* | * | ||||
*/ | */ | ||||
public void store() { | public void store() { | ||||
@@ -1,7 +1,7 @@ | |||||
/* | /* | ||||
* The Apache Software License, Version 1.1 | * The Apache Software License, Version 1.1 | ||||
* | * | ||||
* Copyright (c) 2001,2002 The Apache Software Foundation. All rights | |||||
* Copyright (c) 2001-2003 The Apache Software Foundation. All rights | |||||
* reserved. | * reserved. | ||||
* | * | ||||
* Redistribution and use in source and binary forms, with or without | * Redistribution and use in source and binary forms, with or without | ||||
@@ -106,7 +106,7 @@ public abstract class ProjectComponent { | |||||
} | } | ||||
/** | /** | ||||
* Logs a mesage with the given priority. | |||||
* Logs a message with the given priority. | |||||
* | * | ||||
* @param msg The message to be logged. Should not be <code>null</code>. | * @param msg The message to be logged. Should not be <code>null</code>. | ||||
* @param msgLevel the message priority at which this message is | * @param msgLevel the message priority at which this message is | ||||
@@ -1,7 +1,7 @@ | |||||
/* | /* | ||||
* The Apache Software License, Version 1.1 | * The Apache Software License, Version 1.1 | ||||
* | * | ||||
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights | |||||
* Copyright (c) 2001-2003 The Apache Software Foundation. All rights | |||||
* reserved. | * reserved. | ||||
* | * | ||||
* Redistribution and use in source and binary forms, with or without | * Redistribution and use in source and binary forms, with or without | ||||
@@ -116,7 +116,7 @@ public class CVSPass extends Task { | |||||
/** | /** | ||||
* Does the work. | * Does the work. | ||||
* | * | ||||
* @exception BuildException if someting goes wrong with the build | |||||
* @exception BuildException if something goes wrong with the build | |||||
*/ | */ | ||||
public final void execute() throws BuildException { | public final void execute() throws BuildException { | ||||
if (cvsRoot == null) { | if (cvsRoot == null) { | ||||
@@ -96,7 +96,7 @@ public class Checksum extends MatchingTask implements Condition { | |||||
private File file = null; | private File file = null; | ||||
/** | /** | ||||
* Root directory in which the checksu files will be written. | |||||
* Root directory in which the checksum files will be written. | |||||
* If not specified, the checksum files will be written | * If not specified, the checksum files will be written | ||||
* in the same directory as each file. | * in the same directory as each file. | ||||
*/ | */ | ||||
@@ -576,7 +576,7 @@ public class Checksum extends MatchingTask implements Condition { | |||||
} | } | ||||
/** | /** | ||||
* Converts an array of characters representing hexidecimal values into an | |||||
* Converts an array of characters representing hexadecimal values into an | |||||
* array of bytes of those same values. The returned array will be half the | * array of bytes of those same values. The returned array will be half the | ||||
* length of the passed array, as it takes two characters to represent any | * length of the passed array, as it takes two characters to represent any | ||||
* given byte. An exception is thrown if the passed char array has an odd | * given byte. An exception is thrown if the passed char array has an odd | ||||
@@ -303,7 +303,7 @@ public class Concat extends Task { | |||||
/** | /** | ||||
* Specify the end of line to find and to add if | * Specify the end of line to find and to add if | ||||
* not present at end of each input file. This attribute | * not present at end of each input file. This attribute | ||||
* is used in conjuction with fixlastline. | |||||
* is used in conjunction with fixlastline. | |||||
* @param crlf the type of new line to add - | * @param crlf the type of new line to add - | ||||
* cr, mac, lf, unix, crlf, or dos | * cr, mac, lf, unix, crlf, or dos | ||||
* @since Ant 1.6 | * @since Ant 1.6 | ||||
@@ -737,7 +737,7 @@ public class Concat extends Task { | |||||
* Read a character from the current reader object. Advance | * Read a character from the current reader object. Advance | ||||
* to the next if the reader is finished. | * to the next if the reader is finished. | ||||
* @return the character read, -1 for EOF on the last reader. | * @return the character read, -1 for EOF on the last reader. | ||||
* @exception IOException - possiblly thrown by the read for a reader | |||||
* @exception IOException - possibly thrown by the read for a reader | |||||
* object. | * object. | ||||
*/ | */ | ||||
public int read() throws IOException { | public int read() throws IOException { | ||||
@@ -773,7 +773,7 @@ public class Concat extends Task { | |||||
* @param cbuf The array to be read into. | * @param cbuf The array to be read into. | ||||
* @param off The offset. | * @param off The offset. | ||||
* @param len The length to read. | * @param len The length to read. | ||||
* @exception IOException - possiblely thrown by the reads to the | |||||
* @exception IOException - possibly thrown by the reads to the | |||||
* reader objects. | * reader objects. | ||||
*/ | */ | ||||
public int read(char[] cbuf, int off, int len) | public int read(char[] cbuf, int off, int len) | ||||
@@ -193,7 +193,7 @@ public class Copy extends Task { | |||||
/** | /** | ||||
* Give the copied files the same last modified time as the original files. | * Give the copied files the same last modified time as the original files. | ||||
* @param preserve if true perserce the modified time, default is false | |||||
* @param preserve if true preserve the modified time, default is false | |||||
*/ | */ | ||||
public void setPreserveLastModified(boolean preserve) { | public void setPreserveLastModified(boolean preserve) { | ||||
preserveLastModified = preserve; | preserveLastModified = preserve; | ||||
@@ -537,7 +537,7 @@ public class Copy extends Task { | |||||
* copied. | * copied. | ||||
* | * | ||||
* @param fromDir The source directory | * @param fromDir The source directory | ||||
* @param toDir The destination dirctory | |||||
* @param toDir The destination directory | |||||
* @param files A list of files to copy | * @param files A list of files to copy | ||||
* @param dirs A list of directories to copy | * @param dirs A list of directories to copy | ||||
*/ | */ | ||||
@@ -65,7 +65,7 @@ import org.apache.tools.ant.util.ClasspathUtils; | |||||
/** | /** | ||||
* Base class for Definitions | * Base class for Definitions | ||||
* handling uri and and class loading. | |||||
* handling uri and class loading. | |||||
* (This was part of Definer) | * (This was part of Definer) | ||||
* | * | ||||
* @author Costin Manolache | * @author Costin Manolache | ||||
@@ -130,7 +130,7 @@ public abstract class DefBase extends Task implements AntlibInterface { | |||||
} | } | ||||
/** | /** | ||||
* @return the class path path for this definition | |||||
* @return the classpath for this definition | |||||
*/ | */ | ||||
public Path getClasspath() { | public Path getClasspath() { | ||||
return cpDelegate.getClasspath(); | return cpDelegate.getClasspath(); | ||||
@@ -80,7 +80,7 @@ public class DefaultExcludes extends Task { | |||||
/** | /** | ||||
* Does the work. | * Does the work. | ||||
* | * | ||||
* @exception BuildException if someting goes wrong with the build | |||||
* @exception BuildException if something goes wrong with the build | |||||
*/ | */ | ||||
public void execute() throws BuildException { | public void execute() throws BuildException { | ||||
if (!defaultrequested && add.equals("") && remove.equals("") && !echo) { | if (!defaultrequested && add.equals("") && remove.equals("") && !echo) { | ||||
@@ -129,7 +129,7 @@ public class DefaultExcludes extends Task { | |||||
* Pattern to remove from the default excludes. | * Pattern to remove from the default excludes. | ||||
* | * | ||||
* @param remove Sets the value for the pattern that | * @param remove Sets the value for the pattern that | ||||
* should nolonger be excluded. | |||||
* should no longer be excluded. | |||||
*/ | */ | ||||
public void setRemove(String remove) { | public void setRemove(String remove) { | ||||
this.remove = remove; | this.remove = remove; | ||||
@@ -444,7 +444,7 @@ public class Delete extends MatchingTask { | |||||
} | } | ||||
/** | /** | ||||
* add an arbitary selector | |||||
* add an arbitrary selector | |||||
* @param selector the selector to be added | * @param selector the selector to be added | ||||
* @since Ant 1.6 | * @since Ant 1.6 | ||||
*/ | */ | ||||
@@ -136,7 +136,7 @@ public class Ear extends Jar { | |||||
} | } | ||||
/** | /** | ||||
* Overriden from Zip class to deal with application.xml | |||||
* Overridden from Zip class to deal with application.xml | |||||
*/ | */ | ||||
protected void zipFile(File file, ZipOutputStream zOut, String vPath, | protected void zipFile(File file, ZipOutputStream zOut, String vPath, | ||||
int mode) | int mode) | ||||
@@ -1,7 +1,7 @@ | |||||
/* | /* | ||||
* The Apache Software License, Version 1.1 | * The Apache Software License, Version 1.1 | ||||
* | * | ||||
* Copyright (c) 2000-2002 The Apache Software Foundation. All rights | |||||
* Copyright (c) 2000-2003 The Apache Software Foundation. All rights | |||||
* reserved. | * reserved. | ||||
* | * | ||||
* Redistribution and use in source and binary forms, with or without | * Redistribution and use in source and binary forms, with or without | ||||
@@ -81,7 +81,7 @@ public class Echo extends Task { | |||||
/** | /** | ||||
* Does the work. | * Does the work. | ||||
* | * | ||||
* @exception BuildException if someting goes wrong with the build | |||||
* @exception BuildException if something goes wrong with the build | |||||
*/ | */ | ||||
public void execute() throws BuildException { | public void execute() throws BuildException { | ||||
if (file == null) { | if (file == null) { | ||||
@@ -537,7 +537,7 @@ public class ExecTask extends Task { | |||||
/** | /** | ||||
* Run the command using the given Execute instance. This may be | * Run the command using the given Execute instance. This may be | ||||
* overidden by subclasses | |||||
* overridden by subclasses | |||||
* | * | ||||
* @param exe instance of Execute to run | * @param exe instance of Execute to run | ||||
* | * | ||||
@@ -440,7 +440,7 @@ public class Execute { | |||||
* allow the shell to perform additional processing such as associating an | * allow the shell to perform additional processing such as associating an | ||||
* executable with a script, etc | * executable with a script, etc | ||||
* | * | ||||
* @param useVMLauncher true if exec should launch through thge VM, | |||||
* @param useVMLauncher true if exec should launch through the VM, | |||||
* false if the shell should be used to launch the | * false if the shell should be used to launch the | ||||
* command. | * command. | ||||
*/ | */ | ||||
@@ -603,7 +603,7 @@ public class Execute { | |||||
/** | /** | ||||
* test for an untimely death of the process | * test for an untimely death of the process | ||||
* @return true iff a watchdog had to kill the process | |||||
* @return true if a watchdog had to kill the process | |||||
* @since Ant 1.5 | * @since Ant 1.5 | ||||
*/ | */ | ||||
public boolean killedProcess() { | public boolean killedProcess() { | ||||
@@ -727,7 +727,7 @@ public class Execute { | |||||
* @param project The project that the command is part of | * @param project The project that the command is part of | ||||
* @param cmd The command to execute | * @param cmd The command to execute | ||||
* @param env The environment for the new process. If null, | * @param env The environment for the new process. If null, | ||||
* the environment of the current proccess is used. | |||||
* the environment of the current process is used. | |||||
* @throws IOException if attempting to run a command in a specific directory | * @throws IOException if attempting to run a command in a specific directory | ||||
*/ | */ | ||||
public Process exec(Project project, String[] cmd, String[] env) | public Process exec(Project project, String[] cmd, String[] env) | ||||
@@ -746,7 +746,7 @@ public class Execute { | |||||
* @param project The project that the command is part of | * @param project The project that the command is part of | ||||
* @param cmd The command to execute | * @param cmd The command to execute | ||||
* @param env The environment for the new process. If null, | * @param env The environment for the new process. If null, | ||||
* the environment of the current proccess is used. | |||||
* the environment of the current process is used. | |||||
* @param workingDir The directory to start the command in. If null, | * @param workingDir The directory to start the command in. If null, | ||||
* the current directory is used | * the current directory is used | ||||
* @throws IOException if trying to change directory | * @throws IOException if trying to change directory | ||||
@@ -166,7 +166,7 @@ public class ExecuteJava implements Runnable, TimeoutObserver { | |||||
Task currentThreadTask | Task currentThreadTask | ||||
= project.getThreadTask(Thread.currentThread()); | = project.getThreadTask(Thread.currentThread()); | ||||
project.registerThreadTask(thread, currentThreadTask); | project.registerThreadTask(thread, currentThreadTask); | ||||
// if we run into a timout, the run-away thread shall not | |||||
// if we run into a timeout, the run-away thread shall not | |||||
// make the VM run forever - if no timeout occurs, Ant's | // make the VM run forever - if no timeout occurs, Ant's | ||||
// main thread will still be there to let the new thread | // main thread will still be there to let the new thread | ||||
// finish | // finish | ||||
@@ -82,7 +82,7 @@ public class ExecuteWatchdog implements TimeoutObserver { | |||||
/** the process to execute and watch for duration */ | /** the process to execute and watch for duration */ | ||||
private Process process; | private Process process; | ||||
/** say whether or not the watchog is currently monitoring a process */ | |||||
/** say whether or not the watchdog is currently monitoring a process */ | |||||
private boolean watch = false; | private boolean watch = false; | ||||
/** exception that might be thrown during the process execution */ | /** exception that might be thrown during the process execution */ | ||||
@@ -91,14 +91,14 @@ public class ExecuteWatchdog implements TimeoutObserver { | |||||
/** say whether or not the process was killed due to running overtime */ | /** say whether or not the process was killed due to running overtime */ | ||||
private boolean killedProcess = false; | private boolean killedProcess = false; | ||||
/** will tell us whether timeout has occured */ | |||||
/** will tell us whether timeout has occurred */ | |||||
private Watchdog watchdog; | private Watchdog watchdog; | ||||
/** | /** | ||||
* Creates a new watchdog with a given timeout. | * Creates a new watchdog with a given timeout. | ||||
* | * | ||||
* @param timeout the timeout for the process in milliseconds. | * @param timeout the timeout for the process in milliseconds. | ||||
* It must be greather than 0. | |||||
* It must be greater than 0. | |||||
*/ | */ | ||||
public ExecuteWatchdog(long timeout) { | public ExecuteWatchdog(long timeout) { | ||||
watchdog = new Watchdog(timeout); | watchdog = new Watchdog(timeout); | ||||
@@ -111,7 +111,7 @@ public class Exit extends Task { | |||||
* evaluate both if and unless conditions, and if | * evaluate both if and unless conditions, and if | ||||
* ifCondition is true or unlessCondition is false, throw a | * ifCondition is true or unlessCondition is false, throw a | ||||
* build exception to exit the build. | * build exception to exit the build. | ||||
* The errore message is constructed from the text fields, or from | |||||
* The error message is constructed from the text fields, or from | |||||
* the if and unless parameters (if present). | * the if and unless parameters (if present). | ||||
* @throws BuildException | * @throws BuildException | ||||
*/ | */ | ||||
@@ -168,7 +168,7 @@ public class Exit extends Task { | |||||
/** | /** | ||||
* test the unless condition | * test the unless condition | ||||
* @return true if there is no unless condition, | * @return true if there is no unless condition, | ||||
* or there is a named property but it doesnt exist | |||||
* or there is a named property but it doesn't exist | |||||
*/ | */ | ||||
private boolean testUnlessCondition() { | private boolean testUnlessCondition() { | ||||
if (unlessCondition == null || "".equals(unlessCondition)) { | if (unlessCondition == null || "".equals(unlessCondition)) { | ||||