Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2010-05-12 18:53:44 -0400
committerJoakim Erdfelt2010-05-12 18:53:44 -0400
commitc23ffe789698df720a4b37c6e11035406c115fca (patch)
treed9b78f93f268af27a91376d8bb154998ea1399df
parent21ca5db3201cac3c0b106e46d324580172e47ee8 (diff)
downloadorg.eclipse.jetty.project-c23ffe789698df720a4b37c6e11035406c115fca.tar.gz
org.eclipse.jetty.project-c23ffe789698df720a4b37c6e11035406c115fca.tar.xz
org.eclipse.jetty.project-c23ffe789698df720a4b37c6e11035406c115fca.zip
Adding back --fromDaemon accidentally removed in r784
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1772 7e9141cc-0065-0410-87d8-b60c137991c4
-rwxr-xr-xjetty-distribution/src/main/resources/bin/jetty.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/jetty-distribution/src/main/resources/bin/jetty.sh b/jetty-distribution/src/main/resources/bin/jetty.sh
index 616857d0a0..a4dd871d84 100755
--- a/jetty-distribution/src/main/resources/bin/jetty.sh
+++ b/jetty-distribution/src/main/resources/bin/jetty.sh
@@ -474,7 +474,7 @@ JAVA_OPTIONS+=("-Djetty.home=$JETTY_HOME" "-Djava.io.tmpdir=$TMPDIR")
JETTY_START=$JETTY_HOME/start.jar
[ ! -f "$JETTY_START" ] && JETTY_START=$JETTY_HOME/lib/start.jar
-RUN_ARGS=("${JAVA_OPTIONS[@]}" -jar "$JETTY_START" $JETTY_ARGS "${CONFIGS[@]}")
+RUN_ARGS=("${JAVA_OPTIONS[@]}" -jar "$JETTY_START" --fromDaemon $JETTY_ARGS "${CONFIGS[@]}")
RUN_CMD=("$JAVA" "${RUN_ARGS[@]}")
#####################################################
@@ -491,6 +491,7 @@ then
echo "CONFIGS = ${CONFIGS[*]}"
echo "JAVA_OPTIONS = ${JAVA_OPTIONS[*]}"
echo "JAVA = $JAVA"
+ echo "RUN_CMD = ${RUN_CMD}"
fi
##################################################

Back to the top