Allow user environment to specify jars

diff --git a/cvstools/saxon b/cvstools/saxon
index cefb8eb5549c4d921fcb10b00380870710ef3558..1780d2c486abbf8317fe36b1842fa0865163150f 100755 (executable)
--- a/cvstools/saxon
+++ b/cvstools/saxon
@@ -190,13 +190,11 @@ if [ "$DEBUG" = "1" ]; then
   SAXON="$SAXON_DEBUG:$SAXON"
 fi
 
-SUN="/projects/sun/resolver/.classes"
-JAXP="/usr/local/jaxp-1.1/jaxp.jar"
+JAXP="${JAXP:-/projects/sun/resolver/.classes}:"
+RESOLVER="${RESOLVER:-/projects/sun/resolver/.classes}:"
+XERCES="${XERCES:-/projects/apache/xml-xerces/java/build/classes}:"
 
-XERCESROOT="/projects/apache/xml-xerces/java"
-XERCES="$XERCESROOT/build/classes"
-
-CLASSPATH=$SAXON:$JAXP:$XERCES:$SUN:$NDWEXT:~/java
+CLASSPATH=$SAXON:$NDWEXT:$JAXP$RESOLVER$XERCES$CLASSPATH
 
 #echo $CLASSPATH
 

diff --git a/cvstools/xalan b/cvstools/xalan
index 8b90984f4b667719accc731b28e5ebbf8bc3e7d1..742cd55ff5dce62857f2edd377ad1acb07de45fd 100755 (executable)
--- a/cvstools/xalan
+++ b/cvstools/xalan
@@ -31,30 +31,28 @@ while [ "$DONE" = "0" ]; do
     esac
 done
 
-JAXP="/usr/local/jaxp-1.1/jaxp.jar"
-SUN="/projects/sun/resolver/.classes"
+JAXP="${JAXP:-/projects/sun/resolver/.classes}:"
+RESOLVER="${RESOLVER:-/projects/sun/resolver/.classes}:"
+XERCES="${XERCES:-/projects/apache/xml-xerces/java/build/classes}:"
 NDWEXT="/sourceforge/docbook/xsl/extensions/xalan2/.classes";
-WEBEXT="/sourceforge/docbook/website/extensions/xalan2/.classes";
 
 if [ "$VERSION" = "1" ]; then
     RESOLVERS=
-    XALANROOT="/usr/local/java/xalan-1.2.2"
-    CLASSPATH="$NDWEXT:$WEBEXT:$JAXP:$XALANROOT/xalan.jar:$XALANROOT/xerces.jar:$XALANROOT/bsf.jar"
+    XALANROOT="${XALANROOT:-/usr/local/java/xalan-1.2.2}"
+    XALAN="$XALANROOT/bsf.jar:"
 elif [ "$VERSION" = "2" ]; then
     URES="-URIRESOLVER com.sun.resolver.tools.CatalogResolver"
     ERES="-ENTITYRESOLVER com.sun.resolver.tools.CatalogResolver"
     RESOLVERS="$URES $ERES"
-    XALANROOT="/projects/apache/xml-xalan/java";
-    XALAN="$XALANROOT/build/classes"
-    XERCESROOT="/projects/apache/xml-xerces/java"
-    XERCES="$XERCESROOT/build/classes"
-    XJARS="$XALANROOT/bin/bsf.jar:$XALANROOT/bin/xerces.jar"
-    CLASSPATH=$NDWEXT:$WEBEXT:$JAXP:$XALAN:$XJARS:$SUN:$XERCES:$CLASSPATH
+    XALANROOT="${XALANROOT:-/projects/apache/xml-xalan/java}";
+    XALAN="$XALANROOT/build/classes:$XALANROOT/bin/bsf.jar:"
 else
     echo "Unexpected Xalan version $VERSION"
     exit 1
 fi
 
+CLASSPATH=$NDWEXT:$XALAN$JAXP$RESOLVER$XERCES$CLASSPATH
+
 #echo $CLASSPATH
 
 if [ "$QUIET" = "0" ]; then

diff --git a/cvstools/xjparse b/cvstools/xjparse
index 5bf9129ab8eff93f34258396bc37e08d6196b442..baa9e520766ce9f00b8493f490123a5226685805 100755 (executable)
--- a/cvstools/xjparse
+++ b/cvstools/xjparse
@@ -3,12 +3,12 @@
 # This shell script will definitely need to be hacked to run on your system!
 #
 # Usage: xjparse [opts] src.xml
-#
 
-SUN="/projects/sun/resolver/.classes";
-JAXP="/usr/local/jaxp-1.1/jaxp.jar:/usr/local/jaxp-1.1/crimson.jar"
+JAXP="${JAXP:-/projects/sun/resolver/.classes}:"
+RESOLVER="${RESOLVER:-/projects/sun/resolver/.classes}:"
+XERCES="${XERCES:-/projects/apache/xml-xerces/java/build/classes}:"
 
-CLASSPATH=$JAXP:$SUN:~/java
+CLASSPATH=$JAXP$RESOLVER$XERCES$CLASSPATH
 
 #echo $CLASSPATH
 
@@ -21,5 +21,3 @@ if [ $? != 0 ]; then
   echo ""
   exit 1
 fi
-
-