More overhaul of the startup scripts

This commit is contained in:
Joakim Erdfelt 2013-11-15 14:37:57 -07:00
parent 7bbc0ff4df
commit 753a53f77f
4 changed files with 21 additions and 730 deletions

View File

@ -1,677 +0,0 @@
#!/bin/bash
#
# Startup script for jetty under *nix systems (it works under NT/cygwin too).
# To get the service to restart correctly on reboot, uncomment below (3 lines):
# ========================
# chkconfig: 3 99 99
# description: Jetty 9 webserver
# processname: jetty
# ========================
# Configuration files
#
# /etc/default/jetty
# If it exists, this is read at the start of script. It may perform any
# sequence of shell commands, like setting relevant environment variables.
#
# $HOME/.jettyrc
# If it exists, this is read at the start of script. It may perform any
# sequence of shell commands, like setting relevant environment variables.
#
# /etc/jetty.conf
# If found, and no configurations were given on the command line,
# the file will be used as this script's configuration.
# Each line in the file may contain:
# - A comment denoted by the pound (#) sign as first non-blank character.
# - The path to a regular file, which will be passed to jetty as a
# config.xml file.
# - The path to a directory. Each *.xml file in the directory will be
# passed to jetty as a config.xml file.
#
# The files will be checked for existence before being passed to jetty.
#
# $JETTY_HOME/etc/jetty.xml
# If found, used as this script's configuration file, but only if
# /etc/jetty.conf was not present. See above.
#
# Configuration variables
#
# JAVA_HOME
# Home of Java installation.
#
# JAVA
# Command to invoke Java. If not set, $JAVA_HOME/bin/java will be
# used.
#
# JAVA_OPTIONS
# Extra options to pass to the JVM
#
# JETTY_HOME
# Where Jetty is installed. If not set, the script will try go
# guess it by first looking at the invocation path for the script,
# and then by looking in standard locations as $HOME/opt/jetty
# and /opt/jetty. The java system property "jetty.home" will be
# set to this value for use by configure.xml files, f.e.:
#
# <Arg><SystemProperty name="jetty.home" default="."/>/webapps/jetty.war</Arg>
#
# JETTY_PORT
# Override the default port for Jetty servers. If not set then the
# default value in the xml configuration file will be used. The java
# system property "jetty.port" will be set to this value for use in
# configure.xml files. For example, the following idiom is widely
# used in the demo config files to respect this property in Listener
# configuration elements:
#
# <Set name="Port"><SystemProperty name="jetty.port" default="8080"/></Set>
#
# Note: that the config file could ignore this property simply by saying:
#
# <Set name="Port">8080</Set>
#
# JETTY_RUN
# Where the jetty.pid file should be stored. It defaults to the
# first available of /var/run, /usr/var/run, and /tmp if not set.
#
# JETTY_PID
# The Jetty PID file, defaults to $JETTY_RUN/jetty.pid
#
# JETTY_ARGS
# The default arguments to pass to jetty.
#
# JETTY_USER
# if set, then used as a username to run the server as
#
usage()
{
echo "Usage: $0 {start|stop|run|restart|check|supervise} [ CONFIGS ... ] "
exit 1
}
[ $# -gt 0 ] || usage
##################################################
# Some utility functions
##################################################
findDirectory()
{
OP=$1
shift
for L in $* ; do
[ $OP $L ] || continue
echo $L
break
done
}
running()
{
[ -f $1 ] || return 1
PID=$(cat $1)
ps -p $PID >/dev/null 2>/dev/null || return 1
return 0
}
##################################################
# Get the action & configs
##################################################
ACTION=$1
shift
ARGS="$*"
CONFIGS=""
NO_START=0
##################################################
# See if there's a default configuration file
##################################################
if [ -f /etc/default/jetty9 ] ; then
. /etc/default/jetty9
elif [ -f /etc/default/jetty ] ; then
. /etc/default/jetty
fi
##################################################
# See if there's a user-specific configuration file
##################################################
if [ -f $HOME/.jettyrc ] ; then
. $HOME/.jettyrc
fi
##################################################
# Set tmp if not already set.
##################################################
if [ -z "$TMP" ]
then
TMP=/tmp
fi
##################################################
# Jetty's hallmark
##################################################
JETTY_INSTALL_TRACE_FILE="etc/jetty.xml"
TMPJ=$TMP/j$$
##################################################
# Try to determine JETTY_HOME if not set
##################################################
if [ -z "$JETTY_HOME" ]
then
JETTY_HOME_1=`dirname "$0"`
JETTY_HOME_1=`dirname "$JETTY_HOME_1"`
if [ -f "${JETTY_HOME_1}/${JETTY_INSTALL_TRACE_FILE}" ] ;
then
JETTY_HOME=${JETTY_HOME_1}
fi
fi
##################################################
# if no JETTY_HOME, search likely locations.
##################################################
if [ "$JETTY_HOME" = "" ] ; then
STANDARD_LOCATIONS=" \
/usr/share \
/usr/share/java \
$HOME \
$HOME/src \
${HOME}/opt/ \
/opt \
/java \
/usr/local \
/usr/local/share \
/usr/local/share/java \
/home \
"
JETTY_DIR_NAMES=" \
jetty-9 \
jetty9 \
jetty-9.* \
jetty \
Jetty-9 \
Jetty9 \
Jetty-9.* \
Jetty \
"
JETTY_HOME=
for L in $STANDARD_LOCATIONS
do
for N in $JETTY_DIR_NAMES
do
if [ -d $L/$N ] && [ -f "$L/${N}/${JETTY_INSTALL_TRACE_FILE}" ] ;
then
JETTY_HOME="$L/$N"
fi
done
[ ! -z "$JETTY_HOME" ] && break
done
fi
##################################################
# No JETTY_HOME yet? We're out of luck!
##################################################
if [ -z "$JETTY_HOME" ] ; then
echo "** ERROR: JETTY_HOME not set, you need to set it or install in a standard location"
exit 1
fi
cd $JETTY_HOME
JETTY_HOME=`pwd`
#####################################################
# Check that jetty is where we think it is
#####################################################
if [ ! -r $JETTY_HOME/$JETTY_INSTALL_TRACE_FILE ]
then
echo "** ERROR: Oops! Jetty doesn't appear to be installed in $JETTY_HOME"
echo "** ERROR: $JETTY_HOME/$JETTY_INSTALL_TRACE_FILE is not readable!"
exit 1
fi
###########################################################
# Get the list of config.xml files from the command line.
###########################################################
if [ ! -z "$ARGS" ]
then
for A in $ARGS
do
if [ -f $A ]
then
CONF="$A"
elif [ -f $JETTY_HOME/etc/$A ]
then
CONF="$JETTY_HOME/etc/$A"
elif [ -f ${A}.xml ]
then
CONF="${A}.xml"
elif [ -f $JETTY_HOME/etc/${A}.xml ]
then
CONF="$JETTY_HOME/etc/${A}.xml"
else
echo "** ERROR: Cannot find configuration '$A' specified in the command line."
exit 1
fi
if [ ! -r $CONF ]
then
echo "** ERROR: Cannot read configuration '$A' specified in the command line."
exit 1
fi
CONFIGS="$CONFIGS $CONF"
done
fi
##################################################
# Try to find this script's configuration file,
# but only if no configurations were given on the
# command line.
##################################################
if [ -z "$JETTY_CONF" ]
then
if [ -f /etc/jetty.conf ]
then
JETTY_CONF=/etc/jetty.conf
elif [ -f "${JETTY_HOME}/etc/jetty.conf" ]
then
JETTY_CONF="${JETTY_HOME}/etc/jetty.conf"
fi
fi
##################################################
# Read the configuration file if one exists
##################################################
CONFIG_LINES=
if [ -z "$CONFIGS" ] && [ -f "$JETTY_CONF" ] && [ -r "$JETTY_CONF" ]
then
CONFIG_LINES=`cat $JETTY_CONF | grep -v "^[:space:]*#" | tr "\n" " "`
fi
##################################################
# Get the list of config.xml files from jetty.conf
##################################################
if [ ! -z "${CONFIG_LINES}" ]
then
for CONF in ${CONFIG_LINES}
do
if [ ! -r "$CONF" ]
then
echo "** WARNING: Cannot read '$CONF' specified in '$JETTY_CONF'"
elif [ -f "$CONF" ]
then
# assume it's a configure.xml file
CONFIGS="$CONFIGS $CONF"
elif [ -d "$CONF" ]
then
# assume it's a directory with configure.xml files
# for example: /etc/jetty.d/
# sort the files before adding them to the list of CONFIGS
XML_FILES=`ls ${CONF}/*.xml | sort | tr "\n" " "`
for FILE in ${XML_FILES}
do
if [ -r "$FILE" ] && [ -f "$FILE" ]
then
CONFIGS="$CONFIGS $FILE"
else
echo "** WARNING: Cannot read '$FILE' specified in '$JETTY_CONF'"
fi
done
else
echo "** WARNING: Don''t know what to do with '$CONF' specified in '$JETTY_CONF'"
fi
done
fi
#####################################################
# Run the standard server if there's nothing else to run
#####################################################
if [ -z "$CONFIGS" ]
then
CONFIGS="${JETTY_HOME}/etc/jetty-logging.xml ${JETTY_HOME}/etc/jetty.xml"
fi
#####################################################
# Find a location for the pid file
#####################################################
if [ -z "$JETTY_RUN" ]
then
JETTY_RUN=`findDirectory -w /var/run /usr/var/run /tmp`
fi
#####################################################
# Find a PID for the pid file
#####################################################
if [ -z "$JETTY_PID" ]
then
JETTY_PID="$JETTY_RUN/jetty.pid"
fi
##################################################
# Check for JAVA_HOME
##################################################
if [ -z "$JAVA_HOME" ]
then
# If a java runtime is not defined, search the following
# directories for a JVM and sort by version. Use the highest
# version number.
# Java search path
JAVA_LOCATIONS="\
/usr/java \
/usr/bin \
/usr/local/bin \
/usr/local/java \
/usr/local/jdk \
/usr/local/jre \
/usr/lib/jvm \
/opt/java \
/opt/jdk \
/opt/jre \
"
JAVA_NAMES="java jdk jre"
for N in $JAVA_NAMES ; do
for L in $JAVA_LOCATIONS ; do
[ -d $L ] || continue
find $L -name "$N" ! -type d | grep -v threads | while read J ; do
[ -x $J ] || continue
VERSION=`eval $J -version 2>&1`
[ $? = 0 ] || continue
VERSION=`expr "$VERSION" : '.*"\(1.[0-9\.]*\)["_]'`
[ "$VERSION" = "" ] && continue
expr $VERSION \< 1.2 >/dev/null && continue
echo $VERSION:$J
done
done
done | sort | tail -1 > $TMPJ
JAVA=`cat $TMPJ | cut -d: -f2`
JVERSION=`cat $TMPJ | cut -d: -f1`
JAVA_HOME=`dirname $JAVA`
while [ ! -z "$JAVA_HOME" -a "$JAVA_HOME" != "/" -a ! -f "$JAVA_HOME/lib/tools.jar" ] ; do
JAVA_HOME=`dirname $JAVA_HOME`
done
[ "$JAVA_HOME" = "" ] && JAVA_HOME=
echo "Found JAVA=$JAVA in JAVA_HOME=$JAVA_HOME"
fi
##################################################
# Determine which JVM of version >1.2
# Try to use JAVA_HOME
##################################################
if [ "$JAVA" = "" -a "$JAVA_HOME" != "" ]
then
if [ ! -z "$JAVACMD" ]
then
JAVA="$JAVACMD"
else
[ -x $JAVA_HOME/bin/jre -a ! -d $JAVA_HOME/bin/jre ] && JAVA=$JAVA_HOME/bin/jre
[ -x $JAVA_HOME/bin/java -a ! -d $JAVA_HOME/bin/java ] && JAVA=$JAVA_HOME/bin/java
fi
fi
if [ "$JAVA" = "" ]
then
echo "Cannot find a JRE or JDK. Please set JAVA_HOME to a >=1.2 JRE" 2>&2
exit 1
fi
JAVA_VERSION=`expr "$($JAVA -version 2>&1 | head -1)" : '.*1\.\([0-9]\)'`
#####################################################
# See if JETTY_PORT is defined
#####################################################
if [ "$JETTY_PORT" != "" ]
then
JAVA_OPTIONS="$JAVA_OPTIONS -Djetty.port=$JETTY_PORT"
fi
#####################################################
# See if JETTY_LOGS is defined
#####################################################
if [ "$JETTY_LOGS" != "" ]
then
JAVA_OPTIONS="$JAVA_OPTIONS -Djetty.logs=$JETTY_LOGS"
fi
#####################################################
# Are we running on Windows? Could be, with Cygwin/NT.
#####################################################
case "`uname`" in
CYGWIN*) PATH_SEPARATOR=";";;
*) PATH_SEPARATOR=":";;
esac
#####################################################
# Add jetty properties to Java VM options.
#####################################################
JAVA_OPTIONS="$JAVA_OPTIONS -Djetty.home=$JETTY_HOME -Djava.io.tmpdir=$TMP"
[ -f $JETTY_HOME/etc/start.config ] && JAVA_OPTIONS="-DSTART=$JETTY_HOME/etc/start.config $JAVA_OPTIONS"
#####################################################
# This is how the Jetty server will be started
#####################################################
JETTY_START=$JETTY_HOME/start.jar
[ ! -f $JETTY_START ] && JETTY_START=$JETTY_HOME/lib/start.jar
case "`uname`" in
CYGWIN*)
JETTY_START="`cygpath -w $JETTY_START`"
echo $JETTY_START
CONFIGS="`cygpath -w $CONFIGS`"
echo $CONFIGS
;;
esac
RUN_ARGS="$JAVA_OPTIONS -jar $JETTY_START $JETTY_ARGS $CONFIGS"
RUN_CMD="$JAVA $RUN_ARGS"
#####################################################
# Comment these out after you're happy with what
# the script is doing.
#####################################################
#echo "JETTY_HOME = $JETTY_HOME"
#echo "JETTY_CONF = $JETTY_CONF"
#echo "JETTY_RUN = $JETTY_RUN"
#echo "JETTY_PID = $JETTY_PID"
#echo "JETTY_ARGS = $JETTY_ARGS"
#echo "CONFIGS = $CONFIGS"
#echo "JAVA_OPTIONS = $JAVA_OPTIONS"
#echo "JAVA = $JAVA"
##################################################
# Do the action
##################################################
case "$ACTION" in
start)
echo -n "Starting Jetty: "
if [ "$NO_START" = "1" ]; then
echo "Not starting jetty - NO_START=1 in /etc/default/jetty9";
exit 0;
fi
if [ "$START_STOP_DAEMON" = "1" ] && type start-stop-daemon > /dev/null 2>&1
then
[ x$JETTY_USER = x ] && JETTY_USER=$(whoami)
[ $UID = 0 ] && CH_USER="-c $JETTY_USER"
if start-stop-daemon -S -p$JETTY_PID $CH_USER -d $JETTY_HOME -b -m -a $JAVA -- $RUN_ARGS
then
sleep 1
if running $JETTY_PID
then
echo OK
else
echo FAILED
fi
fi
else
if [ -f $JETTY_PID ]
then
if running $JETTY_PID
then
echo "Already Running!!"
exit 1
else
# dead pid file - remove
rm -f $JETTY_PID
fi
fi
if [ x$JETTY_USER != x ]
then
touch $JETTY_PID
chown $JETTY_USER $JETTY_PID
su - $JETTY_USER -c "
$RUN_CMD &
PID=\$!
disown \$PID
echo \$PID > $JETTY_PID"
else
$RUN_CMD &
PID=$!
disown $PID
echo $PID > $JETTY_PID
fi
echo "STARTED Jetty `date`"
fi
;;
stop)
echo -n "Stopping Jetty: "
if [ "$START_STOP_DAEMON" = "1" ] && type start-stop-daemon > /dev/null 2>&1; then
start-stop-daemon -K -p $JETTY_PID -d $JETTY_HOME -a $JAVA -s HUP
sleep 1
if running $JETTY_PID
then
sleep 3
if running $JETTY_PID
then
sleep 30
if running $JETTY_PID
then
start-stop-daemon -K -p $JETTY_PID -d $JETTY_HOME -a $JAVA -s KILL
fi
fi
fi
rm -f $JETTY_PID
echo OK
else
PID=`cat $JETTY_PID 2>/dev/null`
TIMEOUT=30
while running $JETTY_PID && [ $TIMEOUT -gt 0 ]
do
kill $PID 2>/dev/null
sleep 1
let TIMEOUT=$TIMEOUT-1
done
[ $TIMEOUT -gt 0 ] || kill -9 $PID 2>/dev/null
rm -f $JETTY_PID
echo OK
fi
;;
restart)
JETTY_SH=$0
if [ ! -f $JETTY_SH ]; then
if [ ! -f $JETTY_HOME/bin/jetty.sh ]; then
echo "$JETTY_HOME/bin/jetty.sh does not exist."
exit 1
fi
JETTY_SH=$JETTY_HOME/bin/jetty.sh
fi
$JETTY_SH stop $*
sleep 5
$JETTY_SH start $*
;;
supervise)
#
# Under control of daemontools supervise monitor which
# handles restarts and shutdowns via the svc program.
#
exec $RUN_CMD
;;
run|demo)
echo "Running Jetty: "
if [ -f $JETTY_PID ]
then
if running $JETTY_PID
then
echo "Already Running!!"
exit 1
else
# dead pid file - remove
rm -f $JETTY_PID
fi
fi
exec $RUN_CMD
;;
check)
echo "Checking arguments to Jetty: "
echo "JETTY_HOME = $JETTY_HOME"
echo "JETTY_CONF = $JETTY_CONF"
echo "JETTY_RUN = $JETTY_RUN"
echo "JETTY_PID = $JETTY_PID"
echo "JETTY_PORT = $JETTY_PORT"
echo "JETTY_LOGS = $JETTY_LOGS"
echo "CONFIGS = $CONFIGS"
echo "JAVA_OPTIONS = $JAVA_OPTIONS"
echo "JAVA = $JAVA"
echo "CLASSPATH = $CLASSPATH"
echo "RUN_CMD = $RUN_CMD"
echo
if [ -f $JETTY_RUN/jetty.pid ]
then
echo "Jetty running pid="`cat $JETTY_RUN/jetty.pid`
exit 0
fi
exit 1
;;
*)
usage
;;
esac
exit 0

