CVS jetty/debian

Philipp Meier llucifer-guest at haydn.debian.org
Sat Aug 6 16:07:21 UTC 2005


Update of /cvsroot/pkg-java/jetty/debian
In directory haydn:/tmp/cvs-serv12377

Modified Files:
	ant-jetty-nonfree.properties changelog control files 
	jetty.init jetty.install jetty.postinst.debhelper 
	jetty.prerm.debhelper rules start.config 
Added Files:
	ant.properties 
Removed Files:
	watch 
Log Message:
* New upstream release
* Changes do upstream managed witch patches


--- /cvsroot/pkg-java/jetty/debian/ant-jetty-nonfree.properties	2004/11/05 21:24:21	1.1.1.1
+++ /cvsroot/pkg-java/jetty/debian/ant-jetty-nonfree.properties	2005/08/06 16:07:21	1.2
@@ -3,6 +3,7 @@
 javac.optimize=on
 build.javadoc=gjdoc
 build.compiler=jikes
+javadoc.encoding=ISO-8859-1
 
 # temp files
 ext=../../debian/ext
--- /cvsroot/pkg-java/jetty/debian/changelog	2004/11/05 21:24:23	1.1.1.1
+++ /cvsroot/pkg-java/jetty/debian/changelog	2005/08/06 16:07:21	1.2
@@ -1,9 +1,28 @@
+jetty (5.1.4-1) unstable; urgency=low
+
+  * New upstream release
+  * Standards-Version bumbed to 3.6.2
+  * Removed debian/watch which will not work with sourceforge
+  * Manage changes to upstream with cdbs simple-patchsys
+  * Fixed rc script /etc/init.d/jetty 
+
+ -- Philipp Meier <meier at fnogol.de>  Sat,  6 Aug 2005 17:26:12 +0200
+
 jetty (5.0.0-3) unstable; urgency=low
 
-  * Jetty is now community maintainer by the pkg-java community
-    New maintainer pkg-java-maintainers at lists.debian.org
+  * Package is now maintained by pkg-java. Maintainer was updated.
+  * Disable validation of xml files in start.config by default.
+    Closes: #298731.
+  * Add /usr/lib/j2sdk1.5-sun to JAVA_HOME_DIRS in debian/rules
+
+ -- Philipp Meier <meier at fnogol.de>  Thu, 30 Jun 2005 14:32:31 +0200
+
+jetty (5.0.0-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Transition to liblog4j1.2-java.  Closes: #306761.
 
- -- Philipp Meier <meier at fnogol.de>  Fri,  5 Nov 2004 20:29:38 +0100
+ -- Matej Vela <vela at debian.org>  Mon,  2 May 2005 12:12:12 +0200
 
 jetty (5.0.0-2) unstable; urgency=low
 
--- /cvsroot/pkg-java/jetty/debian/control	2004/11/05 21:24:23	1.1.1.1
+++ /cvsroot/pkg-java/jetty/debian/control	2005/08/06 16:07:21	1.2
@@ -1,13 +1,13 @@
 Source: jetty
 Section: contrib/web
 Priority: optional
-Maintainer: pkg-java-maintainers at lists.debian.org
-Build-Depends-Indep: j2sdk1.4 | j2sdk1.3, debhelper (>> 4.0.0), ant, junit, libmx4j-java, liblog4j-java, libservlet2.3-java, libtomcat4-java, libcommons-logging-java, cdbs ( >>0.4.5.3)
-Standards-Version: 3.6.0
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Build-Depends-Indep: j2sdk1.3 | j2sdk1.4, debhelper (>> 4.9.5), ant, junit, libmx4j-java, liblog4j1.2-java, libservlet2.4-java, libtomcat4-java, libcommons-logging-java, cdbs ( >>0.4.5.3)
+Standards-Version: 3.6.2
 
 Package: jetty
 Architecture: all
-Depends: j2re1.3 | j2sdk1.3 | j2re1.4 | j2sdk1.4 | java2-runtime, jikes | j2sdk1.3 | j2sdk1.4 | java-compiler | java2-compiler , libxerces2-java, libtomcat4-java, libmx4j-java, adduser, libservlet2.3-java, libcommons-logging-java
+Depends: java-virtual-machine | j2re1.3 | j2sdk1.3 | j2re1.4 | j2re1.5 | j2sdk1.4 | sun-j2sdk.1.5 | java2-runtime, jikes | j2sdk1.3 | j2sdk1.4 | java2-compiler , libxerces2-java, libtomcat4-java, libmx4j-java, adduser, libservlet2.4-java, libcommons-logging-java
 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.
@@ -17,7 +17,7 @@
 
 Package: jetty-extra
 Architecture: all
-Depends: jetty, liblog4j-java
+Depends: jetty, liblog4j1.2-java
 Description: Extensions to jetty
  Provides some extensions of jetty:
  * JettyPlus: contains a number of useful facilities integrated with Jetty,
--- /cvsroot/pkg-java/jetty/debian/files	2004/11/05 21:24:23	1.1.1.1
+++ /cvsroot/pkg-java/jetty/debian/files	2005/08/06 16:07:21	1.2
@@ -1,2 +1,2 @@
-jetty_5.0.0-3_all.deb contrib/web optional
-jetty-extra_5.0.0-3_all.deb contrib/web optional
+jetty_5.1.4-1_all.deb contrib/web optional
+jetty-extra_5.1.4-1_all.deb contrib/web optional
--- /cvsroot/pkg-java/jetty/debian/jetty.init	2004/11/05 21:24:23	1.1.1.1
+++ /cvsroot/pkg-java/jetty/debian/jetty.init	2005/08/06 16:07:21	1.2
@@ -17,7 +17,9 @@
                                                                                 
 # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
 # defined in /etc/default/jetty)
-JDK_DIRS="/usr/lib/j2sdk1.4-sun \
+JDK_DIRS="
+          /usr/lib/j2sdk1.5-sun \
+          /usr/lib/j2sdk1.4-sun \
 	  /usr/lib/j2sdk1.4 \
           /usr/lib/j2se/1.4 \
 	  /usr/lib/j2sdk1.3 \
@@ -95,46 +97,60 @@
             exit 1
         fi
 
-	if start-stop-daemon --test --start --pidfile "$PIDFILE" \
-	                --user $JETTY_USER --startas "$JAVA" \
-			>/dev/null; then
-		su -p -s /bin/sh $JETTY_USER \
-			-c "$JAVA $ARGUMENTS" \
-			    >> $LOGDIR/out.log 2>&1 &
-		echo $! > "$PIDFILE"
+	# Look for rotatelogs/rotatelogs2
+	if [ -x /usr/sbin/rotatelogs ]; then
+		ROTATELOGS=/usr/sbin/rotatelogs
+	else
+		ROTATELOGS=/usr/sbin/rotatelogs2
+	fi
+
+	if start-stop-daemon --quiet --test --start --pidfile "$PIDFILE" \
+	                --user "$JETTY_USER" --startas "$JAVA" > /dev/null; then 
+		su -p -s /bin/sh "$JETTY_USER" \
+			-c "$ROTATELOGS \"$LOGDIR/out.log\" 86400" \
+			< "$LOGDIR/out.log" &
+		su -p -s /bin/sh - "$JETTY_USER" \
+			"$JAVA $ARGUMENTS >> $LOGDIR/out.log 2>&1 & \
+			    echo \$!"  > "$PIDFILE"
                 echo "$NAME."
-        else
-                echo "failed."
+	else
+                echo "(already running)."
         fi
         ;;
 
   stop)
