You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by jk...@apache.org on 2023/12/17 18:46:16 UTC
(xalan-test) 02/02: Further cleanup to eliminate java.endorsed.dirs and bootclasspath, letting JAXP/TrAX select the implementations.
This is an automated email from the ASF dual-hosted git repository.
jkesselm pushed a commit to branch path-cleanup-and-mvn-compatibility
in repository https://gitbox.apache.org/repos/asf/xalan-test.git
commit ab09cee84bb58a9a358d30b443a10ecf0b12563c
Author: kubycsolutions <ke...@kubyc.solutions>
AuthorDate: Sun Dec 17 13:40:06 2023 -0500
Further cleanup to eliminate java.endorsed.dirs and bootclasspath, letting JAXP/TrAX select the implementations.
---
build.sh | 19 ++++++++++++++-----
java/src/org/apache/qetest/xsl/XHTComparator.java | 2 +-
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/build.sh b/build.sh
index 2d726823..6e1e005b 100755
--- a/build.sh
+++ b/build.sh
@@ -67,7 +67,6 @@ else
_ANT_HOME=$ANT_HOME
fi
-
# Check user's ANT_HOME to make sure it actually has what we need
if [ -f "$_ANT_HOME/tools/ant.jar" ]; then
_ANT_JARS=$_ANT_HOME/tools/ant.jar
@@ -84,12 +83,22 @@ CLASSPATH=$CLASSPATH:$_ANT_JARS
# found those occasionally useful during development, so we left them in the
# standard scripts. But they aren't strictly needed.
-XALAN_BUILD_DIR_PATH=../xalan-java/build:../build
+XALAN_BUILD_CLASSPATH=../xalan-java/build/*:../build/*
+XERCES_ENDORSED_CLASSPATH=../xalan-java/lib:../lib:../xalan-java/lib/endorsed:../lib/endorsed
+XERCES_IMPL_CLASSPATH=../xalan-java/lib/*:../lib/*:../xalan-java/lib/endorsed/*:../lib/endorsed/*
+
+# Override JRE defaults to set our own, preferring the "real" Apache code
+# to the shadowed version that ships with the JRE.
+JAXP_USE_APACHE="-Djavax.xml.transform.TransformerFactory=org.apache.xalan.processor.TransformerFactoryImpl -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl"
-XERCES_ENDORSED_DIR_PATH=../xalan-java/lib/endorsed:../lib/endorsed
+# Endorsed should no longer be necessary, given JAXP/TrAX overrides above.
+# Just make sure they're on the classpaths.
+# USE_OLD_ENDORSED_DIRS=-Djava.endorsed.dirs=$XALAN_BUILD_CLASSPATH:$XERCES_ENDORSED_CLASSPATH
+CLASSPATH=$XALAN_BUILD_CLASSPATH:$XERCES_IMPL_CLASSPATH:$CLASSPATH
# Reminder: Note $* versus $@ distinction
-echo Running: $JAVACMD -mx1024m -Djava.endorsed.dirs=$XALAN_BUILD_DIR_PATH:$XERCES_ENDORSED_DIR_PATH -classpath "$CLASSPATH" org.apache.tools.ant.Main "$@"
-$JAVACMD -mx1024m -Djava.endorsed.dirs=$XALAN_BUILD_DIR_PATH:$XERCES_ENDORSED_DIR_PATH -classpath "$CLASSPATH" org.apache.tools.ant.Main "$@"
+# Also note classpath must be quoted to prevent CLI expansion of *
+echo Running: $JAVACMD -mx1024m $USE_OLD_ENDORSED_DIRS -classpath "$CLASSPATH" $JAXP_USE_APACHE org.apache.tools.ant.Main "$@"
+$JAVACMD -mx1024m $USE_OLD_ENDORSED_DIRS -classpath "$CLASSPATH" $JAXP_USE_APACHE org.apache.tools.ant.Main "$@"
echo "build.sh complete!"
diff --git a/java/src/org/apache/qetest/xsl/XHTComparator.java b/java/src/org/apache/qetest/xsl/XHTComparator.java
index fcb6cbd6..afe41614 100644
--- a/java/src/org/apache/qetest/xsl/XHTComparator.java
+++ b/java/src/org/apache/qetest/xsl/XHTComparator.java
@@ -260,7 +260,7 @@ public class XHTComparator
String value1 = gold.getNodeValue();
String value2 = test.getNodeValue();
-
+
if ((null != value1) && (null != value2) &&!value1.equals(value2))
{
reporter.println(MISMATCH_VALUE + nodeTypeString(gold) + "len="
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xalan.apache.org
For additional commands, e-mail: commits-help@xalan.apache.org