--- jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh.orig	2004-01-28 07:32:35.000000000 -0500
+++ jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh	2004-01-28 07:21:07.000000000 -0500
@@ -28,7 +28,7 @@
   echo "This environment variable is needed to run this program"
   exit 1
 fi
-if [ ! -r "$BASEDIR"/bin/setclasspath.sh ]; then
+if [ ! -r "$BASEDIR"/bin/jasper5_classpath.sh ]; then
   echo "The BASEDIR environment variable is not defined correctly"
   echo "This environment variable is needed to run this program"
   exit 1
--- jakarta-tomcat-jasper/jasper2/src/bin/jasper.sh.orig	2004-01-28 07:32:45.000000000 -0500
+++ jakarta-tomcat-jasper/jasper2/src/bin/jasper.sh	2004-01-28 07:21:07.000000000 -0500
@@ -53,26 +53,29 @@
 fi
 
 # Get standard Java environment variables
-if [ -r "$JASPER_HOME"/bin/setclasspath.sh ]; then
+if [ -r "$JASPER_HOME"/bin/jasper5_classpath.sh ]; then
   BASEDIR="$JASPER_HOME"
-  . "$JASPER_HOME"/bin/setclasspath.sh
+  . "$JASPER_HOME"/bin/jasper5_classpath.sh
 else
-  echo "Cannot find $JASPER_HOME/bin/setclasspath.sh"
+  echo "Cannot find $JASPER_HOME/bin/jasper5_classpath.sh"
   echo "This file is needed to run this program"
   exit 1
 fi
 
 # Add on extra jar files to CLASSPATH
-for i in "$JASPER_HOME"/common/endorsed/*.jar; do
-  CLASSPATH="$CLASSPATH":"$i"
-done
-for i in "$JASPER_HOME"/common/lib/*.jar; do
-  CLASSPATH="$CLASSPATH":"$i"
-done
-for i in "$JASPER_HOME"/shared/lib/*.jar; do
-  CLASSPATH="$CLASSPATH":"$i"
-done
-CLASSPATH="$CLASSPATH":"$JASPER_HOME"/shared/classes
+CLASSPATH=$CLASSPATH:$(build-classpath \
+ant \
+jasper5-runtime \
+jasper5-compiler \
+servletapi5 \
+jspapi \
+xerces-j2 \
+xml-commons-apis \
+commons-el \
+commons-collections \
+commons-logging \
+commons-daemon \
+)
 
 # For Cygwin, switch paths to Windows format before running java
 if $cygwin; then
@@ -103,7 +106,7 @@
 
 else
 
-  echo "Usage: jasper.sh ( jspc )"
+  echo "Usage: jasper5.sh ( jspc )"
   echo "Commands:"
   echo "  jspc - Run the offline JSP compiler"
   exit 1
--- jakarta-tomcat-jasper/jasper2/src/bin/jspc.sh.orig	2004-01-28 07:32:52.000000000 -0500
+++ jakarta-tomcat-jasper/jasper2/src/bin/jspc.sh	2004-01-28 07:21:07.000000000 -0500
@@ -19,7 +19,7 @@
 done
  
 PRGDIR=`dirname "$PRG"`
-EXECUTABLE=jasper.sh
+EXECUTABLE=jasper5.sh
 
 # Check that target executable exists
 if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then