summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorDavid Yu2009-04-24 03:23:01 (EDT)
committer David Yu2009-04-24 03:23:01 (EDT)
commit910a22426bf8c533b07c4c3caa8c533a57da594f (patch)
treeaa115f9ca483653097764ae2b85c9764f36928af
parent429fef0dc46853b8726f83e7587da27e9a83e3fa (diff)
downloadorg.eclipse.jetty.project-910a22426bf8c533b07c4c3caa8c533a57da594f.zip
org.eclipse.jetty.project-910a22426bf8c533b07c4c3caa8c533a57da594f.tar.gz
org.eclipse.jetty.project-910a22426bf8c533b07c4c3caa8c533a57da594f.tar.bz2
JETTY-941, JETTY-996
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@191 7e9141cc-0065-0410-87d8-b60c137991c4
-rw-r--r--VERSION.txt2
-rwxr-xr-xjetty-distribution/src/main/resources/bin/jetty.sh13
2 files changed, 12 insertions, 3 deletions
diff --git a/VERSION.txt b/VERSION.txt
index c7a69b7..4186fab 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1,4 +1,6 @@
jetty-7.0.0.M2-SNAPSHOT
++ JETTY-941 Linux chkconfig hint
++ JETTY-996 Make start-stop-daemon optional
jetty-7.0.0.M1 22 April 2009
+ 271258 FORM Authentication dispatch handling avoids caching
diff --git a/jetty-distribution/src/main/resources/bin/jetty.sh b/jetty-distribution/src/main/resources/bin/jetty.sh
index 42216dc..1229f5d 100755
--- a/jetty-distribution/src/main/resources/bin/jetty.sh
+++ b/jetty-distribution/src/main/resources/bin/jetty.sh
@@ -1,7 +1,14 @@
#!/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 6 webserver
+# processname: jetty
+# ========================
+
# Configuration files
#
# /etc/default/jetty
@@ -496,7 +503,7 @@ case "$ACTION" in
fi
- if type start-stop-daemon > /dev/null 2>&1
+ 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"
@@ -548,7 +555,7 @@ case "$ACTION" in
stop)
echo -n "Stopping Jetty: "
- if type start-stop-daemon > /dev/null 2>&1; then
+ 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