View File

@ -1,14 +0,0 @@
#!/bin/bash
# look for JETTY_HOME
if [ -z "$JETTY_HOME" ]
then
JETTY_HOME_1=`dirname "$0"`
JETTY_HOME_1=`dirname "$JETTY_HOME_1"`
JETTY_HOME=${JETTY_HOME_1}
fi
cd $JETTY_HOME
exec /usr/bin/java -Djetty.port=8088 -jar start.jar etc/jetty.xml etc/jetty-xinetd.xml

View File

@ -34,6 +34,7 @@ NAME=$(echo $(basename $0) | sed -e 's/^[SK][0-9]+//' -e 's/\.sh$//')
# config.xml file. # config.xml file.
# - The path to a directory. Each *.xml file in the directory will be # - The path to a directory. Each *.xml file in the directory will be
# passed to jetty as a config.xml file. # passed to jetty as a config.xml file.
# - All other lines will be passed, as-is to the start.jar
# #
# The files will be checked for existence before being passed to jetty. # The files will be checked for existence before being passed to jetty.
# #
@ -54,19 +55,9 @@ NAME=$(echo $(basename $0) | sed -e 's/^[SK][0-9]+//' -e 's/\.sh$//')
# #
# <Arg><Property name="jetty.home" default="."/>/webapps/jetty.war</Arg> # <Arg><Property name="jetty.home" default="."/>/webapps/jetty.war</Arg>
# #
# JETTY_PORT (Deprecated - use JETTY_ARGS) # JETTY_BASE
# Override the default port for Jetty servers. If not set then the # Where your Jetty base directory is. If not set, the value from
# default value in the xml configuration file will be used. The java # $JETTY_HOME will be used.
# system property "jetty.port" will be set to this value for use in
# configure.xml files. For example, the following idiom is widely
# used in the demo config files to respect this property in Listener
# configuration elements:
#
# <Set name="Port"><Property name="jetty.port" default="8080"/></Set>
#
# Note: that the config file could ignore this property simply by saying:
#
# <Set name="Port">8080</Set>
# #
# JETTY_RUN # JETTY_RUN
# Where the $NAME.pid file should be stored. It defaults to the # Where the $NAME.pid file should be stored. It defaults to the
@ -259,7 +250,7 @@ fi
################################################## ##################################################
# Get the list of config.xml files from jetty.conf # Get the list of config.xml files from jetty.conf
################################################## ##################################################
if [ -z "$CONFIGS" ] && [ -f "$JETTY_CONF" ] && [ -r "$JETTY_CONF" ] if [ -f "$JETTY_CONF" ] && [ -r "$JETTY_CONF" ]
then then
while read -r CONF while read -r CONF
do do
@ -271,19 +262,19 @@ then
then then
# assume it's a directory with configure.xml files # assume it's a directory with configure.xml files
# for example: /etc/jetty.d/ # for example: /etc/jetty.d/
# sort the files before adding them to the list of CONFIGS # sort the files before adding them to the list of JETTY_ARGS
for XMLFILE in "$CONF/"*.xml for XMLFILE in "$CONF/"*.xml
do do
if [ -r "$XMLFILE" ] && [ -f "$XMLFILE" ] if [ -r "$XMLFILE" ] && [ -f "$XMLFILE" ]
then then
CONFIGS+=("$XMLFILE") JETTY_ARGS+=("$XMLFILE")
else else
echo "** WARNING: Cannot read '$XMLFILE' specified in '$JETTY_CONF'" echo "** WARNING: Cannot read '$XMLFILE' specified in '$JETTY_CONF'"
fi fi
done done
else else
# assume it's a command line parameter (let start.jar deal with its validity) # assume it's a command line parameter (let start.jar deal with its validity)
CONFIGS+=("$CONF") JETTY_ARGS+=("$CONF")
fi fi
done < "$JETTY_CONF" done < "$JETTY_CONF"
fi fi
@ -325,14 +316,6 @@ then
exit 1 exit 1
fi fi
#####################################################
# See if JETTY_PORT is defined
#####################################################
if [ "$JETTY_PORT" ]
then
JETTY_ARGS+=("jetty.port=$JETTY_PORT")
fi
##################################################### #####################################################
# See if JETTY_LOGS is defined # See if JETTY_LOGS is defined
##################################################### #####################################################
@ -363,19 +346,19 @@ esac
##################################################### #####################################################
JAVA_OPTIONS+=("-Djetty.home=$JETTY_HOME" "-Djetty.base=$JETTY_BASE" "-Djava.io.tmpdir=$TMPDIR") JAVA_OPTIONS+=("-Djetty.home=$JETTY_HOME" "-Djetty.base=$JETTY_BASE" "-Djava.io.tmpdir=$TMPDIR")
[ -f "$JETTY_HOME/etc/start.config" ] && JAVA_OPTIONS=("-DSTART=$JETTY_HOME/etc/start.config" "${JAVA_OPTIONS[@]}")
##################################################### #####################################################
# This is how the Jetty server will be started # This is how the Jetty server will be started
##################################################### #####################################################
JETTY_START=$JETTY_HOME/start.jar JETTY_START=$JETTY_HOME/start.jar
[ ! -f "$JETTY_START" ] && JETTY_START=$JETTY_HOME/lib/start.jar START_INI=$JETTY_BASE/start.ini
if [ ! -f "$START_INI" ]
then
echo "Cannot find a start.ini in your JETTY_BASE directory: $JETTY_BASE" 2>&2
exit 1
fi
START_INI=$(dirname $JETTY_START)/start.ini RUN_ARGS=(${JAVA_OPTIONS[@]} -jar "$JETTY_START" ${JETTY_ARGS[*]})
[ -r "$START_INI" ] || START_INI=""
RUN_ARGS=(${JAVA_OPTIONS[@]} -jar "$JETTY_START" $JETTY_ARGS "${CONFIGS[@]}")
RUN_CMD=("$JAVA" ${RUN_ARGS[@]}) RUN_CMD=("$JAVA" ${RUN_ARGS[@]})
##################################################### #####################################################
@ -384,13 +367,13 @@ RUN_CMD=("$JAVA" ${RUN_ARGS[@]})
##################################################### #####################################################
if (( DEBUG )) if (( DEBUG ))
then then
echo "START_INI = $START_INI"
echo "JETTY_HOME = $JETTY_HOME" echo "JETTY_HOME = $JETTY_HOME"
echo "JETTY_BASE = $JETTY_BASE" echo "JETTY_BASE = $JETTY_BASE"
echo "JETTY_CONF = $JETTY_CONF" echo "JETTY_CONF = $JETTY_CONF"
echo "JETTY_PID = $JETTY_PID" echo "JETTY_PID = $JETTY_PID"
echo "JETTY_START = $JETTY_START" echo "JETTY_START = $JETTY_START"
echo "JETTY_ARGS = $JETTY_ARGS" echo "JETTY_ARGS = ${JETTY_ARGS[*]}"
echo "CONFIGS = ${CONFIGS[*]}"
echo "JAVA_OPTIONS = ${JAVA_OPTIONS[*]}" echo "JAVA_OPTIONS = ${JAVA_OPTIONS[*]}"
echo "JAVA = $JAVA" echo "JAVA = $JAVA"
echo "RUN_CMD = ${RUN_CMD}" echo "RUN_CMD = ${RUN_CMD}"
@ -449,7 +432,7 @@ case "$ACTION" in
fi fi
if expr "${CONFIGS[*]}" : '.*etc/jetty-started.xml.*' >/dev/null if expr "${JETTY_ARGS[*]}" : '.*jetty-started.xml.*' >/dev/null
then then
if started "$JETTY_STATE" "$JETTY_PID" if started "$JETTY_STATE" "$JETTY_PID"
then then
@ -549,11 +532,10 @@ case "$ACTION" in
echo "JETTY_PID = $JETTY_PID" echo "JETTY_PID = $JETTY_PID"
echo "JETTY_START = $JETTY_START" echo "JETTY_START = $JETTY_START"
echo "JETTY_LOGS = $JETTY_LOGS" echo "JETTY_LOGS = $JETTY_LOGS"
echo "CONFIGS = ${CONFIGS[*]}"
echo "CLASSPATH = $CLASSPATH" echo "CLASSPATH = $CLASSPATH"
echo "JAVA = $JAVA" echo "JAVA = $JAVA"
echo "JAVA_OPTIONS = ${JAVA_OPTIONS[*]}" echo "JAVA_OPTIONS = ${JAVA_OPTIONS[*]}"
echo "JETTY_ARGS = $JETTY_ARGS" echo "JETTY_ARGS = ${JETTY_ARGS[*]}"
echo "RUN_CMD = ${RUN_CMD[*]}" echo "RUN_CMD = ${RUN_CMD[*]}"
echo echo

View File

@ -8,5 +8,5 @@
# Each line in this file becomes an arguement to start.jar # Each line in this file becomes an arguement to start.jar
# in addition to those found in the start.ini file # in addition to those found in the start.ini file
# ======================================================= # =======================================================
etc/jetty-logging.xml jetty-logging.xml
etc/jetty-started.xml jetty-started.xml