Use apache resolver classes, not sun resolver classes

diff --git a/cvstools/saxon b/cvstools/saxon
index 28f2ba1e62c4b8ff856835c27cc243abac19203c..94955e3b68e49c10342e56fc9bb7735c732fb77a 100755 (executable)
--- a/cvstools/saxon
+++ b/cvstools/saxon
@@ -164,7 +164,7 @@ fi
 ## optionally replace the URI resolver with the Sun
 ## resolver classes, not yet available to the public?
 ##
-for path in "/projects/sun/resolver/.classes" ; do
+for path in "/projects/apache/xml-commons/java/build/classes" ; do
   if [ -f "$path" -o -d "$path" ]; then
     SUN="$path"
     break
@@ -174,13 +174,13 @@ done
 if [ -f "$SUN" -o -d "$SUN" ]; then
   # use the sun resolver
   if [ ! "$XARG" ]; then
-    XARG="-x com.sun.resolver.tools.ResolvingXMLReader"
+    XARG="-x org.apache.xml.resolver.tools.ResolvingXMLReader"
   fi
   if [ ! "$YARG" ]; then
-    YARG="-y com.sun.resolver.tools.ResolvingXMLReader"
+    YARG="-y org.apache.xml.resolver.tools.ResolvingXMLReader"
   fi
   if [ ! "$RARG" ]; then
-    RARG="-r com.sun.resolver.tools.CatalogResolver"
+    RARG="-r org.apache.xml.resolver.tools.CatalogResolver"
   fi
 fi
 
@@ -217,11 +217,10 @@ if [ ! "$JAXP" ]; then
   done
 fi
 if [ ! "$JAXP" ]; then
-  echo "warning: cannot locate JAXP (jaxp.jar), using /projects/sun/resolver/.classes" 1>&2
-  JAXP="/projects/sun/resolver/.classes"
+  echo "warning: cannot locate JAXP (jaxp.jar)" 1>&2
 fi
 
-RESOLVER="${RESOLVER:-/projects/sun/resolver/.classes}:"
+RESOLVER="${RESOLVER:-/projects/apache/xml-commons/java/build/classes}:"
 
 CLASSPATH=$SAXON:$NDWEXT:$JAXP:$RESOLVER$XERCES:$CLASSPATH
 

diff --git a/cvstools/xjparse b/cvstools/xjparse
index 5c4bdcea8a26604bd035633967b06c0330fad446..f89dd825ff72578591b7e8b7fdfd284e106eb4aa 100755 (executable)
--- a/cvstools/xjparse
+++ b/cvstools/xjparse
@@ -4,8 +4,8 @@
 #
 # Usage: xjparse [opts] src.xml
 
-JAXP="${JAXP:-/projects/sun/resolver/.classes}:"
-RESOLVER="${RESOLVER:-/projects/sun/resolver/.classes}:"
+JAXP="${JAXP:-/usr/local/jaxp-1.1/jaxp.jar}:"
+RESOLVER="${RESOLVER:-/projects/apache/xml-commons/java/build/classes}:"
 XERCES="${XERCES:-/projects/apache/xml-xerces/java/build/classes}:"
 
 CLASSPATH=$JAXP$RESOLVER$XERCES$CLASSPATH
@@ -13,7 +13,7 @@ CLASSPATH=$JAXP$RESOLVER$XERCES$CLASSPATH
 #echo $CLASSPATH
 
 java \
-  com.sun.resolver.apps.xread $*
+  org.apache.xml.resolver.apps.xread $*
 
 if [ $? != 0 ]; then
   echo ""