Allow the build to work on other JDK versions than 1.3 because 1.3 crashes when doing a full build. Sets the compiler source and target to 1.3. In this commit, the xercesImpl and xml-apis jar files are moved to the new java/lib/endorsed folder from java/lib. This is in preparation to building with Java >= 1.4 where Xerces and XML-APIs MUST be on the endorsed path in order to be recognized.
diff --git a/.classpath b/.classpath
index 78b2acd..bbfe3ef 100644
--- a/.classpath
+++ b/.classpath
@@ -3,5 +3,6 @@
<classpathentry kind="src" path="java/src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.3"/>
<classpathentry combineaccessrules="false" kind="src" path="/apache-xalan-j-2.7.1-maint-main"/>
+ <classpathentry kind="lib" path="lib/ant.jar"/>
<classpathentry kind="output" path="java/build"/>
</classpath>
diff --git a/build.xml b/build.xml
index 1701784..4f11c4b 100644
--- a/build.xml
+++ b/build.xml
@@ -92,7 +92,8 @@
<!-- Specific locations related to Xalan code, which should be in a sister tree to us -->
<property name="xalan.relpath" value="../java"/>
<property name="xalan.lib.dir" value="${xalan.relpath}/lib"/>
- <property name="xalan.endorsed.dir" value="${xalan.lib.dir}/endorsed"/>
+ <property name="xalan.endorsed.dir" value="${xalan.lib.dir}/endorsed"/>
+ <property name="xalan.endorsed.jvmarg" value="-Djava.endorsed.dirs="${xalan.endorsed.dir}"" />
<property name="xalan.tools.dir" value="${xalan.relpath}/tools"/>
<property name="xalan.build.dir" value="${xalan.relpath}/build"/>
<property name="xalan.xdocs.dir" value="${xalan.relpath}/xdocs"/>
@@ -251,7 +252,7 @@
<!-- Initialize: Define an Ant task that executes Xalan test automation -->
<!-- ================================================================== -->
<taskdef name="xalantest" classname="org.apache.qetest.xsl.XSLTestAntTask">
- <classpath>
+ <classpath>
<pathelement path="${java.class.path}" />
<!-- Needed so this build file can run: this refers to
a precompiled version of XSLTestAntTask.class that
@@ -282,7 +283,9 @@
classpathref="${xalantest.classpathref}"
bootclasspathref="boot.class.path.gump"
fork="${fork-tests}"
- failonerror="${fail-on-error}" />
+ failonerror="${fail-on-error}">
+ <jvmarg value="${xalan.endorsed.jvmarg}" />
+ </xalantest>
</target>
<target name="run.xalantest.default.normal" unless="gump" >
@@ -291,7 +294,9 @@
classpathref="${xalantest.classpathref}"
bootclasspathref="boot.class.path"
fork="${fork-tests}"
- failonerror="${fail-on-error}" />
+ failonerror="${fail-on-error}">
+ <jvmarg value="${xalan.endorsed.jvmarg}" />
+ </xalantest>
</target>
<target name="run.xalantest.transfact" if="sysprop.transfact" >
@@ -309,6 +314,7 @@
<!-- Explicitly set TransformerFactory property to use -->
<sysproperty key="javax.xml.transform.TransformerFactory"
value="${sysprop.transfact}" />
+ <jvmarg value="${xalan.endorsed.jvmarg}" />
</xalantest>
</target>
@@ -322,6 +328,7 @@
<!-- Explicitly set TransformerFactory property to use -->
<sysproperty key="javax.xml.transform.TransformerFactory"
value="${sysprop.transfact}" />
+ <jvmarg value="${xalan.endorsed.jvmarg}" />
</xalantest>
</target>
@@ -339,6 +346,7 @@
failonerror="${fail-on-error}" >
<sysproperty key="org.apache.xalan.extensions.bsf.BSFManager"
value="${sysprop.BSFManager}" />
+ <jvmarg value="${xalan.endorsed.jvmarg}" />
</xalantest>
</target>
@@ -351,6 +359,7 @@
failonerror="${fail-on-error}" >
<sysproperty key="org.apache.xalan.extensions.bsf.BSFManager"
value="${sysprop.BSFManager}" />
+ <jvmarg value="${xalan.endorsed.jvmarg}" />
</xalantest>
</target>
