Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

459560 jetty.sh handles start.d and no start.ini 

Also-by: Mike Dillon <mike@embody.org>
Signed-off-by: Greg Wilkins <gregw@intalio.org>
This commit is contained in:
Greg Wilkins 2015-02-11 14:41:27 +11:00
parent cf0d191c0a
commit 5724b48c8d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jetty-distribution/src/main/resources/bin/jetty.sh
View File

@ -328,7 +328,7 @@ fi
if [ -z "$JAVA" ]
then
echo "Cannot find a Java JDK. Please set either set JAVA or put java (>=1.5) in your PATH." 2>&2
echo "Cannot find a Java JDK. Please set either set JAVA or put java (>=1.5) in your PATH." >&2
exit 1
fi
@ -382,9 +382,10 @@ JAVA_OPTIONS=(${JAVA_OPTIONS[*]} "-Djetty.home=$JETTY_HOME" "-Djetty.base=$JETTY
JETTY_START=$JETTY_HOME/start.jar
START_INI=$JETTY_BASE/start.ini
if [ ! -f "$START_INI" ]
START_D=$JETTY_BASE/start.d
if [ ! -f "$START_INI" -a ! -d "$START_D" ]
then
echo "Cannot find a start.ini in your JETTY_BASE directory: $JETTY_BASE" 2>&2
echo "Cannot find a start.ini file or a start.d directory in your JETTY_BASE directory: $JETTY_BASE" >&2
exit 1
fi
@ -402,6 +403,7 @@ RUN_CMD=("$JAVA" ${RUN_ARGS[@]})
if (( DEBUG ))
then
echo "START_INI = $START_INI"
echo "START_D = $START_D"
echo "JETTY_HOME = $JETTY_HOME"
echo "JETTY_BASE = $JETTY_BASE"
echo "JETTY_CONF = $JETTY_CONF"
@ -562,6 +564,7 @@ case "$ACTION" in
check|status)
echo "Checking arguments to Jetty: "
echo "START_INI = $START_INI"
echo "START_D = $START_D"
echo "JETTY_HOME = $JETTY_HOME"
echo "JETTY_BASE = $JETTY_BASE"
echo "JETTY_CONF = $JETTY_CONF"