diff -Naur jakarta-tomcat-5.0.16-src/src/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh jakarta-tomcat-5.0.16-src/src/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh
--- jakarta-tomcat-5.0.16-src/src/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh 2003-11-30 17:07:04.000000000 +0200
+++ jakarta-tomcat-5.0.16-src/src/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh 2003-12-04 14:54:05.000000000 +0200
@@ -46,6 +46,9 @@
OS400*) os400=true;;
esac
+TOMCAT_CFG="@@@TCCONF@@@/tomcat5.conf"
+JAVADIR="/usr/share/java"
+
# resolve links - $0 may be a softlink
PRG="$0"
@@ -87,20 +90,64 @@
export QIBM_MULTI_THREADED=Y
fi
-# Get standard Java environment variables
-if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then
- BASEDIR="$CATALINA_HOME"
- . "$CATALINA_HOME"/bin/setclasspath.sh
-else
- echo "Cannot find $CATALINA_HOME/bin/setclasspath.sh"
- echo "This file is needed to run this program"
- exit 1
+[ -r "$TOMCAT_CFG" ] && . "${TOMCAT_CFG}"
+
+### Set up defaults if they were omitted in TOMCAT_CFG
+
+### JVM lookup
+
+if [ -z "$JAVA_HOME" ]; then
+ # Search for java in PATH
+ JAVA=`which java`
+ if [ -z "$JAVA" ] ; then
+ JAVA_BINDIR=`dirname ${JAVA}`
+ JAVA_HOME="${JAVA_BINDIR}/.."
+ fi
+ # Default clean JAVA_HOME
+ [ -z "$JAVA_HOME" -a -d "/usr/lib/java" ] && JAVA_HOME="/usr/lib/java"
+ # Default IBM JAVA_HOME
+ [ -z "$JAVA_HOME" -a -d "/opt/IBMJava2-13" ] && JAVA_HOME="/opt/IBMJava2-13"
+ [ -z "$JAVA_HOME" -a -d "/opt/IBMJava2-131" ] && JAVA_HOME="/opt/IBMJava2-131"
+ [ -z "$JAVA_HOME" -a -d "/opt/IBMJava2-14" ] && JAVA_HOME="/opt/IBMJava2-14"
+ [ -z "$JAVA_HOME" -a -d "/opt/IBMJava2-141" ] && JAVA_HOME="/opt/IBMJava2-141"
+ # Another solution
+ [ -z "$JAVA_HOME" -a -d "/usr/java/jdk" ] && JAVA_HOME="/usr/java/jdk"
+ # madeinlinux JAVA_HOME
+ [ -z "$JAVA_HOME" -a -d "/usr/local/jdk1.2.2" ] && JAVA_HOME="/usr/local/jdk1.2.2"
+ # Kondara JAVA_HOME
+ [ -z "$JAVA_HOME" -a -d "/usr/lib/java/jdk1.2.2" ] && JAVA_HOME="/usr/lib/java/jdk1.2.2"
+ # Other commonly found JAVA_HOMEs
+ [ -z "$JAVA_HOME" -a -d "/usr/jdk1.2" ] && JAVA_HOME="/usr/jdk1.2"
+ # Default Caldera JAVA_HOME
+ [ -z "$JAVA_HOME" -a -d "/opt/java-1.3" ] && JAVA_HOME="/opt/java-1.3"
+ # Add other locations here
+ if [ -z "$JAVA_HOME" ]; then
+ echo "No JAVA_HOME specified in ${TOMCAT_CFG} and no java found, exiting..."
+ exit 1
+ else
+ echo "Found JAVA_HOME: ${JAVA_HOME}"
+ echo "Please complete your ${TOMCAT_CFG} so we won't have to look for it next time"
+ fi
fi
+# Set standard commands for invoking Java.
+_RUNJAVA="$JAVA_HOME"/bin/java
+_RUNJAVAC="$JAVA_HOME"/bin/javac
+_RUNJDB="$JAVA_HOME"/bin/jdb
+
+# Set standard CLASSPATH
+CLASSPATH="$JAVA_HOME"/lib/tools.jar
+
# Add on extra jar files to CLASSPATH
if [ -n "$JSSE_HOME" ]; then
CLASSPATH="$CLASSPATH":"$JSSE_HOME"/lib/jcert.jar:"$JSSE_HOME"/lib/jnet.jar:"$JSSE_HOME"/lib/jsse.jar
fi
+
+# JPackage JSSE location check
+if [ -r "$JAVADIR/jsse/jcert.jar" ]; then
+ CLASSPATH="$CLASSPATH":"$JAVADIR"/jsse/jcert.jar:"$JAVADIR"/jsse/jnet.jar:"$JAVADIR"/jsse/jsse.jar
+fi
+
CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar:"$CATALINA_HOME"/bin/commons-logging-api.jar
if [ -z "$CATALINA_BASE" ] ; then
@@ -112,6 +159,10 @@
CATALINA_TMPDIR="$CATALINA_BASE"/temp
fi
+if [ -z "$CATALINA_PID" ] ; then
+ export CATALINA_PID=/var/run/tomcat5.pid
+fi
+
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
@@ -250,7 +301,7 @@
else
- echo "Usage: catalina.sh ( commands ... )"
+ echo "Usage: tomcat5 ( commands ... )"
echo "commands:"
if $os400; then
echo " debug Start Catalina in a debugger (not available on OS400)"
diff -Naur jakarta-tomcat-5.0.16-src/src/jakarta-tomcat-jasper/jasper2/src/bin/jasper.sh jakarta-tomcat-5.0.16-src/src/jakarta-tomcat-jasper/jasper2/src/bin/jasper.sh
--- jakarta-tomcat-5.0.16-src/src/jakarta-tomcat-jasper/jasper2/src/bin/jasper.sh 2003-11-30 17:07:14.000000000 +0200
+++ jakarta-tomcat-5.0.16-src/src/jakarta-tomcat-jasper/jasper2/src/bin/jasper.sh 2003-12-04 14:47:33.000000000 +0200
@@ -74,12 +74,10 @@
done
CLASSPATH="$CLASSPATH":"$JASPER_HOME"/shared/classes
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
- JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
- JASPER_HOME=`cygpath --path --windows "$JASPER_HOME"`
- CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
-fi
+# Set standard commands for invoking Java.
+_RUNJAVA="$JAVA_HOME"/bin/java
+_RUNJDB="$JAVA_HOME"/bin/jdb
+_RUNJAVAC="$JAVA_HOME"/bin/javac
# ----- Execute The Requested Command -----------------------------------------
@@ -103,7 +101,7 @@
else
- echo "Usage: jasper.sh ( jspc )"
+ echo "Usage: jasper4 ( jspc )"
echo "Commands:"
echo " jspc - Run the offline JSP compiler"
exit 1
diff -Naur jakarta-tomcat-5.0.16-src/src/jakarta-tomcat-jasper/jasper2/src/bin/jspc.sh jakarta-tomcat-5.0.16-src/src/jakarta-tomcat-jasper/jasper2/src/bin/jspc.sh
--- jakarta-tomcat-5.0.16-src/src/jakarta-tomcat-jasper/jasper2/src/bin/jspc.sh 2003-11-30 17:07:14.000000000 +0200
+++ jakarta-tomcat-5.0.16-src/src/jakarta-tomcat-jasper/jasper2/src/bin/jspc.sh 2003-12-04 14:47:33.000000000 +0200
@@ -5,32 +5,4 @@
# $Id: jspc.sh,v 1.4 2003/02/21 18:23:14 kinman Exp $
# -----------------------------------------------------------------------------
-# resolve links - $0 may be a softlink
-PRG="$0"
-
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`/"$link"
- fi
-done
-
-PRGDIR=`dirname "$PRG"`
-EXECUTABLE=jasper.sh
-
-# Check that target executable exists
-if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then
- echo "Cannot find $PRGDIR/$EXECUTABLE"
- echo "This file is needed to run this program"
- exit 1
-fi
-
-if [ "$1" = "debug" ]; then
- shift
- exec "$PRGDIR"/"$EXECUTABLE" debug "$@"
-else
- exec "$PRGDIR"/"$EXECUTABLE" jspc "$@"
-fi
+exec jasper5 jspc "$@"