-  	echo -n "Stopping $DESC"
-  	
-	if start-stop-daemon --test --start --pidfile "$PIDFILE" \
-                --user "$JETTY_USER" --startas "$JAVA" \
-		>/dev/null; then
-                echo ": not running."
-                rm -f "$PIDFILE"
-        else
-		start-stop-daemon --stop \
-			--quiet --pidfile "$PIDFILE" \
-			--user "$JETTY_USER"
-                while ! start-stop-daemon --test --start --pidfile "$PIDFILE" \
-                        --user "$JETTY_USER" --startas "$JAVA" \
-                        >/dev/null; do
+  	echo -n "Stopping $DESC: "
+
+	if start-stop-daemon --quiet --test --start --pidfile "$PIDFILE" \
+		--user "$JETTY_USER" --startas "$JAVA" > /dev/null; then
+		if [ -x "$PIDFILE" ]; then
+			echo "(not running but $PIDFILE exists)."
+		else
+			echo "(not running)."
+		fi
+	else
+		start-stop-daemon --quiet --stop \
+			--pidfile "$PIDFILE" --user "$JETTY_USER" \
+			--startas "$JAVA" > /dev/null
+                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 -le 0 ]; then
+                        if [ $JETTY_SHUTDOWN -ge 0 ]; then
+				start-stop-daemon --quiet --stop \
+					--pidfile "$PIDFILE" --user "$JETTY_USER" \
+					--startas "$JAVA"
+			else
                                 echo -n " (killing) "
                                 start-stop-daemon --stop --signal 9 --oknodo \
                                         --quiet --pidfile "$PIDFILE" \
                                         --user "$JETTY_USER"
                         fi
                 done
-                rm -f "$PIDFILE"
-                echo " $NAME."
+        	rm -f "$PIDFILE"
+                echo "$NAME."
 	fi
         ;;
 
--- /cvsroot/pkg-java/jetty/debian/jetty.install	2004/11/05 21:24:21	1.1.1.1
+++ /cvsroot/pkg-java/jetty/debian/jetty.install	2005/08/06 16:07:21	1.2
@@ -6,13 +6,7 @@
 debian/jetty.xml			etc/jetty
 debian/start.config			etc/jetty
 debian/adminRealm.properties		etc/jetty
