This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jetty9.
commit c65f6b46855d79596ac9c7b51289b88a4ae8997f Author: Emmanuel Bourg <[email protected]> Date: Wed Dec 2 10:52:07 2015 +0100 Invoke Jetty with 'java -jar start.jar' instead of 'java -cp start.jar org.eclipse.jetty.start.Main' --- debian/changelog | 2 ++ debian/jetty8.init | 6 +----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 95c19eb..e489fbd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ jetty8 (8.1.18-3) UNRELEASED; urgency=medium * Updated the error message displayed when the JAVA_HOME variable defined in /etc/default/jetty8 doesn't point to a JRE. * Removed the unused commons-daemon.jar and tools.jar from the start classpath + * Invoke Jetty with 'java -jar start.jar' instead of + 'java -cp start.jar org.eclipse.jetty.start.Main' -- Emmanuel Bourg <[email protected]> Wed, 02 Dec 2015 10:05:19 +0100 diff --git a/debian/jetty8.init b/debian/jetty8.init index b2c1e9a..0fdb804 100644 --- a/debian/jetty8.init +++ b/debian/jetty8.init @@ -207,13 +207,9 @@ export JAVA_OPTIONS # Define other required variables PIDFILE="/var/run/$NAME.pid" WEBAPPDIR="$JETTY_HOME/webapps" -BOOTSTRAP_CLASS=org.eclipse.jetty.start.Main -START_CLASSPATH="$START_JAR" ROTATELOGS=/usr/sbin/rotatelogs HOSTNAME=$(uname -n) -JAVA_OPTIONS="$JAVA_OPTIONS -cp $START_CLASSPATH" - ################################################## # Check for JAVA_HOME ################################################## @@ -308,7 +304,7 @@ case "$1" in chown $JETTY_USER "$JVM_TMP" cd "$JVM_TMP" - JETTY_CMD="$JAVA $JAVA_OPTIONS $BOOTSTRAP_CLASS $JETTY_ARGS --daemon $CONFIGS" + JETTY_CMD="$JAVA $JAVA_OPTIONS -jar $START_JAR $JETTY_ARGS --daemon $CONFIGS" AUTHBIND_COMMAND="" if [ "$AUTHBIND" = "yes" ]; then -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
