Update of /cvsroot/pkg-java/jetty/debian
In directory haydn:/tmp/cvs-serv16297
Modified Files:
changelog control files jetty.init
Log Message:
* new release 5.1.5rc1-4
--- /cvsroot/pkg-java/jetty/debian/changelog 2005/08/30 12:32:22 1.5
+++ /cvsroot/pkg-java/jetty/debian/changelog 2005/09/02 13:37:01 1.6
@@ -1,3 +1,19 @@
+jetty (5.1.5rc1-4) unstable; urgency=low
+
+ Patch from Oyvind Harboe <[EMAIL PROTECTED]>:
+
+ * Fixed rc script /etc/init.d/jetty. "stop" could leave dangling
+ /var/run/jetty.pid. Fixed this by adding "--oknodo" to
+ "start-stop-daemon --stop" command.
+ * Removed trailing "/" from LOGDIR which caused
+ /var/log/out.log not to be created.
+ * /etc/init.d/jetty start will now deal more gracefully with a
+ dangling /var/run/jetty.pid. A dangling jetty.pid is detected
+ and ignored.
+ * Closes: #326176.
+
+ -- Philipp Meier <[EMAIL PROTECTED]> Fri, 2 Sep 2005 13:40:59 +0200
+
jetty (5.1.5rc1-3) unstable; urgency=low
* Removed -v from ant opts during build.
--- /cvsroot/pkg-java/jetty/debian/control 2005/08/30 12:32:22 1.5
+++ /cvsroot/pkg-java/jetty/debian/control 2005/09/02 13:37:01 1.6
@@ -3,12 +3,12 @@
Priority: optional
Maintainer: Debian Java Maintainers
<[email protected]>
Uploaders: Philipp Meier <[EMAIL PROTECTED]>
-Build-Depends-Indep: j2sdk1.3 | j2sdk1.4 | j2sdk1.5 | kaffe (>= 2:1.1.5-5),
debhelper (>= 4.9.5), ant, junit, libmx4j-java, liblog4j1.2-java,
libservlet2.4-java, libtomcat4-java, libcommons-logging-java, cdbs ( >>0.4.5.3)
+Build-Depends-Indep: j2sdk1.3 | j2sdk1.4 | j2sdk1.5 | kaffe (>= 2:1.1.5-5),
debhelper (>= 4.9.5), ant, junit, libmx4j-java, liblog4j1.2-java,
libservlet2.4-java, libtomcat5-java, libcommons-logging-java, cdbs ( >>0.4.5.3)
Standards-Version: 3.6.2
Package: jetty
Architecture: all
-Depends: java-virtual-machine | j2re1.3 | j2sdk1.3 | j2re1.4 | j2re1.5 |
j2sdk1.4 | sun-j2sdk.1.5 | java2-runtime | kaffe (>= 2:1.1.5-5), jikes |
j2sdk1.3 | j2sdk1.4 | java2-compiler | kaffe (>= 2:1.1.5-5), libxerces2-java,
libtomcat4-java, libmx4j-java, adduser, libservlet2.4-java,
libcommons-logging-java, libant1.6-java
+Depends: java-virtual-machine | j2re1.3 | j2sdk1.3 | j2re1.4 | j2re1.5 |
j2sdk1.4 | sun-j2sdk.1.5 | java2-runtime | kaffe (>= 2:1.1.5-5), jikes |
j2sdk1.3 | j2sdk1.4 | java2-compiler | kaffe (>= 2:1.1.5-5), libxerces2-java,
libtomcat5-java, libmx4j-java, adduser, libservlet2.4-java,
libcommons-logging-java, ant
Suggests: libapache2-mod-webapp | libapache-mod-jk
Description: Java servlet engine and webserver
Jetty is an Open Source HTTP Servlet Server written in 100% Java.
--- /cvsroot/pkg-java/jetty/debian/files 2005/08/30 12:32:22 1.3
+++ /cvsroot/pkg-java/jetty/debian/files 2005/09/02 13:37:01 1.4
@@ -1,2 +1,2 @@
-jetty_5.1.5rc1-3_all.deb contrib/web optional
-jetty-extra_5.1.5rc1-3_all.deb contrib/web optional
+jetty_5.1.5rc1-4_all.deb contrib/web optional
+jetty-extra_5.1.5rc1-4_all.deb contrib/web optional
--- /cvsroot/pkg-java/jetty/debian/jetty.init 2005/08/30 12:32:22 1.3
+++ /cvsroot/pkg-java/jetty/debian/jetty.init 2005/09/02 13:37:01 1.4
@@ -68,7 +68,7 @@
# Define other required variables
PIDFILE="/var/run/$NAME.pid"
-LOGDIR="/var/log/jetty/"
+LOGDIR="/var/log/jetty"
WEBAPPDIR="$JETTY_HOME/webapps"
##################################################
@@ -89,23 +89,24 @@
##################################################
case "$1" in
start)
- echo -n "Starting $DESC: "
+ if start-stop-daemon --quiet --test --start --pidfile "$PIDFILE" \
+ --user "$JETTY_USER" --startas "$JAVA" > /dev/null;
then
+
- if [ -f $PIDFILE ]
- then
- echo "already running."
- exit 1
- fi
- # Look for rotatelogs/rotatelogs2
- if [ -x /usr/sbin/rotatelogs ]; then
+ # Look for rotatelogs/rotatelogs2
+ if [ -x /usr/sbin/rotatelogs ]; then
ROTATELOGS=/usr/sbin/rotatelogs
- else
+ else
ROTATELOGS=/usr/sbin/rotatelogs2
- fi
+ fi
- if start-stop-daemon --quiet --test --start --pidfile "$PIDFILE" \
- --user "$JETTY_USER" --startas "$JAVA" > /dev/null;
then
+ if [ -f $PIDFILE ]
+ then
+ echo "$PIDFILE exists, but jetty was not running.
Ignoring $PIDFILE"
+ fi
+
+ echo -n "Starting $DESC: "
su -p -s /bin/sh "$JETTY_USER" \
-c "$ROTATELOGS \"$LOGDIR/out.log\" 86400" \
< "$LOGDIR/out.log" &
@@ -114,8 +115,9 @@
echo \$!" > "$PIDFILE"
echo "$NAME."
else
- echo "(already running)."
- fi
+ echo "(already running)."
+ exit 1
+ fi
;;
stop)
@@ -132,14 +134,14 @@
start-stop-daemon --quiet --stop \
--pidfile "$PIDFILE" --user "$JETTY_USER" \
--startas "$JAVA" > /dev/null
- while ! start-stop-daemon --quiet --test --stop \
+ while ! start-stop-daemon --quiet --test --start \
--pidfile "$PIDFILE" --user "$JETTY_USER" \
--startas "$JAVA" > /dev/null; do
sleep 1
echo -n "."
JETTY_SHUTDOWN=`expr $JETTY_SHUTDOWN - 1` || true
if [ $JETTY_SHUTDOWN -ge 0 ]; then
- start-stop-daemon --quiet --stop \
+ start-stop-daemon --oknodo --quiet --stop \
--pidfile "$PIDFILE" --user
"$JETTY_USER" \
--startas "$JAVA"
else
@@ -184,5 +186,3 @@
esac
exit 0
-
-
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
