Author: nthykier Date: 2012-04-25 09:38:58 +0000 (Wed, 25 Apr 2012) New Revision: 15995
Modified: trunk/jetty/debian/changelog trunk/jetty/debian/jetty.default trunk/jetty/debian/jetty.init Log: Apply init fixes Modified: trunk/jetty/debian/changelog =================================================================== --- trunk/jetty/debian/changelog 2012-04-25 09:28:41 UTC (rev 15994) +++ trunk/jetty/debian/changelog 2012-04-25 09:38:58 UTC (rev 15995) @@ -5,6 +5,13 @@ (Closes: #594913) * Enable hardening flags for the setuid.so file. * Updated d/copyright to DEP-5 format 1.0. + * Exit 0 in jetty's init script if jetty is already running. + Thanks to Toby for the report and patch. (Closes: #626382) + * Fix mispelled "character-class" in grep invocation. Thanks + to Isaac for the report and correction. (Closes: #637961) + * Allow java.library.path to be set in /etc/default/jetty. + Thanks to "biddster" for the report and the patches. + (Closes: #600175, LP: #656374) -- Niels Thykier <ni...@thykier.net> Wed, 25 Apr 2012 11:06:04 +0200 Modified: trunk/jetty/debian/jetty.default =================================================================== --- trunk/jetty/debian/jetty.default 2012-04-25 09:28:41 UTC (rev 15994) +++ trunk/jetty/debian/jetty.default 2012-04-25 09:38:58 UTC (rev 15995) @@ -25,7 +25,7 @@ #JETTY_ARGS= # Extra options to pass to the JVM -#JAVA_OPTIONS="-Xmx256m -Djava.awt.headless=true" +#JAVA_OPTIONS="-Xmx256m -Djava.awt.headless=true -Djava.library.path=/usr/lib" # Home of Java installation. #JAVA_HOME= Modified: trunk/jetty/debian/jetty.init =================================================================== --- trunk/jetty/debian/jetty.init 2012-04-25 09:28:41 UTC (rev 15994) +++ trunk/jetty/debian/jetty.init 2012-04-25 09:38:58 UTC (rev 15995) @@ -113,7 +113,7 @@ # Set java.awt.headless=true if JAVA_OPTIONS is not set so the # Xalan XSL transformer can work without X11 display on JDK 1.4+ # It also sets the maximum heap size to 256M to deal with most cases. -JAVA_OPTIONS="-Xmx256m -Djava.awt.headless=true" +JAVA_OPTIONS="-Xmx256m -Djava.awt.headless=true -Djava.library.path=/usr/lib" # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not # defined in /etc/default/jetty). Should contain a list of space separated directories. @@ -180,7 +180,7 @@ export JAVA="$JAVA_HOME/bin/java" JAVA_OPTIONS="$JAVA_OPTIONS -Djava.io.tmpdir=$JETTY_TMP \ - -Djava.library.path=/usr/lib -DSTART=$JETTY_START_CONFIG \ + -DSTART=$JETTY_START_CONFIG \ -Djetty.home=$JETTY_HOME -Djetty.logs=$LOGDIR \ -Djetty.host=$JETTY_HOST -Djetty.port=$JETTY_PORT" @@ -209,7 +209,7 @@ exit 0 fi -CONFIG_LINES=$(cat /etc/jetty/jetty.conf | grep -v "^[:space:]*#" | tr "\n" " ") +CONFIG_LINES=$(cat /etc/jetty/jetty.conf | grep -v "^[[:space:]]*#" | tr "\n" " ") ################################################## # Get the list of config.xml files from jetty.conf @@ -310,7 +310,6 @@ else log_warning_msg "(already running)." log_end_msg 0 - exit 1 fi ;; _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits