bodewig 01/02/15 05:39:59
Modified: . build.xml
src/main/org/apache/tools/ant/types CommandlineJava.java
src/testcases/org/apache/tools/ant/taskdefs
ExecuteWatchdogTest.java
Log:
Merge in my patches from the 1.3 branch.
Revision Changes Path
1.133 +0 -3 jakarta-ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/build.xml,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- build.xml 2001/02/13 12:31:46 1.132
+++ build.xml 2001/02/15 13:39:58 1.133
@@ -558,9 +558,6 @@
<exclude name="org/apache/tools/ant/taskdefs/TaskdefsTest.java" />
<exclude
name="org/apache/tools/ant/util/regexp/RegexpMatcherTest.java" />
- <!-- currently fails - will be sorted out soon -->
- <exclude
name="org/apache/tools/ant/types/CommandlineJavaTest.java" />
-
<!-- these depend on order -->
<exclude name="org/apache/tools/ant/taskdefs/GUnzipTest.java" />
<exclude name="org/apache/tools/ant/taskdefs/GzipTest.java" />
1.11 +4 -3
jakarta-ant/src/main/org/apache/tools/ant/types/CommandlineJava.java
Index: CommandlineJava.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/CommandlineJava.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CommandlineJava.java 2001/02/13 12:32:00 1.10
+++ CommandlineJava.java 2001/02/15 13:39:58 1.11
@@ -172,9 +172,10 @@
}
public String[] getCommandline() {
+ Path fullClasspath = classpath != null ?
classpath.concatSystemClasspath("ignore") : null;
int size =
vmCommand.size() + javaCommand.size() + sysProperties.size();
- if (classpath != null && classpath.size() > 0) {
+ if (fullClasspath != null && fullClasspath.size() > 0) {
size += 2;
}
@@ -188,9 +189,9 @@
result, pos, sysProperties.size());
pos += sysProperties.size();
}
- if (classpath != null && classpath.size() > 0) {
+ if (fullClasspath != null && fullClasspath.size() > 0) {
result[pos++] = "-classpath";
- result[pos++] =
classpath.concatSystemClasspath("ignore").toString();
+ result[pos++] = fullClasspath.toString();
}
System.arraycopy(javaCommand.getCommandline(), 0,
result, pos, javaCommand.size());
1.2 +0 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java
Index: ExecuteWatchdogTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExecuteWatchdogTest.java 2001/01/30 17:01:39 1.1
+++ ExecuteWatchdogTest.java 2001/02/15 13:39:59 1.2
@@ -89,7 +89,6 @@
System.err.println("WARNING: 'build.tests' property is
not available !");
classpath = System.getProperty("java.class.path");
}
- System.out.println("Using classpath: " + classpath);
return classpath;
}
