You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by zo...@apache.org on 2005/07/21 22:47:24 UTC
cvs commit: xml-xalan/test/java/src/org/apache/qetest/xsl XSLTestAntTask.class XSLTestAntTask.java
zongaro 2005/07/21 13:47:24
Modified: test/java/src/org/apache/qetest/xsl XSLTestAntTask.class
XSLTestAntTask.java
Log:
Patch for XALANJ-2175 reviewed by Sarah McNamara (mcnamara () ca ! ibm ! com).
Updated JDK version test so that -Xbootclasspath option will be specified for
spawned JVM if the version is not one of 1.1, 1.2 or 1.3. That allows the
test harness to work on JDK 1.1 through 1.5, and I hope it will allow us to
avoid the need to add checks for more JDK versions in the future.
Revision Changes Path
1.6 +112 -112 xml-xalan/test/java/src/org/apache/qetest/xsl/XSLTestAntTask.class
<<Binary file>>
1.11 +15 -11 xml-xalan/test/java/src/org/apache/qetest/xsl/XSLTestAntTask.java
Index: XSLTestAntTask.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/XSLTestAntTask.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XSLTestAntTask.java 17 Feb 2004 17:32:25 -0000 1.10
+++ XSLTestAntTask.java 21 Jul 2005 20:47:24 -0000 1.11
@@ -737,13 +737,17 @@
*/
public void setBootclasspathref(Reference r)
{
- // This is a hack.
- // On JDK 1.4.x we need to bootclasspath to override
- // the Xalan/Xerces in rt.jar.
- if (System.getProperty("java.version", "0.0").substring(0,3).equals("1.4")) {
- Path p = (Path)r.getReferencedObject(this.getProject());
- log("Bootclasspath: " + p);
- createJvmarg().setValue("-Xbootclasspath/p:" + p);
- }
+ // This is a hack.
+ // On JDK 1.4.x or later we need to override bootclasspath
+ // the Xalan/Xerces in rt.jar.
+ String jdkRelease =
+ System.getProperty("java.version", "0.0").substring(0,3);
+ if (!jdkRelease.equals("1.1")
+ && !jdkRelease.equals("1.2")
+ && !jdkRelease.equals("1.3")) {
+ Path p = (Path)r.getReferencedObject(this.getProject());
+ log("Bootclasspath: " + p);
+ createJvmarg().setValue("-Xbootclasspath/p:" + p);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org