--- src/shell/jspc.sh.orig Thu Feb 14 17:28:17 2002
+++ src/shell/jspc.sh Thu Feb 14 17:28:37 2002
@@ -1,10 +1,6 @@
#!/bin/sh
#
# $Id: jspc.sh,v 1.5 2001/09/27 12:40:35 hgomez Exp $
-
# Shell script to runt JspC
-
-
-BASEDIR=`dirname $0`
-
-$BASEDIR/tomcat.sh jspc "$@"
+#
+tomcat3 jspc "$@"
--- src/shell/tomcat.sh Thu Mar 6 17:51:11 2003
+++ src/shell/tomcat.sh Thu Mar 6 17:52:32 2003
@@ -18,92 +18,75 @@
. $HOME/.tomcatrc
fi
-# -------------------- Guess TOMCAT_HOME --------------------
-DEBUG_HOMEFIND=false
-# Follow symbolic links to the real tomcat.sh
-# Extract the base dir.
-# Look in well-known places if this fails
-if [ "$TOMCAT_INSTALL" = "" ] ; then
- ## resolve links - $0 may be a link to home
- PRG=$0
- progname=`basename $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
-
- TOMCAT_INSTALL_1=`dirname "$PRG"`/..
- if [ "$DEBUG_HOMEFIND" != "false" ] ; then
- echo "Guessing TOMCAT_INSTALL from tomcat.sh to ${TOMCAT_INSTALL_1}"
- fi
- if [ -d ${TOMCAT_INSTALL_1}/lib ] ; then
- TOMCAT_INSTALL=${TOMCAT_INSTALL_1}
- if [ "$DEBUG_HOMEFIND" != "false" ] ; then
- echo "Setting TOMCAT_INSTALL to $TOMCAT_INSTALL"
- fi
- fi
-fi
+TOMCAT_CFG="@@@TCSCONF@@@/@@@PROCNAME@@@.conf"
+[ -r "$TOMCAT_CFG" ] && . "${TOMCAT_CFG}"
-if [ "$TOMCAT_INSTALL" = "" ] ; then
- # try to find tomcat
- if [ -d ${HOME}/opt/tomcat/conf ] ; then
- TOMCAT_INSTALL=${HOME}/opt/tomcat
- if [ "$DEBUG_HOMEFIND" != "false" ] ; then
- echo "Defaulting TOMCAT_INSTALL to $TOMCAT_INSTALL"
- fi
- fi
+### Set up defaults if they were omitted in TOMCAT_CFG
+
+### JVM lookup
- if [ -d /opt/tomcat/conf ] ; then
- TOMCAT_INSTALL=/opt/tomcat
- if [ "$DEBUG_HOMEFIND" != "false" ] ; then
- echo "Defaulting TOMCAT_INSTALL to $TOMCAT_INSTALL"
+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 IBMs JAVA_HOME SDK 1.3 and 1.3.1
+ [ -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"
+ # 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
fi
- fi
-
- # Add other "standard" locations for tomcat
fi
-if [ "$TOMCAT_INSTALL" = "" ] ; then
- echo TOMCAT_INSTALL not set, you need to set it or install in a standard location
- exit 1
+if [ -z "$JAVACMD" ]; then
+ JAVACMD="$JAVA_HOME/bin/java"
+else
+ echo "Using custom JAVACMD: ${JAVACMD}"
+fi
+
+if [ -z "$TOMCAT_AJPID" ] ; then
+ export TOMCAT_AJPID=@@@AJPID@@@
fi
-if [ "$TOMCAT_OPTS" = "" ] ; then
- TOMCAT_OPTS=""
+if [ -z "$TOMCAT_AJP12ID" ] ; then
+ export TOMCAT_AJP12ID=@@@AJP12ID@@@
fi
-if [ "$JSPC_OPTS" = "" ] ; then
- JSPC_OPTS=""
+if [ -z "$TOMCAT_AJP13ID" ] ; then
+ export TOMCAT_AJP13ID=@@@AJP13ID@@@
fi
-if [ "$TOMCAT_HOME" = "" ] ; then
- if [ -d ./conf ] ; then
- TOMCAT_HOME=.
- elif [ -d ../conf ] ; then
- TOMCAT_HOME=..
- else
- TOMCAT_HOME=$TOMCAT_INSTALL
- fi
+if [ -z "$TOMCAT_RUN" ] ; then
+ export TOMCAT_RUN=@@@TCRUN@@@
fi
-## -------------------- Find JAVA_HOME --------------------
+if [ -z "$TOMCAT_LOG" ] ; then
+ export TOMCAT_LOG=@@@TCLOG@@@/tomcat.log
+fi
+if [ -z "$TOMCAT_PID" ] ; then
+ export TOMCAT_PID=@@@TCLOG@@@/tomcat.pid
+fi
-if [ -z "$JAVA_HOME" ] ; then
- JAVA=`which java`
- if [ -z "$JAVA" ] ; then
- echo "Cannot find JAVA. Please set your PATH."
- exit 1
- fi
- JAVA_BINDIR=`dirname $JAVA`
- JAVA_HOME=$JAVA_BINDIR/..
+if [ -z "$STDOUT_LOG" ] ; then
+ export STDOUT_LOG=@@@TCLOG@@@/tomcat.log
fi
if [ "$JAVACMD" = "" ] ; then
@@ -153,21 +136,29 @@
if [ "$1" = "-noout" ] ; then
shift
- $JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN start $@ >${TOMCAT_HOME}/logs/stdout.log 2>&1 &
+ $JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN start $@ >${STDOUT_LOG} 2>&1 &
+
+ if [ ! -z "$TOMCAT_PID" ]; then
+ echo $! > $TOMCAT_PID
+ fi
else
echo Using classpath: ${CLASSPATH}
echo Using JAVA_HOME: ${JAVA_HOME}
echo Using TOMCAT_HOME: ${TOMCAT_HOME}
$JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN start $@ &
+
+ if [ ! -z "$TOMCAT_PID" ]; then
+ echo $! > $TOMCAT_PID
+ fi
fi
JAVA_PID=$!
- echo $JAVA_PID > ${TOMCAT_HOME}/logs/tomcat.pid
+ echo $JAVA_PID > ${TOMCAT_PID}
# Wait for ajp12.id signaling end of startup
if [ ! "$WAIT" = "0" ] ; then
- while [ ! -f ${TOMCAT_HOME}/conf/ajp12.id ] ; do
+ while [ ! -f ${TOMCAT_AJP12ID} ] ; do
sleep 1
WAIT=`expr $WAIT - 1`
@@ -183,12 +174,12 @@
echo Using classpath: ${CLASSPATH}
echo Using JAVA_HOME: ${JAVA_HOME}
echo Using TOMCAT_HOME: ${TOMCAT_HOME}
- $JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN stop $@
+ $JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN stop -ajpid ${TOMCAT_AJP12ID} -ajp12 $@
if [ "$1" = "-force" ] ; then
shift
- echo "Killing: `cat $TOMCAT_HOME/logs/tomcat.pid`"
- kill -9 `cat $TOMCAT_HOME/logs/tomcat.pid`
+ echo "Killing: `cat ${TOMCAT_PID}`"
+ kill -9 `cat ${TOMCAT_PID}`
fi
elif [ "$1" = "run" ] ; then
@@ -266,7 +257,7 @@
echo "$0 (start|run|stop|enableAdmin|estart|env|jspc)"
echo " start - start tomcat in the background"
echo " start -security - use a SecurityManager when starting"
- echo " start -noout - redirect stdout/stderr to \$TOMCAT_HOME/logs/stdout.log"
+ echo " start -noout - redirect stdout/stderr to \$STDOUT_LOG"
echo " start -wait - wait until tomcat is initialized before returning"
echo " start -help - more options"
echo " (config, debug, estart, home, install, jkconf, sandbox)"