-debian/root-webapp/*			usr/share/jetty/webapps/root
-demo/webapps/jetty/images/jetty_banner.gif	usr/share/jetty/webapps/root/images
-demo/webapps/jetty/images/trans.gif	usr/share/jetty/webapps/root/images
-demo/webapps/jetty/images/open.gif	usr/share/jetty/webapps/root/images
-demo/webapps/jetty/images/small.gif	usr/share/jetty/webapps/root/images
-demo/webapps/jetty/images/production.gif	usr/share/jetty/webapps/root/images
-demo/webapps/jetty/images/embeddable.gif	usr/share/jetty/webapps/root/images
+demo/webapps/jetty/*			usr/share/jetty/webapps/root
 README.TXT				usr/share/doc/jetty
 VERSION.TXT				usr/share/doc/jetty
 LICENSE.TXT				usr/share/doc/jetty
--- /cvsroot/pkg-java/jetty/debian/jetty.postinst.debhelper	2004/11/05 21:24:23	1.1.1.1
+++ /cvsroot/pkg-java/jetty/debian/jetty.postinst.debhelper	2005/08/06 16:07:21	1.2
@@ -1,7 +1,7 @@
 # Automatically added by dh_installinit
 if [ -x "/etc/init.d/jetty" ]; then
 	update-rc.d jetty defaults >/dev/null
-	if [ -x /usr/sbin/invoke-rc.d ]; then
+	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
 		invoke-rc.d jetty start || exit 0
 	else
 		/etc/init.d/jetty start || exit 0
--- /cvsroot/pkg-java/jetty/debian/jetty.prerm.debhelper	2004/11/05 21:24:23	1.1.1.1
+++ /cvsroot/pkg-java/jetty/debian/jetty.prerm.debhelper	2005/08/06 16:07:21	1.2
@@ -1,6 +1,6 @@
 # Automatically added by dh_installinit
 if [ -x "/etc/init.d/jetty" ]; then
-	if [ -x /usr/sbin/invoke-rc.d ] ; then
+	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
 		invoke-rc.d jetty stop || exit 0
 	else
 		/etc/init.d/jetty stop || exit 0
--- /cvsroot/pkg-java/jetty/debian/rules	2004/11/05 21:24:23	1.1.1.1
+++ /cvsroot/pkg-java/jetty/debian/rules	2005/08/06 16:07:21	1.2
@@ -6,6 +6,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME_DIRS		:= \
+			   /usr/lib/j2sdk1.5-sun \
 			   /usr/lib/j2sdk1.4-sun \
 			   /usr/lib/j2sdk1.4 \
 			   /usr/lib/j2sdk1.3 \
@@ -13,7 +14,8 @@
 			   /usr/lib/j2se/1.3
 
 ANT_HOME		:= /usr/share/ant
-DEB_JARS		:= mx4j.jar log4j-core.jar /usr/share/ant/lib/ant-launcher.jar log4j.jar junit.jar
-
-DEB_ANT_INSTALL_TARGET	:= extra javadoc
+#DEB_ANT_ARGS		:= -v
+DEB_JARS		:= mx4j.jar log4j-1.2.jar /usr/share/ant/lib/ant-launcher.jar log4j.jar junit.jar
 
+#DEB_ANT_CHECK_TARGET	:= test
+DEB_ANT_INSTALL_TARGET	:= webapps extra javadoc
--- /cvsroot/pkg-java/jetty/debian/start.config	2004/11/05 21:24:21	1.1.1.1
+++ /cvsroot/pkg-java/jetty/debian/start.config	2005/08/06 16:07:21	1.2
@@ -48,6 +48,11 @@
 java.lib.home=/usr/share/java			 always
 tomcat.lib.home=/usr/share/tomcat4/common/lib/   always
 
+# Do not validate xml files by default.
+# Disabled because servlet-2.3.jar references an XSD which is not longer
+# hostet by IBM. This should generally make the startup faster.
+property=org.mortbay.xml.XmlParser.NotValidating=true
+
 # The main class to run
 org.mortbay.jetty.Server.class                   
 
@@ -61,7 +66,8 @@
 #$(jetty.home)/lib/org.mortbay.jetty.jar          java >= 1.4
 #$(jetty.home)/extra/lib/org.mortbay.jetty-jdk1.2.jar   java < 1.4 AND java >= 1.2
 $(jetty.home)/lib/org.mortbay.jmx.jar            
-$(java.lib.home)/servlet-2.3.jar                 ! available javax.servlet.ServletRequest
+$(java.lib.home)/servlet-api-2.4.jar                 
+$(java.lib.home)/jsp-api-2.0.jar                 
 
 # Always use xercesImpl from debian if it is present
 $(java.lib.home)/xercesImpl.jar                  ! available org.apache.xerces.jaxp.DocumentBuilderImpl.class



More information about the pkg-java-commits mailing list