oops, the last commit had the wrong log and was premature; really it

was about better searching for JAXP and XERCES; use exec if possible

in this correction I put back in Norm's changes in rev 1.17

diff --git a/cvstools/saxon b/cvstools/saxon
index 9c5a633bbdf0de020ddcd0859e3957e18acd11f8..b123362f06f98f7899645515a91b6949cc3e3c3f 100755 (executable)
--- a/cvstools/saxon
+++ b/cvstools/saxon
@@ -161,30 +161,6 @@ if [ "$DEBUG" = "1" ]; then
   done
 fi
 
-##
-## optionally replace the URI resolver with the Sun
-## resolver classes, not yet available to the public?
-##
-for path in "/projects/apache/xml-commons/java/build/classes" ; do
-  if [ -f "$path" -o -d "$path" ]; then
-    SUN="$path"
-    break
-  fi
-done
-
-if [ -f "$SUN" -o -d "$SUN" ]; then
-  # use the sun resolver
-  if [ ! "$XARG" ]; then
-    XARG="-x org.apache.xml.resolver.tools.ResolvingXMLReader"
-  fi
-  if [ ! "$YARG" ]; then
-    YARG="-y org.apache.xml.resolver.tools.ResolvingXMLReader"
-  fi
-  if [ ! "$RARG" ]; then
-    RARG="-r org.apache.xml.resolver.tools.CatalogResolver"
-  fi
-fi
-
 ##
 ## locate Xerces classpath
 ##
@@ -207,7 +183,6 @@ fi
 ##
 if [ ! "$JAXP" ]; then
   for path in "/usr/local/share/java/jaxp.jar" \
-              "/usr/local/share/java/jaxp.jar" \
               "/usr/local/java/jaxp.jar" \
               "/usr/local/jaxp-1.1/jaxp.jar" \
               "/usr/local/share/java/jaxp-1.1/jaxp.jar" \
@@ -222,14 +197,11 @@ if [ ! "$JAXP" ]; then
 fi
 
 ##
-## optionally replace the URI resolver with the Sun
+## optionally replace the URI resolver with the Apache
 ## resolver classes
 ##
-for path in "/projects/sun/resolver/.classes" \
-            "/projects/apache/xml-commons/java/build/classes" \
-            "/usr/local/share/java/sun-resolver.jar" \
-            "/usr/local/java/sun-resolver.jar" \
-            "/usr/share/java/sun-resolver.jar"; do
+for path in $RESOLVER \
+           "/projects/apache/xml-commons/java/build/classes" ; do
   if [ -f "$path" -o -d "$path" ]; then
     RESOLVER="$path"
     break
@@ -238,13 +210,13 @@ done
 if [ -f "$RESOLVER" -o -d "$RESOLVER" ]; 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
 
@@ -280,8 +252,7 @@ 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
 
 CLASSPATH=$SAXON:$NDWEXT:$JAXP:$RESOLVER:$XERCES:$CLASSPATH