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

fixed JETTY_STATE to use JETTY_ARGS

This commit is contained in:
Greg Wilkins 2014-05-26 15:00:32 +02:00
parent 80f6266c21
commit 8e43129a2b
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
jetty-distribution/src/main/resources/bin/jetty.sh Normal file → Executable file
View File

@ -258,6 +258,21 @@ then
fi
fi
#####################################################
# Find a pid and state file
#####################################################
if [ -z "$JETTY_PID" ]
then
JETTY_PID="$JETTY_RUN/${NAME}.pid"
fi
if [ -z "$JETTY_STATE" ]
then
JETTY_STATE=$JETTY_BASE/${NAME}.state
fi
JETTY_ARGS+=("jetty.state=$JETTY_STATE")
rm -f $JETTY_STATE
##################################################
# Get the list of config.xml files from jetty.conf
##################################################
@ -298,21 +313,6 @@ then
JETTY_RUN=$(findDirectory -w /var/run /usr/var/run $JETTY_BASE /tmp)
fi
#####################################################
# Find a pid and state file
#####################################################
if [ -z "$JETTY_PID" ]
then
JETTY_PID="$JETTY_RUN/${NAME}.pid"
fi
if [ -z "$JETTY_STATE" ]
then
JETTY_STATE=$JETTY_BASE/${NAME}.state
fi
JAVA_ARGS+=("jetty.state=$JETTY_STATE")
rm -f $JETTY_STATE
##################################################
# Setup JAVA if unset
##################################################