conor 2003/07/06 02:57:39
Modified: src/main/org/apache/tools/ant AntClassLoader.java
BuildEvent.java BuildListener.java BuildLogger.java
ComponentHelper.java DefaultLogger.java
DemuxInputStream.java DemuxOutputStream.java
Diagnostics.java DirectoryScanner.java
DynamicConfigurator.java FileScanner.java
IntrospectionHelper.java Location.java Main.java
NoBannerLogger.java PathTokenizer.java
ProjectComponent.java RuntimeConfigurable.java
Target.java Task.java TaskAdapter.java
UnknownElement.java XmlLogger.java
src/main/org/apache/tools/ant/filters BaseFilterReader.java
BaseParamFilterReader.java ChainableReader.java
ClassConstants.java EscapeUnicode.java
ExpandProperties.java HeadFilter.java
LineContainsRegExp.java PrefixLines.java
ReplaceTokens.java StripLineBreaks.java
StripLineComments.java TabsToSpaces.java
TailFilter.java
src/main/org/apache/tools/ant/taskdefs AbstractCvsTask.java
Ant.java Basename.java CallTarget.java Concat.java
Copy.java Copydir.java Copyfile.java Cvs.java
Delete.java Deltree.java Ear.java Echo.java
Exec.java ExecTask.java ExecuteOn.java
ExecuteWatchdog.java FixCRLF.java GenerateKey.java
Get.java ImportTask.java Input.java Jar.java
Java.java Javadoc.java Jikes.java
JikesOutputParser.java KeySubst.java LoadFile.java
LogOutputStream.java Manifest.java
ManifestTask.java MatchingTask.java Mkdir.java
Parallel.java Patch.java PathConvert.java
ProcessDestroyer.java PumpStreamHandler.java
Replace.java SQLExec.java SendEmail.java
Sequential.java SignJar.java StreamPumper.java
Sync.java Tar.java Touch.java Transform.java
Typedef.java Untar.java UpToDate.java WaitFor.java
War.java XSLTProcess.java XmlProperty.java Zip.java
Log:
More cleanup
Revision Changes Path
1.70 +17 -15 ant/src/main/org/apache/tools/ant/AntClassLoader.java
Index: AntClassLoader.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/AntClassLoader.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -w -u -r1.69 -r1.70
--- AntClassLoader.java 10 Jun 2003 14:01:24 -0000 1.69
+++ AntClassLoader.java 6 Jul 2003 09:57:34 -0000 1.70
@@ -155,8 +155,8 @@
*/
private void findNextResource() {
URL url = null;
- while ((pathElementsIndex < pathComponents.size()) &&
- (url == null)) {
+ while ((pathElementsIndex < pathComponents.size())
+ && (url == null)) {
try {
File pathComponent
= (File) pathComponents.elementAt(pathElementsIndex);
@@ -1184,7 +1184,9 @@
if (stream != null) {
stream.close();
}
- } catch (IOException e) {}
+ } catch (IOException e) {
+ //ignore
+ }
}
}
1.10 +20 -20 ant/src/main/org/apache/tools/ant/BuildEvent.java
Index: BuildEvent.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/BuildEvent.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -u -r1.9 -r1.10
1.9 +7 -7 ant/src/main/org/apache/tools/ant/BuildListener.java
Index: BuildListener.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/BuildListener.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -u -r1.8 -r1.9
1.11 +12 -12 ant/src/main/org/apache/tools/ant/BuildLogger.java
Index: BuildLogger.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/BuildLogger.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -u -r1.10 -r1.11
1.18 +2 -2 ant/src/main/org/apache/tools/ant/ComponentHelper.java
Index: ComponentHelper.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/ComponentHelper.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -u -r1.17 -r1.18
--- ComponentHelper.java 4 Jul 2003 17:00:11 -0000 1.17
+++ ComponentHelper.java 6 Jul 2003 09:57:34 -0000 1.18
@@ -105,8 +105,8 @@
*/
private Hashtable createdTasks = new Hashtable();
- protected ComponentHelper next;
- protected Project project;
+ private ComponentHelper next;
+ private Project project;
/**
* find a project component for a specific project, creating
1.43 +37 -30 ant/src/main/org/apache/tools/ant/DefaultLogger.java
Index: DefaultLogger.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/DefaultLogger.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -w -u -r1.42 -r1.43
--- DefaultLogger.java 10 Feb 2003 14:13:30 -0000 1.42
+++ DefaultLogger.java 6 Jul 2003 09:57:34 -0000 1.43
@@ -77,10 +77,13 @@
/** PrintStream to write non-error messages to */
protected PrintStream out;
+
/** PrintStream to write error messages to */
protected PrintStream err;
+
/** Lowest level of message to write out */
protected int msgOutputLevel = Project.MSG_ERR;
+
/** Time of the start of the build */
private long startTime = System.currentTimeMillis();
@@ -175,8 +178,8 @@
message.append("BUILD FAILED");
message.append(StringUtils.LINE_SEP);
- if (Project.MSG_VERBOSE <= msgOutputLevel ||
- !(error instanceof BuildException)) {
+ if (Project.MSG_VERBOSE <= msgOutputLevel
+ || !(error instanceof BuildException)) {
message.append(StringUtils.getStackTrace(error));
} else {
if (error instanceof BuildException) {
@@ -221,21 +224,24 @@
*
* @param event Ignored.
*/
- public void targetFinished(BuildEvent event) {}
+ public void targetFinished(BuildEvent event) {
+ }
/**
* No-op implementation.
*
* @param event Ignored.
*/
- public void taskStarted(BuildEvent event) {}
+ public void taskStarted(BuildEvent event) {
+ }
/**
* No-op implementation.
*
* @param event Ignored.
*/
- public void taskFinished(BuildEvent event) {}
+ public void taskFinished(BuildEvent event) {
+ }
/**
* Logs a message, if the priority is suitable.
@@ -330,5 +336,6 @@
*
* @param message Message being logged. Should not be <code>null</code>.
*/
- protected void log(String message) {}
+ protected void log(String message) {
+ }
}
1.4 +3 -3 ant/src/main/org/apache/tools/ant/DemuxInputStream.java
Index: DemuxInputStream.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/DemuxInputStream.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -u -r1.3 -r1.4
1.14 +15 -15 ant/src/main/org/apache/tools/ant/DemuxOutputStream.java
Index: DemuxOutputStream.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/DemuxOutputStream.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -u -r1.13 -r1.14
1.10 +33 -32 ant/src/main/org/apache/tools/ant/Diagnostics.java
Index: Diagnostics.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Diagnostics.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -u -r1.9 -r1.10
--- Diagnostics.java 14 Apr 2003 14:47:41 -0000 1.9
+++ Diagnostics.java 6 Jul 2003 09:57:34 -0000 1.10
@@ -111,13 +111,13 @@
String optionalVersion = getImplementationVersion(optional);
if (coreVersion != null && !coreVersion.equals(optionalVersion))
{
- throw new BuildException(
- "Invalid implementation version between Ant core and
"
- + "Ant optional tasks.\n" +
- " core : " + coreVersion + "\n" +
- " optional: " + optionalVersion);
+ throw new BuildException("Invalid implementation version "
+ + "between Ant core and Ant optional tasks.\n"
+ + " core : " + coreVersion + "\n"
+ + " optional: " + optionalVersion);
}
} catch (ClassNotFoundException e){
+ // ignore
}
}
@@ -211,6 +211,7 @@
try {
saxParser = saxParserFactory.newSAXParser();
} catch (Exception e) {
+ // ignore
}
return saxParser;
}
1.42 +12 -12 ant/src/main/org/apache/tools/ant/DirectoryScanner.java
Index: DirectoryScanner.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/DirectoryScanner.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -w -u -r1.41 -r1.42
--- DirectoryScanner.java 9 May 2003 12:44:52 -0000 1.41
+++ DirectoryScanner.java 6 Jul 2003 09:57:34 -0000 1.42
@@ -859,7 +859,7 @@
protected boolean isSelected(String name, File file) {
if (selectors != null) {
for (int i = 0; i < selectors.length; i++) {
- if ((selectors[i].isSelected(basedir, name, file)) == false)
{
+ if (!selectors[i].isSelected(basedir, name, file)) {
return false;
}
}
1.7 +4 -4
ant/src/main/org/apache/tools/ant/DynamicConfigurator.java
Index: DynamicConfigurator.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/DynamicConfigurator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -u -r1.6 -r1.7
1.12 +39 -37 ant/src/main/org/apache/tools/ant/FileScanner.java
Index: FileScanner.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/FileScanner.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -u -r1.11 -r1.12
--- FileScanner.java 10 Feb 2003 14:13:30 -0000 1.11
+++ FileScanner.java 6 Jul 2003 09:57:34 -0000 1.12
@@ -58,6 +58,8 @@
/**
* An interface used to describe the actions required of any type of
* directory scanner.
+ *
+ * @author Apache Ant
*/
public interface FileScanner {
/**
1.57 +2 -2
ant/src/main/org/apache/tools/ant/IntrospectionHelper.java
Index: IntrospectionHelper.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/IntrospectionHelper.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -w -u -r1.56 -r1.57
1.14 +9 -9 ant/src/main/org/apache/tools/ant/Location.java
Index: Location.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Location.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -u -r1.13 -r1.14
1.85 +6 -6 ant/src/main/org/apache/tools/ant/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Main.java,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -w -u -r1.84 -r1.85
1.10 +8 -8 ant/src/main/org/apache/tools/ant/NoBannerLogger.java
Index: NoBannerLogger.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/NoBannerLogger.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -u -r1.9 -r1.10
1.16 +21 -21 ant/src/main/org/apache/tools/ant/PathTokenizer.java
Index: PathTokenizer.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/PathTokenizer.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -w -u -r1.15 -r1.16
1.9 +2 -2 ant/src/main/org/apache/tools/ant/ProjectComponent.java
Index: ProjectComponent.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/ProjectComponent.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -u -r1.8 -r1.9
1.38 +9 -9
ant/src/main/org/apache/tools/ant/RuntimeConfigurable.java
Index: RuntimeConfigurable.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/RuntimeConfigurable.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -w -u -r1.37 -r1.38
1.38 +45 -45 ant/src/main/org/apache/tools/ant/Target.java
Index: Target.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Target.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -w -u -r1.37 -r1.38
1.44 +5 -5 ant/src/main/org/apache/tools/ant/Task.java
Index: Task.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Task.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -w -u -r1.43 -r1.44
1.22 +21 -21 ant/src/main/org/apache/tools/ant/TaskAdapter.java
Index: TaskAdapter.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/TaskAdapter.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -w -u -r1.21 -r1.22
1.54 +20 -20 ant/src/main/org/apache/tools/ant/UnknownElement.java
Index: UnknownElement.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/UnknownElement.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -w -u -r1.53 -r1.54
1.37 +2 -2 ant/src/main/org/apache/tools/ant/XmlLogger.java
Index: XmlLogger.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/XmlLogger.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -w -u -r1.36 -r1.37
1.13 +17 -17
ant/src/main/org/apache/tools/ant/filters/BaseFilterReader.java
Index: BaseFilterReader.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/filters/BaseFilterReader.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -u -r1.12 -r1.13
1.9 +3 -3
ant/src/main/org/apache/tools/ant/filters/BaseParamFilterReader.java
Index: BaseParamFilterReader.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/filters/BaseParamFilterReader.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -u -r1.8 -r1.9
1.6 +3 -3
ant/src/main/org/apache/tools/ant/filters/ChainableReader.java
Index: ChainableReader.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/filters/ChainableReader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -u -r1.5 -r1.6
--- ChainableReader.java 10 Feb 2003 14:13:32 -0000 1.5
+++ ChainableReader.java 6 Jul 2003 09:57:35 -0000 1.6
@@ -70,5 +70,5 @@
* @return a reader with the same configuration as this one, but
* filtering input from the specified reader
*/
- public Reader chain(Reader rdr);
+ Reader chain(Reader rdr);
}
1.8 +9 -8
ant/src/main/org/apache/tools/ant/filters/ClassConstants.java
Index: ClassConstants.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/filters/ClassConstants.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -u -r1.7 -r1.8
--- ClassConstants.java 10 Feb 2003 14:13:32 -0000 1.7
+++ ClassConstants.java 6 Jul 2003 09:57:35 -0000 1.8
@@ -76,7 +76,8 @@
* Example:<br>
* <pre><classconstants/></pre>
* Or:
- * <pre><filterreader
classname="org.apache.tools.ant.filters.ClassConstants"/></pre>
+ * <pre><filterreader
+ *
classname="org.apache.tools.ant.filters.ClassConstants"/></pre>
* @author Magesh Umasankar
*/
public final class ClassConstants
@@ -144,7 +145,7 @@
final Class javaClassHelper =
Class.forName(JAVA_CLASS_HELPER);
if (javaClassHelper != null) {
- final Class params[] = {
+ final Class[] params = {
byte[].class
};
final Method getConstants =
1.3 +1 -6
ant/src/main/org/apache/tools/ant/filters/EscapeUnicode.java
Index: EscapeUnicode.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/filters/EscapeUnicode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
--- EscapeUnicode.java 14 Apr 2003 11:58:03 -0000 1.2
+++ EscapeUnicode.java 6 Jul 2003 09:57:35 -0000 1.3
@@ -161,11 +161,6 @@
* Parses the parameters (currently unused)
*/
private final void initialize() {
- Parameter[] params = getParameters();
- if (params != null) {
- for (int i = 0; i < params.length; i++) {
- }
- }
}
}
1.8 +9 -8
ant/src/main/org/apache/tools/ant/filters/ExpandProperties.java
Index: ExpandProperties.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/filters/ExpandProperties.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -u -r1.7 -r1.8
--- ExpandProperties.java 10 Feb 2003 14:13:32 -0000 1.7
+++ ExpandProperties.java 6 Jul 2003 09:57:35 -0000 1.8
@@ -63,7 +63,8 @@
* Example:<br>
* <pre><expandproperties/></pre>
* Or:
- * <pre><filterreader
classname="org.apache.tools.ant.filters.ExpandProperties"/></pre>
+ * <pre><filterreader
+ *
classname="org.apache.tools.ant.filters.ExpandProperties"/></pre>
*
* @author Magesh Umasankar
*/
1.10 +10 -5 ant/src/main/org/apache/tools/ant/filters/HeadFilter.java
Index: HeadFilter.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/filters/HeadFilter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -u -r1.9 -r1.10
--- HeadFilter.java 22 Apr 2003 18:23:54 -0000 1.9
+++ HeadFilter.java 6 Jul 2003 09:57:35 -0000 1.10
@@ -82,8 +82,11 @@
/** Number of lines currently read in. */
private long linesRead = 0;
+ /** Default number of lines to show */
+ private static int DEFAULT_NUM_LINES = 10;
+
/** Number of lines to be returned in the filtered stream. */
- private long lines = 10;
+ private long lines = DEFAULT_NUM_LINES;
/** Number of lines to be skipped. */
private long skip = 0;
@@ -137,16 +140,18 @@
while (line == null || line.length() == 0) {
line = lineTokenizer.getToken(in);
- if (line == null)
+ if (line == null) {
return -1;
+ }
line = headFilter(line);
linePos = 0;
}
int ch = line.charAt(linePos);
linePos++;
- if (linePos == line.length())
+ if (linePos == line.length()) {
line = null;
+ }
return ch;
}
@@ -171,7 +176,7 @@
/**
* Sets the number of lines to be skipped in the filtered stream.
*
- * @param lines the number of lines to be skipped in the filtered stream
+ * @param skip the number of lines to be skipped in the filtered stream
*/
public final void setSkip(final long skip) {
this.skip = skip;
1.9 +16 -16
ant/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java
Index: LineContainsRegExp.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -u -r1.8 -r1.9
1.8 +8 -8
ant/src/main/org/apache/tools/ant/filters/PrefixLines.java
Index: PrefixLines.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/filters/PrefixLines.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -u -r1.7 -r1.8
1.12 +26 -26
ant/src/main/org/apache/tools/ant/filters/ReplaceTokens.java
Index: ReplaceTokens.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/filters/ReplaceTokens.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -u -r1.11 -r1.12
1.8 +10 -10
ant/src/main/org/apache/tools/ant/filters/StripLineBreaks.java
Index: StripLineBreaks.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/filters/StripLineBreaks.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -u -r1.7 -r1.8
1.10 +13 -13
ant/src/main/org/apache/tools/ant/filters/StripLineComments.java
Index: StripLineComments.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/filters/StripLineComments.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -u -r1.9 -r1.10
1.8 +8 -8
ant/src/main/org/apache/tools/ant/filters/TabsToSpaces.java
Index: TabsToSpaces.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/filters/TabsToSpaces.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -u -r1.7 -r1.8
1.10 +2 -2 ant/src/main/org/apache/tools/ant/filters/TailFilter.java
Index: TailFilter.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/filters/TailFilter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -u -r1.9 -r1.10
1.19 +13 -13
ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
Index: AbstractCvsTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -u -r1.18 -r1.19
1.79 +8 -8 ant/src/main/org/apache/tools/ant/taskdefs/Ant.java
Index: Ant.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Ant.java,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -w -u -r1.78 -r1.79
1.8 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Basename.java
Index: Basename.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Basename.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -u -r1.7 -r1.8
1.34 +9 -9
ant/src/main/org/apache/tools/ant/taskdefs/CallTarget.java
Index: CallTarget.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/CallTarget.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -w -u -r1.33 -r1.34
1.21 +20 -20 ant/src/main/org/apache/tools/ant/taskdefs/Concat.java
Index: Concat.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Concat.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -u -r1.20 -r1.21
1.60 +7 -7 ant/src/main/org/apache/tools/ant/taskdefs/Copy.java
Index: Copy.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Copy.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -w -u -r1.59 -r1.60
1.27 +3 -3 ant/src/main/org/apache/tools/ant/taskdefs/Copydir.java
Index: Copydir.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Copydir.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -w -u -r1.26 -r1.27
1.18 +5 -5 ant/src/main/org/apache/tools/ant/taskdefs/Copyfile.java
Index: Copyfile.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Copyfile.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -u -r1.17 -r1.18
1.30 +3 -3 ant/src/main/org/apache/tools/ant/taskdefs/Cvs.java
Index: Cvs.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Cvs.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -w -u -r1.29 -r1.30
1.41 +23 -23 ant/src/main/org/apache/tools/ant/taskdefs/Delete.java
Index: Delete.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Delete.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -w -u -r1.40 -r1.41
1.18 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Deltree.java
Index: Deltree.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Deltree.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -u -r1.17 -r1.18
1.24 +4 -4 ant/src/main/org/apache/tools/ant/taskdefs/Ear.java
Index: Ear.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Ear.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -w -u -r1.23 -r1.24
1.27 +5 -5 ant/src/main/org/apache/tools/ant/taskdefs/Echo.java
Index: Echo.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Echo.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -w -u -r1.26 -r1.27
1.34 +6 -6 ant/src/main/org/apache/tools/ant/taskdefs/Exec.java
Index: Exec.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Exec.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -w -u -r1.33 -r1.34
1.53 +15 -15 ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
Index: ExecTask.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -w -u -r1.52 -r1.53
1.42 +34 -34 ant/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
Index: ExecuteOn.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -w -u -r1.41 -r1.42
1.13 +11 -11
ant/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java
Index: ExecuteWatchdog.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -u -r1.12 -r1.13
1.49 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
Index: FixCRLF.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -w -u -r1.48 -r1.49
1.21 +30 -30
ant/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
Index: GenerateKey.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -u -r1.20 -r1.21
1.34 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/Get.java
Index: Get.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Get.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -w -u -r1.33 -r1.34
1.12 +3 -3
ant/src/main/org/apache/tools/ant/taskdefs/ImportTask.java
Index: ImportTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ImportTask.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -u -r1.11 -r1.12
1.21 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Input.java
Index: Input.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Input.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -u -r1.20 -r1.21
1.76 +9 -9 ant/src/main/org/apache/tools/ant/taskdefs/Jar.java
Index: Jar.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Jar.java,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -w -u -r1.75 -r1.76
1.61 +29 -29 ant/src/main/org/apache/tools/ant/taskdefs/Java.java
Index: Java.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Java.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -w -u -r1.60 -r1.61
1.116 +3 -3 ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
Index: Javadoc.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -w -u -r1.115 -r1.116
1.15 +6 -6 ant/src/main/org/apache/tools/ant/taskdefs/Jikes.java
Index: Jikes.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Jikes.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -u -r1.14 -r1.15
1.15 +5 -5
ant/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java
Index: JikesOutputParser.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -u -r1.14 -r1.15
1.18 +10 -10 ant/src/main/org/apache/tools/ant/taskdefs/KeySubst.java
Index: KeySubst.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/KeySubst.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -u -r1.17 -r1.18
1.25 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/LoadFile.java
Index: LoadFile.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/LoadFile.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -w -u -r1.24 -r1.25
1.12 +2 -2
ant/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java
Index: LogOutputStream.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -u -r1.11 -r1.12
1.42 +3 -3 ant/src/main/org/apache/tools/ant/taskdefs/Manifest.java
Index: Manifest.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Manifest.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -w -u -r1.41 -r1.42
1.9 +2 -2
ant/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java
Index: ManifestTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -u -r1.8 -r1.9
1.37 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
Index: MatchingTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -w -u -r1.36 -r1.37
1.23 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Mkdir.java
Index: Mkdir.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Mkdir.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -w -u -r1.22 -r1.23
1.19 +41 -41 ant/src/main/org/apache/tools/ant/taskdefs/Parallel.java
Index: Parallel.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Parallel.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -u -r1.18 -r1.19
1.22 +4 -4 ant/src/main/org/apache/tools/ant/taskdefs/Patch.java
Index: Patch.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Patch.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -w -u -r1.21 -r1.22
1.25 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
Index: PathConvert.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/PathConvert.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -w -u -r1.24 -r1.25
1.8 +22 -22
ant/src/main/org/apache/tools/ant/taskdefs/ProcessDestroyer.java
Index: ProcessDestroyer.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ProcessDestroyer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -u -r1.7 -r1.8
1.14 +6 -6
ant/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java
Index: PumpStreamHandler.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -u -r1.13 -r1.14
1.41 +40 -40 ant/src/main/org/apache/tools/ant/taskdefs/Replace.java
Index: Replace.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Replace.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -w -u -r1.40 -r1.41
1.56 +69 -69 ant/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
Index: SQLExec.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/SQLExec.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -w -u -r1.55 -r1.56
1.19 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/SendEmail.java
Index: SendEmail.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/SendEmail.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -u -r1.18 -r1.19
1.13 +6 -6
ant/src/main/org/apache/tools/ant/taskdefs/Sequential.java
Index: Sequential.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Sequential.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -u -r1.12 -r1.13
1.30 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/SignJar.java
Index: SignJar.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/SignJar.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -w -u -r1.29 -r1.30
1.14 +3 -3
ant/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java
Index: StreamPumper.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -u -r1.13 -r1.14
1.4 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Sync.java
Index: Sync.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Sync.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -u -r1.3 -r1.4
1.43 +10 -10 ant/src/main/org/apache/tools/ant/taskdefs/Tar.java
Index: Tar.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Tar.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -w -u -r1.42 -r1.43
1.32 +11 -11 ant/src/main/org/apache/tools/ant/taskdefs/Touch.java
Index: Touch.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Touch.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -w -u -r1.31 -r1.32
1.13 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/Transform.java
Index: Transform.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Transform.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -u -r1.12 -r1.13
1.13 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Typedef.java
Index: Typedef.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Typedef.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -u -r1.12 -r1.13
1.34 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/Untar.java
Index: Untar.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Untar.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -w -u -r1.33 -r1.34
1.30 +9 -9 ant/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
Index: UpToDate.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/UpToDate.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -w -u -r1.29 -r1.30
1.17 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
Index: WaitFor.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/WaitFor.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -u -r1.16 -r1.17
1.33 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/War.java
Index: War.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/War.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -w -u -r1.32 -r1.33
1.65 +3 -3
ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
Index: XSLTProcess.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -w -u -r1.64 -r1.65
1.14 +14 -14
ant/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
Index: XmlProperty.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -u -r1.13 -r1.14
1.109 +30 -30 ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
Index: Zip.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -w -u -r1.108 -r1.109
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
