[pkg-java] r8520 - in trunk/jetty/debian: . patches root-webapp

Ludovic Claude ludovicc-guest at alioth.debian.org
Thu Jun 18 19:27:25 UTC 2009


Author: ludovicc-guest
Date: 2009-06-18 19:27:24 +0000 (Thu, 18 Jun 2009)
New Revision: 8520

Added:
   trunk/jetty/debian/README.Debian-source
   trunk/jetty/debian/build.xml
   trunk/jetty/debian/jetty-extra.conf
   trunk/jetty/debian/jetty.conf
   trunk/jetty/debian/libjetty-extra-java.dirs
   trunk/jetty/debian/libjetty-extra-java.install
   trunk/jetty/debian/libjetty-extra-java.links
   trunk/jetty/debian/libjetty-java.dirs
   trunk/jetty/debian/libjetty-java.install
   trunk/jetty/debian/libjetty-java.links
   trunk/jetty/debian/libjetty-setuid-java.install
   trunk/jetty/debian/libjetty-setuid-java.links
   trunk/jetty/debian/module.xml
   trunk/jetty/debian/orig-tar.sh
   trunk/jetty/debian/patches/bootstrap.patch
   trunk/jetty/debian/patches/series
Removed:
   trunk/jetty/debian/adminRealm.properties
   trunk/jetty/debian/ant-jetty-nonfree.properties
   trunk/jetty/debian/ant.properties
   trunk/jetty/debian/jetty-extra.install
   trunk/jetty/debian/jetty.preinst
   trunk/jetty/debian/jetty.prerm
   trunk/jetty/debian/jetty.xml
   trunk/jetty/debian/patches/build-javadoc-src-encoding.patch
   trunk/jetty/debian/patches/build-test-no-depend-on-javadoc.patch
   trunk/jetty/debian/patches/disable-jetty-plus.patch
   trunk/jetty/debian/patches/extras-skip-j2ee.patch
   trunk/jetty/debian/patches/jdk-1.2-src-encoding.patch
   trunk/jetty/debian/patches/remove-import-from-sun.patch
   trunk/jetty/debian/patches/sunjsse-disable.patch
Modified:
   trunk/jetty/debian/README.Debian
   trunk/jetty/debian/TODO
   trunk/jetty/debian/changelog
   trunk/jetty/debian/compat
   trunk/jetty/debian/control
   trunk/jetty/debian/copyright
   trunk/jetty/debian/jetty.default
   trunk/jetty/debian/jetty.dirs
   trunk/jetty/debian/jetty.init
   trunk/jetty/debian/jetty.install
   trunk/jetty/debian/jetty.links
   trunk/jetty/debian/jetty.postinst
   trunk/jetty/debian/jetty.postrm
   trunk/jetty/debian/root-webapp/index.html
   trunk/jetty/debian/rules
   trunk/jetty/debian/start.config
   trunk/jetty/debian/watch
Log:
* Add myself to Uploaders
* Change the build dependency on java-gcj to default-jdk
* Add init.d startup script
* Add dependencies on ant, libslf4j-java, libxerces2-java, libtomcat6-java 
  for libjetty-extra-java, add links for the lib folder
* Add dependency on jsvc to run jetty as a daemon
* Add the package libjetty-setuid-java for the Setuid module (with native
  code)
* Add an index page used when Jetty starts
* Use latest jasper from Tomcat to provide jsp 2.1 instead of
  Glassfish JSP implementation as in the standard distribution
* Add tools.jar to the classpath to be able to run JSP (Closes: #452586)
* Fix Lintian warnings: add ${misc:Depends} to all Depends:
* Move jetty to main as all its dependencies are in main,
  and jetty contains only code that complies with Debian guidelines,
  use java section like tomcat6
  (Closes: #498582)
* Do not depend on tomcat 5.5 (Closes: #530720, #458399)
* Remove empty prerm and preinst scripts
* Remove old patches that don't apply anymore
* Update copyright and remove full text of Apache license
* Bump up compat to 6 and Standards-Version to 3.8.1
* New upstream release for jetty 
  (Closes: #528389, #527571, #454529, #425152).
* Fixed jetty.links. Now delegates install of start.jar to libjetty-java.

Modified: trunk/jetty/debian/README.Debian
===================================================================
--- trunk/jetty/debian/README.Debian	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/README.Debian	2009-06-18 19:27:24 UTC (rev 8520)
@@ -1,6 +1,43 @@
 jetty for Debian
 ----------------
 
-Jetty's extras are available in the jetty-extra package. 
+This debian package installs Jetty 6 into /usr/share/jetty
+and other directories under /var and /etc, which are linked to
+from the /usr/share/jetty directory.
 
- -- Philipp Meier <meier at meisterbohne.de>, Thu Jan 15 13:59:34 CET 2004
+The configuration of the server is in /etc/jetty. The configuration
+files listed in /etc/jetty/jetty.conf are passed to the command
+line of Jetty when it is started by /etc/init.d/jetty
+
+Webapps can be deployed by placing them in /var/lib/jetty/webapps
+(linked from /usr/share/jetty/webapps)
+Additional contexts can be configured and (hot) deployed via the 
+/etc/jetty/contexts directory (linked from /usr/share/jetty/contexts).
+
+Installing:
+
+$ sudo apt-get install libjetty-java
+$ sudo apt-get install libjetty-extra-java
+$ sudo apt-get install jetty
+
+Starting:
+
+Edit /etc/default/jetty
+Set:
+NO_START=0
+
+Then do:
+$ sudo service jetty start
+
+Stopping:
+
+$ sudo service jetty stop
+
+--
+
+This packaging is heavily based on the work done by Philipp Meier <meier at meisterbohne.de>
+and Michael Koch <konqueror at gmx.de>.
+
+-- 
+Greg Wilkins <gregw at mortbay.com> Thu Nov  8 18:10:06 EST 2007
+David Yu <david.yu.ftw at gmail.com> Thu May  21 15:06:30 EST 2009

Added: trunk/jetty/debian/README.Debian-source
===================================================================
--- trunk/jetty/debian/README.Debian-source	                        (rev 0)
+++ trunk/jetty/debian/README.Debian-source	2009-06-18 19:27:24 UTC (rev 8520)
@@ -0,0 +1,58 @@
+jetty for Debian
+----------------
+
+BUILD DEPENDENCIES:
+ cdbs
+ debhelper
+ devscripts
+ fakeroot
+ 
+ JAVA DEBS:
+ ant
+ libservlet2.5-java
+ libmx4j-java
+ libgnumail-java
+ libgnujaf-java
+
+-------------------------------------------------------------------
+
+TESTING ANT BUILD (no dependencies required):
+$ ant -DVERSION=6.1.18 testbuild
+
+CLEAN:
+$ ant -DVERSION=6.1.18 clean
+
+GENERATING SOURCE:
+$ ant -DVERSION=6.1.18 generate-deb-source
+
+GENERATING BINARIES/DEBS:
+$ ant -DVERSION=6.1.18 generate-deb-binaries
+
+MANUAL INSTALLATION:
+$ sudo dpkg -i libjetty-java_6.1.18-1_all.deb
+$ sudo dpkg -i libjetty-extra-java_6.1.18-1_all.deb
+$ sudo dpkg -i jetty_6.1.18-1_all.deb
+
+-------------------------------------------------------------------
+
+GENERATED DEB SOURCES:
+ jetty-6.1.18.orig.tar.gz
+ jetty_6.1.18-1.dsc
+ jetty_6.1.18-1.diff.gz
+
+
+GENERATED DEB BINARIES:
+ libjetty-java
+  - Jetty 6 core modules
+  - includes:
+     jetty-util, jetty-util5, jetty, jetty-sslengine, jetty-start
+ 
+ libjetty-extra-java
+  - Jetty 6 extra modules (depends: libjetty-java)
+  - includes:
+     jetty-management, jetty-naming, jetty-servlet-tester, jetty-ajp, jetty-java5-threadpool, jetty-client, jetty-rewrite-handler
+ 
+ jetty
+  - The standalone http server (depends: libjetty-java)
+  - includes:
+     scripts, config files, docs

Modified: trunk/jetty/debian/TODO
===================================================================
--- trunk/jetty/debian/TODO	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/TODO	2009-06-18 19:27:24 UTC (rev 8520)
@@ -2,14 +2,22 @@
 
 * add better support for /usr/share/webapps like tomcat does.
 
-* test if jetty can be run with virtal machines from main. A quick test
-  with sablevm and kaffe shoes that it's hardly possible. gcj barely tested.
+* evaluate authbind
 
-* improve rc scripts to make startup and shutdown more stable.
+Modules to add:
 
-* make jetty compile and run with jdk1.2 which is possible in upstream.
-  Maybe this would fix the issues with sablevm and kaffe.
+jetty-jsp-2.1
+ - glassfish jsp source + jetty-jsp source needs to be compiled/built to generate a separate deb package
 
-* improve debian specific documentation.
+jetty-plus
+ - geronimo-jta must be available as a deb package (build & runtime dependency)
 
-* evaluate authbind
+jetty-annotations
+ - genonimo-annotation must be available as a deb package (build & runtime dependency)
+
+jetty-terracota
+
+jetty-xbean
+ - spring-framework must be available as a deb package (build dependency)
+ - xbean must include the module xbean-spring
+

Deleted: trunk/jetty/debian/adminRealm.properties
===================================================================
--- trunk/jetty/debian/adminRealm.properties	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/adminRealm.properties	2009-06-18 19:27:24 UTC (rev 8520)
@@ -1,14 +0,0 @@
-#
-# This file defines users passwords and roles for a HashUserRealm
-#
-# The format is
-#  <username>: <password>[,<rolename> ...]
-#
-# Passwords may be clear text, obfuscated or checksummed.  The class 
-# org.mortbay.util.Password should be used to generate obfuscated
-# passwords or password checksums
-#
-# If DIGEST Authentication is used, the password must be in a recoverable
-# format, either plain text or OBF:.
-#
-admin: admin,server-administrator

Deleted: trunk/jetty/debian/ant-jetty-nonfree.properties
===================================================================
--- trunk/jetty/debian/ant-jetty-nonfree.properties	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/ant-jetty-nonfree.properties	2009-06-18 19:27:24 UTC (rev 8520)
@@ -1,21 +0,0 @@
-# compilation settings
-javac.debug=on
-javac.optimize=on
-build.javadoc=gjdoc
-build.compiler=jikes
-javadoc.encoding=ISO-8859-1
-
-# temp files
-ext=../../debian/ext
-jetty.ext=../../debian/ext
-classes=../../debian/build/classes
-test.classes=../../debian/build/test-classes
-jetty.webapp.classes=../../debian/build/jetty-webapp-classes
-tmp.src=../../debian/build/tmp-src
-
-# dist
-etc=../../debian/tmp/etc/jetty
-lib=../../debian/build/lib
-start.jar=../../debian/jetty/usr/share/jetty/lib/start.jar
-stop.jar=../../debian/jetty/usr/share/jetty/lib/stop.jar
-javadoc=../../debian/tmp/usr/share/doc/jetty/api

Deleted: trunk/jetty/debian/ant.properties
===================================================================
--- trunk/jetty/debian/ant.properties	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/ant.properties	2009-06-18 19:27:24 UTC (rev 8520)
@@ -1,2 +0,0 @@
-jasper-runtime.jar=/usr/share/tomcat4/common/lib/jasper-runtime.jar
-jasper-compiler.jar=/usr/share/tomcat4/common/lib/jasper-compiler.jar

Added: trunk/jetty/debian/build.xml
===================================================================
--- trunk/jetty/debian/build.xml	                        (rev 0)
+++ trunk/jetty/debian/build.xml	2009-06-18 19:27:24 UTC (rev 8520)
@@ -0,0 +1,130 @@
+<project name="jetty build" basedir=".." default="package">
+  <property name="src.dir" value="src/main/java"/>
+  <property name="rsrc.dir" value="src/main/resources"/>
+  <property name="config.dir" value="src/main/config/etc"/>
+  <property name="build.dir" value="${basedir}/build"/>
+  <property name="target.dir" value="${basedir}/target"/>
+  <property name="lib.dir" value="${basedir}/lib"/>
+  <property name="etc.dir" value="${basedir}/etc"/>
+  <property name="javadoc.dir" value="${basedir}/javadoc"/>
+  <property name="module.script" location="debian/module.xml"/>
+
+  <path id="classpath">
+    <fileset dir="${target.dir}">
+      <include name="**/*.jar"/>
+    </fileset>
+  </path>
+
+  <target name="package">
+    <mkdir dir="${build.dir}"/>
+    <mkdir dir="${target.dir}"/>
+    <mkdir dir="${lib.dir}"/>
+    <mkdir dir="${etc.dir}"/>
+    
+    <ant dir="${basedir}/modules/util/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-util"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}"/>
+    </ant>
+    
+    <ant dir="${basedir}/modules/util5/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-util5"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}/util5"/>
+    </ant>
+    
+    <ant dir="${basedir}/modules/jetty/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}"/>
+    </ant>
+    
+    <ant dir="${basedir}/extras/sslengine/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-sslengine"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}/sslengine"/>
+    </ant>
+    
+    <ant dir="${basedir}/modules/start/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-start"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${basedir}"/>
+      <property name="jar.main.class" value="org.mortbay.start.Main"/>
+      <property name="jar.file" value="start.jar"/>
+    </ant>
+    
+    <!-- EXTRAS -->
+    
+    <ant dir="${basedir}/modules/html/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-html"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}/ext"/>
+    </ant>
+    
+    <ant dir="${basedir}/modules/management/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-management"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}/management"/>
+    </ant>
+    
+    <ant dir="${basedir}/modules/naming/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-naming"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}/naming"/>
+    </ant>
+    
+    <ant dir="${basedir}/extras/servlet-tester/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-servlet-tester"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}/ext"/>
+    </ant>
+    
+    <ant dir="${basedir}/extras/ajp/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-ajp"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}/ext"/>
+    </ant>
+    
+    <ant dir="${basedir}/extras/setuid/modules/java/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-setuid"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}/ext"/>
+    </ant>
+    
+    <ant dir="${basedir}/extras/threadpool/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-java5-threadpool"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}/ext"/>
+    </ant>
+    
+    <ant dir="${basedir}/extras/client/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-client"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}/ext"/>
+    </ant>
+    
+    <ant dir="${basedir}/contrib/jetty-rewrite-handler/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-rewrite-handler"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}/ext"/>
+    </ant>
+    
+    <copy file="${basedir}/modules/jetty/src/main/resources/org/mortbay/jetty/webapp/webdefault.xml" todir="${etc.dir}"/>
+    <copy file="${basedir}/debian/start.config" todir="${etc.dir}"/>
+    <copy file="${basedir}/debian/jetty.conf" todir="${etc.dir}"/>
+    <copy file="${basedir}/debian/jetty-extra.conf" todir="${etc.dir}"/>
+  </target>
+  
+  <target name="clean">
+    <delete dir="${build.dir}" quiet="true"/>
+    <delete dir="${target.dir}" quiet="true"/>
+    <delete dir="${lib.dir}" quiet="true"/>
+    <delete dir="${etc.dir}" quiet="true"/>
+    <delete includeemptydirs="true" quiet="true">
+      <fileset dir="${javadoc.dir}" excludes="contents.html"/>
+    </delete>
+    <delete file="${basedir}/start.jar" quiet="true"/>
+  </target>
+  
+</project>
+

Modified: trunk/jetty/debian/changelog
===================================================================
--- trunk/jetty/debian/changelog	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/changelog	2009-06-18 19:27:24 UTC (rev 8520)
@@ -1,10 +1,36 @@
-jetty (5.1.14-1.1) unstable; urgency=low
+jetty (6.1.18-1) unstable; urgency=low
 
-  * Added jasper-compiler-jdt to debian/start.config.
-    Closes: #452586.
+  [Ludovic Claude]
+  * Add myself to Uploaders
+  * Change the build dependency on java-gcj to default-jdk
+  * Add init.d startup script
+  * Add dependencies on ant, libslf4j-java, libxerces2-java, libtomcat6-java 
+    for libjetty-extra-java, add links for the lib folder
+  * Add dependency on jsvc to run jetty as a daemon
+  * Add the package libjetty-setuid-java for the Setuid module (with native
+    code)
+  * Add an index page used when Jetty starts
+  * Use latest jasper from Tomcat to provide jsp 2.1 instead of
+    Glassfish JSP implementation as in the standard distribution
+  * Add tools.jar to the classpath to be able to run JSP (Closes: #452586)
+  * Fix Lintian warnings: add ${misc:Depends} to all Depends:
+  * Move jetty to main as all its dependencies are in main,
+    and jetty contains only code that complies with Debian guidelines,
+    use java section like tomcat6
+    (Closes: #498582)
+  * Do not depend on tomcat 5.5 (Closes: #530720, #458399)
+  * Remove empty prerm and preinst scripts
+  * Remove old patches that don't apply anymore
+  * Update copyright and remove full text of Apache license
+  * Bump up compat to 6 and Standards-Version to 3.8.1
 
- -- Jan-Pascal van Best <janpascal at vanbest.org>  Sun, 07 Sep 2008 22:37:08 +0200
+  [David Yu]
+  * New upstream release for jetty 
+    (Closes: #528389, #527571, #454529, #425152).
+  * Fixed jetty.links. Now delegates install of start.jar to libjetty-java.
 
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Fri, 12 Jun 2009 17:19:08 +0100
+
 jetty (5.1.14-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/jetty/debian/compat
===================================================================
--- trunk/jetty/debian/compat	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/compat	2009-06-18 19:27:24 UTC (rev 8520)
@@ -1 +1 @@
-4
+6

Modified: trunk/jetty/debian/control
===================================================================
--- trunk/jetty/debian/control	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/control	2009-06-18 19:27:24 UTC (rev 8520)
@@ -1,27 +1,59 @@
 Source: jetty
-Section: contrib/web
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Philipp Meier <meier at fnogol.de>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 4.9.5), cdbs (>> 0.4.5.3)
-Build-Depends-Indep: java-gcj-compat-dev, ant, junit, libmx4j-java, liblog4j1.2-java, libservlet2.4-java, libcommons-logging-java, libgnumail-java
-Standards-Version: 3.7.2
+Uploaders: Philipp Meier <meier at fnogol.de>, Michael Koch <konqueror at gmx.de>, Thierry Carrez <thierry.carrez at ubuntu.com>,
+ Ludovic Claude <ludovic.claude at laposte.net>
+Build-Depends: debhelper (>= 6), cdbs (>> 0.4.5.3), default-jdk, quilt, ant,
+ libservlet2.5-java, libslf4j-java, libmx4j-java, libgnumail-java, libgnujaf-java, libcommons-daemon-java
+Standards-Version: 3.8.1
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jetty
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jetty
+Homepage: http://jetty.mortbay.com/
 
+Package: libjetty-java
+Architecture: all
+Depends: ${misc:Depends}, default-jre-headless | java5-runtime-headless, libservlet2.5-java, libslf4j-java
+Suggests: jetty
+Description: Java servlet engine and webserver -- core libraries
+ Jetty is an Open Source HTTP Servlet Server written in 100% Java.
+ It is designed to be light weight, high performance, embeddable,
+ extensible and flexible, thus making it an ideal platform for serving
+ dynamic HTTP requests from any Java application.
+
+Package: libjetty-extra-java
+Architecture: all
+Depends: ${misc:Depends}, libjetty-java (>= ${source:Version}), libmx4j-java, 
+ libgnumail-java, libgnujaf-java, ant, libslf4j-java, libxerces2-java, 
+ libtomcat6-java (>= 6.0.20-2)
+Suggests: jetty
+Description: Java servlet engine and webserver -- extra libraries
+ Jetty is an Open Source HTTP Servlet Server written in 100% Java.
+ It is designed to be light weight, high performance, embeddable,
+ extensible and flexible, thus making it an ideal platform for serving
+ dynamic HTTP requests from any Java application. 
+ The extra libraries include jetty-management, jetty-naming,
+ jetty-servlet-tester, jetty-ajp, jetty-java5-threadpool,
+ jetty-client, jetty-rewrite-handler
+
+Package: libjetty-setuid-java
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libjetty-java (>= ${source:Version})
+Suggests: jetty
+Description: Java servlet engine and webserver -- extra libraries
+ Jetty is an Open Source HTTP Servlet Server written in 100% Java.
+ It is designed to be light weight, high performance, embeddable,
+ extensible and flexible, thus making it an ideal platform for serving
+ dynamic HTTP requests from any Java application. 
+ Setuid can be used to start Jetty as root so that privileged ports 
+ may be accessed and then switch to a non-root user for security.
+
 Package: jetty
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime, libxerces2-java, libmx4j-java, adduser, libtomcat5.5-java, libservlet2.4-java, libcommons-logging-java, ant, apache2-utils
-Suggests: libapache2-mod-jk
+Depends: ${misc:Depends}, libjetty-java (>= ${source:Version}), adduser, jsvc
+Suggests: libjetty-extra-java (>= ${source:Version}), libjetty-setuid-java (>= ${source:Version})
 Description: Java servlet engine and webserver
  Jetty is an Open Source HTTP Servlet Server written in 100% Java.
  It is designed to be light weight, high performance, embeddable,
  extensible and flexible, thus making it an ideal platform for serving
  dynamic HTTP requests from any Java application.
-
-Package: jetty-extra
-Architecture: all
-Depends: jetty, liblog4j1.2-java
-Description: Extensions to jetty
- Provides some extensions of jetty:
- * JettyPlus: contains a number of useful facilities integrated with Jetty,
-   namely J2EE user transactions and DataSources, JNDI, JAAS and Log4J.
- * An HTTP Loadbalancer

Modified: trunk/jetty/debian/copyright
===================================================================
--- trunk/jetty/debian/copyright	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/copyright	2009-06-18 19:27:24 UTC (rev 8520)
@@ -1,152 +1,29 @@
-This package was debianized by Philipp Meier <meier at meisterbohne.de>
-on Mon, 14 Jul 2003 13:21:36 +0200.
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: Jetty
+Maintainer: Mortbay Consulting
+Source: http://jetty.mortbay.com/
 
-It was downloaded from http://jetty.mortbay.com/
+Files: *
+Copyright: 2004-2009, Mortbay Consulting
+License: Apache-2.0
 
-Upstream Author: Mortbay Consulting
+Files: modules/jetty/src/main/java/org/mortbay/jetty/security/UnixCrypt.java
+Copyright: 1996, Aki Yoshida,
+Copyright: 2001, Iris Van den Broeke, Daniel Deville.
+License: BSD
+  Permission to use, copy, modify and distribute UnixCrypt 
+  for non-commercial or commercial purposes and without fee is
+  granted provided that the copyright notice appears in all copies.
+  On Debian GNU/Linux system you can find the complete text of the
+  BSD license in '/usr/share/common-licenses/BSD'.
 
-Jetty License Revision: 3.7
+Files: debian/*
+Copyright: 2003, Philipp Meier <meier at meisterbohne.de>
+Copyright: 2009, Ludovic Claude <ludovic.claude at laposte.net>
+Copyright: 2009, David Yu <david.yu.ftw at gmail.com>
+License: Apache-2.0
 
-Preamble:
+License: Apache-2.0
+  On Debian GNU/Linux system you can find the complete text of the
+  Apache 2.0 license in '/usr/share/common-licenses/Apache-2.0'.
 
-The intent of this document is to state the conditions under which the
-Jetty Package may be copied, such that the Copyright Holder maintains some
-semblance of control over the development of the package, while giving
-the users of the package the right to use, distribute and make reasonable
-modifications to the Package in accordance with the goals and ideals of
-the Open Source concept as described at http://www.opensource.org
-
-It is the intent of this license to allow commercial usage of the Jetty
-package, so long as the source code is distributed or suitable visible
-credit given or other arrangements made with the copyright holders.
-
-Definitions:
-
-  *	"Jetty" refers to the collection of Java classes that are
-       distributed as a HTTP server with servlet capabilities and
-       associated utilities.
-
-  *	"Package" refers to the collection of files distributed by the
-       Copyright Holder, and derivatives of that collection of files
-       created through textual modification.
-
-  *	"Standard Version" refers to such a Package if it has not been
-       modified, or has been modified in accordance with the wishes of
-       the Copyright Holder.
-
-  *	"Copyright Holder" is whoever is named in the copyright or
-       copyrights for the package.  Mort Bay Consulting
-       Pty. Ltd. (Australia) is the "Copyright Holder" for the Jetty
-       package.
-
-  *	"You" is you, if you're thinking about copying or distributing
-       this Package.
-
-  *	"Reasonable copying fee" is whatever you can justify on the
-       basis of media cost, duplication charges, time of people involved,
-       and so on.  (You will not be required to justify it to the
-       Copyright Holder, but only to the computing community at large
-       as a market that must bear the fee.)
-
-  *	"Freely Available" means that no fee is charged for the item
-       itself, though there may be fees involved in handling the item.
-       It also means that recipients of the item may redistribute it
-       under the same conditions they received it.
-
-0. The Jetty Package is Copyright (c) Mort Bay Consulting Pty. Ltd.
-(Australia) and others. Individual files in this package may contain
-additional copyright notices. The javax.servlet packages are copyright
-Sun Microsystems Inc.
-
-1. The Standard Version of the Jetty package is available from
-http://jetty.mortbay.org.
-
-2. You may make and distribute verbatim copies of the source form of
-the Standard Version of this Package without restriction, provided that
-you include this license and all of the original copyright notices and
-associated disclaimers.
-
-3. You may make and distribute verbatim copies of the compiled form of
-the Standard Version of this Package without restriction, provided that
-you include this license.
-
-4. You may apply bug fixes, portability fixes and other modifications
-derived from the Public Domain or from the Copyright Holder.  A Package
-modified in such a way shall still be considered the Standard Version.
-
-5. You may otherwise modify your copy of this Package in any way, provided
-that you insert a prominent notice in each changed file stating how and
-when you changed that file, and provided that you do at least ONE of
-the following:
-
-    a) Place your modifications in the Public Domain or otherwise make
-    them Freely Available, such as by posting said modifications to Usenet
-    or an equivalent medium, or placing the modifications on a major
-    archive site such as ftp.uu.net, or by allowing the Copyright Holder
-    to include your modifications in the Standard Version of the Package.
-
-    b) Use the modified Package only within your corporation or
-    organization.
-
-    c) Rename any non-standard classes so the names do not conflict with
-    standard classes, which must also be provided, and provide a separate
-    manual page for each non-standard class that clearly documents how
-    it differs from the Standard Version.
-
-    d) Make other arrangements with the Copyright Holder.
-
-6. You may distribute modifications or subsets of this Package in source
-code or compiled form, provided that you do at least ONE of the following:
-
-    a) Distribute this license and all original copyright messages,
-    together with instructions (in the about dialog, manual page or
-    equivalent) on where to get the complete Standard Version.
-
-    b) Accompany the distribution with the machine-readable source
-    of the Package with your modifications. The modified package must
-    include this license and all of the original copyright notices and
-    associated disclaimers, together with instructions on where to get
-    the complete Standard Version.
-
-    c) Make other arrangements with the Copyright Holder.
-
-7. You may charge a reasonable copying fee for any distribution of this
-Package.  You may charge any fee you choose for support of this Package.
-You may not charge a fee for this Package itself.  However, you may
-distribute this Package in aggregate with other (possibly commercial)
-programs as part of a larger (possibly commercial) software distribution
-provided that you meet the other distribution requirements of this
-license.
-
-8. Input to or the output produced from the programs of this Package do
-not automatically fall under the copyright of this Package, but belong
-to whomever generated them, and may be sold commercially, and may be
-aggregated with this Package.
-
-9. Any program subroutines supplied by you and linked into this Package
-shall not be considered part of this Package.
-
-10. The name of the Copyright Holder may not be used to endorse or
-promote products derived from this software without specific prior
-written permission.
-
-11. This license may change with each release of a Standard Version of
-the Package. You may choose to use the license associated with version
-you are using or the license of the latest Standard Version.
-
-12. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-13. If any superior law implies a warranty, the sole remedy under such
-shall be , at the Copyright Holders option either a) return of any price
-paid or b) use or reasonable endeavours to repair or replace the software.
-
-14. This license shall be read under the laws of Australia.
-
-			    The End
-
-This license was derived from the Artistic license published on
-http://www.opensource.com
-
-

Added: trunk/jetty/debian/jetty-extra.conf
===================================================================
--- trunk/jetty/debian/jetty-extra.conf	                        (rev 0)
+++ trunk/jetty/debian/jetty-extra.conf	2009-06-18 19:27:24 UTC (rev 8520)
@@ -0,0 +1,9 @@
+# list of jetty configuration and property files
+# Replace jetty.conf with this file to use the extra features
+/etc/jetty/jetty-logging.xml
+/etc/jetty/jetty-jmx.xml
+/etc/jetty/jetty.xml
+/etc/jetty/jetty-plus.xml
+/etc/jetty/jetty-ajp.xml
+/etc/jetty/jetty-ssl.xml
+/etc/jetty/jetty-sslengine.xml

Deleted: trunk/jetty/debian/jetty-extra.install
===================================================================
--- trunk/jetty/debian/jetty-extra.install	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/jetty-extra.install	2009-06-18 19:27:24 UTC (rev 8520)
@@ -1 +0,0 @@
-extra/lib/*	usr/share/jetty/lib/

Added: trunk/jetty/debian/jetty.conf
===================================================================
--- trunk/jetty/debian/jetty.conf	                        (rev 0)
+++ trunk/jetty/debian/jetty.conf	2009-06-18 19:27:24 UTC (rev 8520)
@@ -0,0 +1,3 @@
+# list of jetty configuration and property files
+/etc/jetty/jetty-logging.xml
+/etc/jetty/jetty.xml

Modified: trunk/jetty/debian/jetty.default
===================================================================
--- trunk/jetty/debian/jetty.default	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/jetty.default	2009-06-18 19:27:24 UTC (rev 8520)
@@ -1,4 +1,44 @@
 # Defaults for jetty see /etc/init.d/jetty for more
+
+# change to 0 to allow Jetty to start
+NO_START=1 
+
+# change to 'no' or uncomment to use the default setting in /etc/default/rcS 
+VERBOSE=yes
+
+# Run Jetty as this user ID (default: jetty)
+# Set this to an empty string to prevent Jetty from starting automatically
+#JETTY_USER=jetty
+
+# The network host            
+#JETTY_HOST=localhost
+
+# The network port used by Jetty
+#JETTY_PORT=8080
+
+# Timeout in seconds for the shutdown of all webapps
+#JETTY_SHUTDOWN=30
+
+# Additional arguments to pass to Jetty    
+#JETTY_ARGS=
+
+# Extra options to pass to the JVM         
+#JAVA_OPTIONS="-Xmx256m -Djava.awt.headless=true"
+
+# Home of Java installation.
+#JAVA_HOME=
+
+# 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.
+#JDK_DIRS="/usr/lib/jvm/default-java /usr/lib/jvm/java-6-sun"
+
+# Java compiler to use for translating JavaServer Pages (JSPs). You can use all
+# compilers that are accepted by Ant's build.compiler property.
+#JSP_COMPILER=jikes
+
+# Jetty uses a directory to store temporary files like unpacked webapps
 #JETTY_TMP=/var/cache/jetty
-#JAVA_OPTIONS="-Xmx256m -Djava.awt.headless=true \
-#              -Djava.io.tmpdir=$JETTY_TMP -Djava.library.path=/usr/lib"
+
+# Jetty uses a config file to setup its boot classpath
+#JETTY_START_CONFIG=/etc/jetty/start.config
+

Modified: trunk/jetty/debian/jetty.dirs
===================================================================
--- trunk/jetty/debian/jetty.dirs	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/jetty.dirs	2009-06-18 19:27:24 UTC (rev 8520)
@@ -1,9 +1,8 @@
 etc/jetty
+etc/jetty/contexts
 usr/share/jetty
-usr/share/jetty/lib
-usr/share/jetty/ext
-usr/share/jetty/webapps
-usr/share/jetty/cgi-bin
-usr/share/java/webapps
-var/log/jetty/
+usr/share/doc/jetty
+usr/share/doc/jetty/api
+var/lib/jetty/webapps
+var/log/jetty
 var/cache/jetty

Modified: trunk/jetty/debian/jetty.init
===================================================================
--- trunk/jetty/debian/jetty.init	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/jetty.init	2009-06-18 19:27:24 UTC (rev 8520)
@@ -1,27 +1,95 @@
 #!/bin/sh -e
 #
-# /etc/init.d/jetty -- startup script for jetty 4.2.11
+# /etc/init.d/jetty -- startup script for jetty 6.1.18
 #
 # Written by Philipp Meier <meier at meisterbohne.de>
+# Modified for Jetty 6 by Ludovic Claude <ludovic.claude at laposte.net>
 #
 ### BEGIN INIT INFO
 # Provides:          jetty
-# Required-Start:    $syslog $network
-# Required-Stop:     $syslog $network
-# Should-Start:      $local_fs
-# Should-Stop:       $local_fs
+# Required-Start:    $local_fs $remote_fs $network
+# Required-Stop:     $local_fs $remote_fs $network
+# Should-Start:      $named
+# Should-Stop:       $named
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Start Jetty
 # Description:       Start Jetty HTTP server and servlet container.
 ### END INIT INFO
 
+# Configuration files
+#
+# /etc/default/jetty
+#   If it exists, this is read at the start of script. It may perform any 
+#   sequence of shell commands, like setting relevant environment variables.
+#
+# /etc/jetty/jetty.conf
+#   If found, the file will be used as this script's configuration. 
+#   Each line in the file may contain:
+#     - A comment denoted by the pound (#) sign as first non-blank character.
+#     - The path to a regular file, which will be passed to jetty as a 
+#       config.xml file.
+#     - The path to a directory. Each *.xml file in the directory will be
+#       passed to jetty as a config.xml file.
+#
+#   The files will be checked for existence before being passed to jetty.
+#
+# /etc/jetty/jetty.xml
+#   If found, used as this script's configuration file, but only if
+#   /etc/jetty/jetty.conf was not present. See above.
+#   
+# Configuration variables (to define in /etc/default/jetty)
+#
+# JAVA_HOME  
+#   Home of Java installation. 
+#
+# JAVA
+#   Command to invoke Java. If not set, $JAVA_HOME/bin/java will be
+#   used.
+#
+# JAVA_OPTIONS
+#   Extra options to pass to the JVM
+#
+# JETTY_PORT
+#   Override the default port for Jetty servers. If not set then 8080
+#   will be used. The java system property "jetty.port" will be set to 
+#   this value for use in configure.xml files. For example, the following 
+#   idiom is widely used in the demo config files to respect this property 
+#   in Listener configuration elements:
+#
+#    <Set name="Port"><SystemProperty name="jetty.port" default="8080"/></Set>
+#
+# JETTY_ARGS
+#   The default arguments to pass to jetty.
+#
+# JETTY_USER
+#   if set, then used as a username to run the server as
+
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 NAME=jetty
 DESC="Jetty servlet engine"
 JETTY_HOME=/usr/share/$NAME
-START_JAR="$JETTY_HOME/lib/start.jar"
+LOGDIR="/var/log/jetty"
+START_JAR="$JETTY_HOME/start.jar"
+DEFAULT=/etc/default/$NAME
+DAEMON=/usr/bin/jsvc
+JVM_TMP=/tmp/jetty-temp
 
+if [ `id -u` -ne 0 ]; then
+	echo "You need root privileges to run this script"
+	exit 1
+fi
+
+# Make sure jetty is started with system locale
+if [ -r /etc/default/locale ]; then
+	. /etc/default/locale
+	export LANG
+fi
+
+. /lib/lsb/init-functions
+. /etc/default/rcS
+
+
 # The following variables can be overwritten in /etc/default/jetty
 
 # Whether to start jetty (as a daemon) or not
@@ -30,20 +98,35 @@
 # Run Jetty as this user ID (default: jetty)
 # Set this to an empty string to prevent Jetty from starting automatically
 JETTY_USER=jetty
-                                                                                
+            
+# The network host            
+JETTY_HOST=$(uname -n)
+
+# The network port used by Jetty
+JETTY_PORT=8080
+
+# Additional arguments to pass to Jetty    
+JETTY_ARGS=
+
+# Extra options to pass to the JVM         
+# 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"
+                                           
 # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
-# defined in /etc/default/jetty)
+# defined in /etc/default/jetty). Should contain a list of space separated directories.
 JDK_DIRS="
+	  /usr/lib/jvm/default-java \
 	  /usr/lib/jvm/java-6-sun \
+	  /usr/lib/jvm/java-6-openjdk \
 	  /usr/lib/jvm/java-1.5.0-sun \
 	  /usr/lib/jvm/java-gcj \
-          /usr/lib/j2sdk1.6-sun \
-          /usr/lib/j2sdk1.5-sun \
-          /usr/lib/j2sdk1.4-sun \
+	  /usr/lib/j2sdk1.6-sun \
+	  /usr/lib/j2sdk1.5-sun \
+	  /usr/lib/j2sdk1.4-sun \
 	  /usr/lib/j2sdk1.4 \
-          /usr/lib/j2se/1.4 \
-	  /usr/lib/j2sdk1.3 \
-	  /usr/lib/j2se/1.3 \
+	  /usr/lib/j2se/1.4 \
 	  /usr/lib/kaffe/ \
 	 "
 
@@ -53,175 +136,281 @@
 # Jetty uses a directory to store temporary files like unpacked webapps
 JETTY_TMP=/var/cache/jetty
 
-# Jetty uses a config file to setup it's boot classpath
-START_CONFIG=/etc/jetty/start.config
+# Jetty uses a config file to setup its boot classpath
+JETTY_START_CONFIG=/etc/jetty/start.config
 
 # End of variables that can be overwritten in /etc/default/jetty
                                                                                 
 # overwrite settings from default file
-if [ -f /etc/default/jetty ]; then
-        . /etc/default/jetty
+if [ -f "$DEFAULT" ]; then
+	. "$DEFAULT"
 fi
 
 # Check whether jetty is still installed (it might not be if this package was
 # removed and not purged)
-if [ -r "$START_JAR" ]; then
-    HAVE_JETTY=1
-else
-    exit 0
+if [ ! -r "$START_JAR" ]; then
+	log_failure_msg "$NAME is not installed"
+	exit 1
 fi
 
+[ -f "$DAEMON" ] || exit 0
+
 # Check whether startup has been disabled
 if [ "$NO_START" != "0" -a "$1" != "stop" ]; then 
-        [ "$VERBOSE" != "no" ] && echo "Not starting jetty - edit /etc/default/jetty and change NO_START to be 0 (or comment it out).";
-        exit 0;
+	[ "$VERBOSE" != "no" ] && log_failure_msg "Not starting jetty - edit /etc/default/jetty and change NO_START to be 0 (or comment it out)."
+	exit 0
 fi
 
 if [ -z "$JETTY_USER" ]; then
-        echo "Not starting/stopping $DESC as configured (JETTY_USER is"
-        echo "empty in /etc/default/jetty)."
-        exit 0
+	log_failure_msg "Not starting/stopping $DESC as configured"
+	log_failure_msg "(JETTY_USER is empty in /etc/default/jetty)."
+	exit 0
 fi
 
 # Look for the right JVM to use
 for jdir in $JDK_DIRS; do
-        if [ -d "$jdir" -a -z "${JAVA_HOME}" ]; then
-                JAVA_HOME="$jdir"
-        fi
+	if [ -d "$jdir" -a -z "${JAVA_HOME}" ]; then
+		JAVA_HOME="$jdir"
+	fi
 done
 export JAVA_HOME
 
 export JAVA="$JAVA_HOME/bin/java"
 
-# 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+
-if [ -z "$JAVA_OPTIONS" ]; then
-        JAVA_OPTIONS="-Xmx256m \
-	              -Djava.awt.headless=true \
-	              -Djava.io.tmpdir=\"$JETTY_TMP\" \
-		      -Djava.library.path=/usr/lib"
+JAVA_OPTIONS="$JAVA_OPTIONS -Djava.io.tmpdir=$JETTY_TMP \
+  -Djava.library.path=/usr/lib -DSTART=$JETTY_START_CONFIG \
+  -Djetty.home=$JETTY_HOME -Djetty.logs=$LOGDIR \
+  -Djetty.host=$JETTY_HOST -Djetty.port=$JETTY_PORT"
+
+# Set the JSP compiler if set in the jetty.default file
+if [ -n "$JSP_COMPILER" ]; then
+	JAVA_OPTS="$JAVA_OPTS -Dbuild.compiler=$JSP_COMPILER"
 fi
+
 export JAVA_OPTIONS
                                                                                 
 # Define other required variables
 PIDFILE="/var/run/$NAME.pid"
-LOGDIR="/var/log/jetty"
 WEBAPPDIR="$JETTY_HOME/webapps"
+BOOTSTRAP_CLASS=org.mortbay.start.Bootstrap
+JSVC_CLASSPATH="/usr/share/java/commons-daemon.jar:$START_JAR:$JAVA_HOME/lib/tools.jar"
 
 ##################################################
 # Check for JAVA_HOME
 ##################################################
 if [ -z "$JAVA_HOME" ]; then
-    echo "Could not start $DESC because no Java Development Kit"
-    echo "(JDK) was found. Please download and install JDK 1.3 or higher and set"
-    echo "JAVA_HOME in /etc/default/jetty to the JDK's installation directory."
-    exit 0
+	log_failure_msg "Could not start $DESC because no Java Development Kit"
+	log_failure_msg "(JDK) was found. Please download and install JDK 1.4 or higher and set"
+	log_failure_msg "JAVA_HOME in /etc/default/jetty to the JDK's installation directory."
+	exit 0
+fi
 
+CONFIG_LINES=$(cat /etc/jetty/jetty.conf | grep -v "^[:space:]*#" | tr "\n" " ")
+
+##################################################
+# Get the list of config.xml files from jetty.conf
+##################################################
+if [ ! -z "${CONFIG_LINES}" ] 
+then
+  for CONF in ${CONFIG_LINES} 
+  do
+    if [ ! -r "$CONF" ] 
+    then
+      log_warning_msg "WARNING: Cannot read '$CONF' specified in '$JETTY_CONF'" 
+    elif [ -f "$CONF" ] 
+    then
+      # assume it's a configure.xml file
+      CONFIGS="$CONFIGS $CONF" 
+    elif [ -d "$CONF" ] 
+    then
+      # assume it's a directory with configure.xml files
+      # for example: /etc/jetty.d/
+      # sort the files before adding them to the list of CONFIGS
+      XML_FILES=`ls ${CONF}/*.xml | sort | tr "\n" " "` 
+      for FILE in ${XML_FILES} 
+      do
+         if [ -r "$FILE" ] && [ -f "$FILE" ] 
+         then
+            CONFIGS="$CONFIGS $FILE" 
+         else
+           log_warning_msg "WARNING: Cannot read '$FILE' specified in '$JETTY_CONF'" 
+         fi
+      done
+    else
+      log_warning_msg "WARNING: Don''t know what to do with '$CONF' specified in '$JETTY_CONF'" 
+    fi
+  done
 fi
 
-ARGUMENTS="$JAVA_OPTIONS -DSTART=$START_CONFIG -Djetty.home=$JETTY_HOME -jar $START_JAR /etc/jetty/jetty.xml"
+#####################################################
+# Run the standard server if there's nothing else to run
+#####################################################
+if [ -z "$CONFIGS" ]
+then
+	CONFIGS="/etc/jetty/jetty-logging.xml /etc/jetty/jetty.xml"
+fi
 
 ##################################################
 # Do the action
 ##################################################
 case "$1" in
   start)
+	log_daemon_msg "Starting $DESC." "$NAME"
 	if start-stop-daemon --quiet --test --start --pidfile "$PIDFILE" \
 	                --user "$JETTY_USER" --startas "$JAVA" > /dev/null; then 
 
-
-
 	    # Look for rotatelogs/rotatelogs2
 	    if [ -x /usr/sbin/rotatelogs ]; then
-		ROTATELOGS=/usr/sbin/rotatelogs
+			ROTATELOGS=/usr/sbin/rotatelogs
 	    else
-		ROTATELOGS=/usr/sbin/rotatelogs2
+			ROTATELOGS=/usr/sbin/rotatelogs2
 	    fi
 
 	    if [ -f $PIDFILE ]
 		then
-			echo "$PIDFILE exists, but jetty was not running. Ignoring $PIDFILE"
+			log_warning_msg "$PIDFILE exists, but jetty was not running. Ignoring $PIDFILE"
 	    fi
 
-	    echo -n "Starting $DESC: "
-	    	if [ \! -e "$LOGDIR/out.log" ]; then
-			touch "$LOGDIR/out.log"
-			chown jetty.adm "$LOGDIR/out.log"
+	    if [ \! -e "$LOGDIR/out.log" ]; then
+			log_progress_msg "Create log file"
+			sudo -u $JETTY_USER touch "$LOGDIR/out.log"
+			chown $JETTY_USER:adm "$LOGDIR/out.log"
 		fi
-		su -p -s /bin/sh "$JETTY_USER" \
-			-c "$ROTATELOGS \"$LOGDIR/out.log\" 86400" \
-			< "$LOGDIR/out.log" &
-		su -p -s /bin/sh "$JETTY_USER" \
-			-c "$JAVA $ARGUMENTS >> $LOGDIR/out.log 2>&1 & \
-			    echo \$!"  > "$PIDFILE"
-                echo "$NAME."
+		log_progress_msg "Rotate logs"
+		sudo -b -u $JETTY_USER $ROTATELOGS "$LOGDIR/out.log" 86400 \
+			< "$LOGDIR/out.log"
+
+		# Remove / recreate JETTY_TMP directory
+		rm -rf "$JETTY_TMP"
+		mkdir "$JETTY_TMP" || {
+			log_failure_msg "could not create $DESC temporary directory at $JETTY_TMP"
+			exit 1
+		}
+		chown $JETTY_USER "$JETTY_TMP"
+
+		# Remove / recreate JVM_TMP directory
+		rm -rf "$JVM_TMP"
+		mkdir "$JVM_TMP" || {
+			log_failure_msg "could not create JVM temporary directory at $JVM_TMP"
+			exit 1
+		}
+		chown $JETTY_USER "$JVM_TMP"
+		cd "$JVM_TMP"
+
+		$DAEMON -user "$JETTY_USER" -cp "$JSVC_CLASSPATH" \
+		    -outfile $LOGDIR/out.log -errfile $LOGDIR/out.log \
+		    -pidfile "$PIDFILE" $JAVA_OPTIONS $BOOTSTRAP_CLASS \
+		    $JETTY_ARGS $CONFIGS
+
+		log_daemon_msg "$DESC started, reachable on http://$JETTY_HOST:$JETTY_PORT/." "$NAME"
+
+		sleep 5
+		if start-stop-daemon --test --start --pidfile "$PIDFILE" \
+			--user $JETTY_USER --startas "$JAVA" >/dev/null; then
+			log_end_msg 1
+		else
+			log_end_msg 0
+		fi
+
 	else
-        echo "(already running)."
+		log_warning_msg "(already running)."
+		log_end_msg 0
 		exit 1
-    fi
-        ;;
+	fi
+	;;
 
   stop)
-  	echo -n "Stopping $DESC: "
+	log_daemon_msg "Stopping $DESC (was reachable on http://$JETTY_HOST:$JETTY_PORT/)." "$NAME"
 
 	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)."
+			log_warning_msg "(not running but $PIDFILE exists)."
 		else
-			echo "(not running)."
+			log_warning_msg "(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 -ge 0 ]; then
+		while ! start-stop-daemon --quiet --test --start \
+			  --pidfile "$PIDFILE" --user "$JETTY_USER" \
+			  --startas "$JAVA" > /dev/null; do 
+			sleep 1
+			log_progress_msg "."
+			JETTY_SHUTDOWN=`expr $JETTY_SHUTDOWN - 1` || true
+			if [ $JETTY_SHUTDOWN -ge 0 ]; then
 				start-stop-daemon --oknodo --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."
+				log_progress_msg " (killing) "
+				start-stop-daemon --stop --signal 9 --oknodo \
+					--quiet --pidfile "$PIDFILE" \
+					--user "$JETTY_USER"
+			fi
+		done
+		rm -f "$PIDFILE"
+		rm -rf "$JVM_TMP"
+		rm -rf "$JETTY_TMP/*"
+		log_daemon_msg "$DESC stopped." "$NAME"
+		log_end_msg 0
 	fi
-        ;;
+	;;
 
+  status)
+	if start-stop-daemon --quiet --test --start --pidfile "$PIDFILE" \
+		--user "$JETTY_USER" --startas "$JAVA" > /dev/null; then
+
+		if [ -f "$PIDFILE" ]; then
+		    log_success_msg "$DESC is not running, but pid file exists."
+			exit 1
+		else
+		    log_success_msg "$DESC is not running."
+			exit 3
+		fi
+	else
+		log_success_msg "$DESC is running with pid `cat $PIDFILE`, and is reachable on http://$JETTY_HOST:$JETTY_PORT/"
+	fi
+	;;
+
   restart|force-reload)
-        $0 stop $*
-        sleep 1
-        $0 start $*
-        ;;
+	if start-stop-daemon --quiet --test --start --pidfile "$PIDFILE" \
+		--user "$JETTY_USER" --startas "$JAVA" > /dev/null; then
+		$0 stop $*
+		sleep 1
+	fi
+	$0 start $*
+	;;
 
+  try-restart)
+	if start-stop-daemon --quiet --test --start --pidfile "$PIDFILE" \
+		--user "$JETTY_USER" --startas "$JAVA" > /dev/null; then
+		$0 start $*
+	fi
+	;;
+
   check)
-        echo "Checking arguments to Jetty: "
-        echo
-	echo "PIDFILE        =  $PIDFILE"
-	echo "JAVA_OPTIONS   =  $JAVA_OPTIONS"
-	echo "JAVA           =  $JAVA"
-	echo "JETTY_USER     =  $JETTY_USER"
-	echo "ARGUMENTS      =  $ARGUMENTS"
+	log_success_msg "Checking arguments for Jetty: "
+	log_success_msg ""
+	log_success_msg "PIDFILE        =  $PIDFILE"
+	log_success_msg "JAVA_OPTIONS   =  $JAVA_OPTIONS"
+	log_success_msg "JAVA           =  $JAVA"
+	log_success_msg "JETTY_USER     =  $JETTY_USER"
+	log_success_msg "JETTY_HOST     =  $JETTY_HOST"
+	log_success_msg "JETTY_PORT     =  $JETTY_PORT"
+	log_success_msg "ARGUMENTS      =  $ARGUMENTS"
         
-        if [ -f $PIDFILE ]
-        then
-            echo "Jetty running pid="`cat $PIDFILE`
-            exit 0
-        fi
-        exit 1
-        ;;
+	if [ -f $PIDFILE ]
+	then
+		log_success_msg "$DESC is running with pid `cat $PIDFILE`, and is reachable on http://$JETTY_HOST:$JETTY_PORT/"
+		exit 0
+	fi
+	exit 1
+	;;
 
   *)
-        echo "Usage: /etc/init.d/jetty {start|stop|restart|force-reload|check}" >&2
+	log_success_msg "Usage: $0 {start|stop|restart|force-reload|try-restart|status|check}"
 	exit 1
 	;;
 esac

Modified: trunk/jetty/debian/jetty.install
===================================================================
--- trunk/jetty/debian/jetty.install	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/jetty.install	2009-06-18 19:27:24 UTC (rev 8520)
@@ -1,13 +1,14 @@
-start.jar	usr/share/jetty/lib
-stop.jar	usr/share/jetty/lib
-lib/org.mortbay*		usr/share/jetty/lib
-classes/org/mortbay/jetty/servlet/webdefault.xml	etc/jetty
-debian/tmp/usr/share/jetty/lib/*
-debian/jetty.xml			etc/jetty
-debian/start.config			etc/jetty
-debian/adminRealm.properties		etc/jetty
-demo/webapps/jetty/*			usr/share/jetty/webapps/root
-README.TXT				usr/share/doc/jetty
-VERSION.TXT				usr/share/doc/jetty
-javadoc/*				usr/share/doc/jetty/api
-etc/dtd					usr/share/doc/jetty
+etc/*                   etc/jetty
+webapps/README.TXT      var/lib/jetty/webapps
+debian/root-webapp/*    var/lib/jetty/webapps/root
+examples/test-webapp/src/main/webapp/jetty_banner.gif var/lib/jetty/webapps/root
+contexts                etc/jetty
+resources               usr/share/jetty
+README.txt              usr/share/doc/jetty
+VERSION.txt             usr/share/doc/jetty
+LICENSES/cla-*          usr/share/doc/jetty/LICENSES
+LICENSES/ccla-*         usr/share/doc/jetty/LICENSES
+LICENSES/contrib        usr/share/doc/jetty/LICENSES
+LICENSES/NOTICE.txt     usr/share/doc/jetty/LICENSES
+javadoc/*               usr/share/doc/jetty/api
+debian/README.Debian    usr/share/doc/jetty

Modified: trunk/jetty/debian/jetty.links
===================================================================
--- trunk/jetty/debian/jetty.links	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/jetty.links	2009-06-18 19:27:24 UTC (rev 8520)
@@ -1,2 +1,5 @@
-usr/share/jetty/lib/org.mortbay.jetty.jar usr/share/java/jetty-5.0.0.jar
-usr/share/java/jetty-5.0.0.jar usr/share/java/jetty.jar
+var/lib/jetty/webapps  usr/share/jetty/webapps
+var/log/jetty          usr/share/jetty/logs
+etc/jetty              usr/share/jetty/etc
+etc/jetty/contexts     usr/share/jetty/contexts
+usr/share/doc/jetty/api usr/share/jetty/javadoc

Modified: trunk/jetty/debian/jetty.postinst
===================================================================
--- trunk/jetty/debian/jetty.postinst	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/jetty.postinst	2009-06-18 19:27:24 UTC (rev 8520)
@@ -7,8 +7,8 @@
 		--ingroup nogroup --disabled-password --shell /bin/false \
 		jetty
 	fi
-	chown jetty:adm /var/cache/jetty /var/log/jetty 
-	chmod 750 /var/log/jetty 
+	chown -R jetty:adm /var/cache/jetty /var/log/jetty /var/lib/jetty
+	chmod 750 /var/log/jetty
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: trunk/jetty/debian/jetty.postrm
===================================================================
--- trunk/jetty/debian/jetty.postrm	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/jetty.postrm	2009-06-18 19:27:24 UTC (rev 8520)
@@ -8,7 +8,7 @@
 case "$1" in
     purge)
 	userdel jetty || true
-        rm -rf /var/log/jetty 
+        rm -rf /var/log/jetty
     ;;
 
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

Deleted: trunk/jetty/debian/jetty.preinst
===================================================================
--- trunk/jetty/debian/jetty.preinst	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/jetty.preinst	2009-06-18 19:27:24 UTC (rev 8520)
@@ -1,42 +0,0 @@
-#! /bin/sh
-# preinst script for jetty
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <new-preinst> `install'
-#        * <new-preinst> `install' <old-version>
-#        * <new-preinst> `upgrade' <old-version>
-#        * <old-preinst> `abort-upgrade' <new-version>
-#
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    upgrade)
-
-    ;;
-
-    install|upgrade)
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-

Deleted: trunk/jetty/debian/jetty.prerm
===================================================================
--- trunk/jetty/debian/jetty.prerm	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/jetty.prerm	2009-06-18 19:27:24 UTC (rev 8520)
@@ -1,39 +0,0 @@
-#! /bin/sh
-# prerm script for jetty
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    remove|upgrade|deconfigure)
-#       install-info --quiet --remove /usr/info/jetty.info.gz
-        ;;
-    failed-upgrade)
-        ;;
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-

Deleted: trunk/jetty/debian/jetty.xml
===================================================================
--- trunk/jetty/debian/jetty.xml	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/jetty.xml	2009-06-18 19:27:24 UTC (rev 8520)
@@ -1,222 +0,0 @@
-<?xml version="1.0"?> 
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure 1.2//EN" "http://jetty.mortbay.org/configure_1_2.dtd">
-
-
-
-<!-- =============================================================== -->
-<!-- Configure the Jetty Server                                      -->
-<!-- =============================================================== -->
-<Configure class="org.mortbay.jetty.Server">
-
-  <Call class="org.apache.commons.logging.LogFactory" name="getFactory">
-    <Call name="getInstance">
-      <Arg/>
-      <Call name="reset"/>
-      <Call name="add">
-        <Arg>
-          <New class="org.mortbay.log.OutputStreamLogSink">
-            <Set name="filename">/var/log/jetty/jetty_yyyy_mm_dd.log</Set>
-            <Set name="retainDays">90</Set>
-            <Set name="append">true</Set>
-            <Set name="logLabels">true</Set>
-            <Set name="logStackSize">true</Set>
-            <Set name="logStackTrace">false</Set>
-            <Set name="logOneLine">false</Set>
-            <Set name="suppressStack">false</Set>
-            <Set name="logTimeZone">GMT</Set>
-          </New>
-        </Arg>
-      </Call>
-    </Call>
-  </Call>
-
-
-
-  <!-- =============================================================== -->
-  <!-- Configure the Request Listeners                                 -->
-  <!-- =============================================================== -->
-
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Add and configure a HTTP listener to port 8280                  -->
-  <!-- The default port can be changed using: java -Djetty.port=80     -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <Call name="addListener">
-    <Arg>
-      <New class="org.mortbay.http.SocketListener">
-        <Set name="Port"><SystemProperty name="jetty.port" default="8280"/></Set>
-        <Set name="MinThreads">10</Set>
-        <Set name="MaxThreads">100</Set>
-        <Set name="MaxIdleTimeMs">30000</Set>
-        <Set name="LowResourcePersistTimeMs">5000</Set>
-        <Set name="ConfidentialPort">8443</Set>
-        <Set name="IntegralPort">8443</Set>
-      </New>
-    </Arg>
-  </Call>
-
-
-
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Add a HTTPS SSL listener on port 8443                           -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- UNCOMMENT TO ACTIVATE
-  <Call name="addListener">
-    <Arg>
-      <New class="org.mortbay.http.SunJsseListener">
-        <Set name="Port">8443</Set>
-        <Set name="MinThreads">5</Set>
-        <Set name="MaxThreads">100</Set>
-        <Set name="MaxIdleTimeMs">30000</Set>
-        <Set name="LowResourcePersistTimeMs">2000</Set>
-        <Set name="Keystore">/etc/demokeystore</Set>
-	<Set name="Password">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set>
-	<Set name="KeyPassword">OBF:1u2u1wml1z7s1z7a1wnl1u2g</Set>
-      </New>
-    </Arg>
-  </Call>
-  -->
-
-
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Add a AJP13 listener on port 8209                               -->
-  <!-- This protocol can be used with mod_jk in apache, IIS etc.       -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- UNCOMMENT TO ACTIVATE
-  <Call name="addListener">
-    <Arg>
-      <New class="org.mortbay.http.ajp.AJP13Listener">
-        <Set name="Host">127.0.0.1</Set>
-        <Set name="Port">8209</Set>
-        <Set name="MinThreads">5</Set>
-        <Set name="MaxThreads">20</Set>
-        <Set name="MaxIdleTimeMs">0</Set>
-        <Set name="confidentialPort">443</Set>
-      </New>
-    </Arg>
-  </Call>
-  -->
-
-
-  <!-- =============================================================== -->
-  <!-- Configure the Contexts                                          -->
-  <!-- =============================================================== -->
-
-
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Add a all web application within the webapps directory.         -->
-  <!-- + No virtual host specified                                     -->
-  <!-- + Look in the webapps directory relative to jetty.home or .     -->
-  <!-- + Use the webdefault.xml resource for the defaults descriptor   -->
-  <!-- + Upack the war file                                            -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <Set name="rootWebApp">root</Set>
-  <Call name="addWebApplications">
-    <Arg></Arg>
-    <Arg><SystemProperty name="jetty.home" default="/usr/share/jetty"/>/webapps/</Arg>
-    <Arg>/etc/jetty/webdefault.xml</Arg>
-    <Arg type="boolean">true</Arg>
-  </Call>
-
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Add a all web application within the debian webapps directory.  -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- UNCOMMENT TO ACTIVATE
-  <Call name="addWebApplications">
-    <Arg></Arg>
-    <Arg>/usr/share/java/webapps/</Arg>
-    <Arg>/etc/jetty/webdefault.xml</Arg>
-    <Arg type="boolean">false</Arg>
-  </Call>
-  -->
-
-  <Call name="addRealm">
-    <Arg>
-      <New class="org.mortbay.http.HashUserRealm">
-        <Arg>Jetty Admin Realm</Arg>
-        <Arg>/etc/jetty/adminRealm.properties</Arg>
-      </New>
-    </Arg>
-  </Call>
-
-  <Call name="addContext">
-    <Arg>/admin</Arg>   
-    <Set name="realmName">Jetty Admin Realm</Set>
-    <Set name="authenticator"><New class="org.mortbay.http.BasicAuthenticator"/></Set>
-   
-    <Call name="addHandler">
-      <Arg><New class="org.mortbay.http.handler.SecurityHandler"/></Arg>  
-    </Call>      
-    <Call name="addSecurityConstraint">
-       <Arg>/</Arg> 
-       <Arg><New class="org.mortbay.http.SecurityConstraint">
-              <Arg>Admin</Arg>
-              <Arg>server-administrator</Arg>
-       </New></Arg>
-    </Call>
-
-    <Call name="addServlet">
-      <Arg>Debug</Arg>
-      <Arg>/Debug/*</Arg>
-      <Arg>org.mortbay.servlet.Debug</Arg>
-    </Call>
-    <Call name="addServlet">
-      <Arg>Admin</Arg>
-      <Arg>/</Arg>
-      <Arg>org.mortbay.servlet.AdminServlet</Arg>
-    </Call>
-    <Call name="setAttribute">
-      <Arg>org.mortbay.http.HttpServer</Arg>
-      <Arg><Call name="getHttpServer"/></Arg>
-    </Call>
-  </Call>
-
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Build the javadoc context.                                      -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <Call name="addContext">
-    <Arg>/javadoc/*</Arg>
-    <Set name="ResourceBase">/usr/share/doc/jetty/api/</Set>
-    <Call name="addHandler">
-      <Arg><New class="org.mortbay.http.handler.ResourceHandler"/></Arg>
-    </Call>
-  </Call>
-
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Build the cgi-bin context.                                      -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <Call name="addContext">
-    <Arg>/cgi-bin/*</Arg>
-    <Set name="ResourceBase">/usr/lib/cgi-bin/</Set>
-    <Call name="addServlet">
-      <Arg>Common Gateway Interface</Arg>
-      <Arg>/</Arg>
-      <Arg>org.mortbay.servlet.CGI</Arg>
-      <!-- Set initParams for CGI -->
-      <Put name="Path">/bin:/usr/bin:/usr/local/bin</Put>
-      <!-- <Put name="commandPrefix">perl</Put> -->
-    </Call>
-  </Call>
-
-  <!-- =============================================================== -->
-  <!-- Configure the Request Log                                       -->
-  <!-- =============================================================== -->
-  <Set name="RequestLog">
-    <New class="org.mortbay.http.NCSARequestLog">
-      <Arg>/var/log/jetty/request_yyyy_mm_dd.log</Arg>
-      <Set name="retainDays">90</Set>
-      <Set name="append">true</Set>
-      <Set name="extended">false</Set>
-      <Set name="buffered">false</Set>
-      <Set name="LogTimeZone">GMT</Set>
-    </New>
-  </Set>
-
-  <!-- =============================================================== -->
-  <!-- Configure the Other Server Options                              -->
-  <!-- =============================================================== -->
-  <Set name="requestsPerGC">2000</Set>
-  <Set name="statsOn">false</Set>
-
-</Configure>
-
-

Added: trunk/jetty/debian/libjetty-extra-java.dirs
===================================================================
--- trunk/jetty/debian/libjetty-extra-java.dirs	                        (rev 0)
+++ trunk/jetty/debian/libjetty-extra-java.dirs	2009-06-18 19:27:24 UTC (rev 8520)
@@ -0,0 +1,5 @@
+usr/share/jetty/lib/ext
+usr/share/jetty/lib/management
+usr/share/jetty/lib/management/mx4j
+usr/share/jetty/lib/naming
+usr/share/jetty/lib/jsp-2.0

Added: trunk/jetty/debian/libjetty-extra-java.install
===================================================================
--- trunk/jetty/debian/libjetty-extra-java.install	                        (rev 0)
+++ trunk/jetty/debian/libjetty-extra-java.install	2009-06-18 19:27:24 UTC (rev 8520)
@@ -0,0 +1,9 @@
+lib/management/jetty-management-6*.jar  usr/share/jetty/lib/management
+lib/naming/jetty-naming-6*.jar          usr/share/jetty/lib/naming
+#lib/plus/jetty-plus-6*.jar              usr/share/jetty/lib/plus
+lib/ext/jetty-html-6*.jar               usr/share/jetty/lib/ext 
+lib/ext/jetty-servlet-tester-6*.jar     usr/share/jetty/lib/ext
+lib/ext/jetty-ajp-6*.jar                usr/share/jetty/lib/ext
+lib/ext/jetty-java5-threadpool-6*.jar   usr/share/jetty/lib/ext
+lib/ext/jetty-client-6*.jar             usr/share/jetty/lib/ext
+lib/ext/jetty-rewrite-handler-6*.jar    usr/share/jetty/lib/ext

Added: trunk/jetty/debian/libjetty-extra-java.links
===================================================================
--- trunk/jetty/debian/libjetty-extra-java.links	                        (rev 0)
+++ trunk/jetty/debian/libjetty-extra-java.links	2009-06-18 19:27:24 UTC (rev 8520)
@@ -0,0 +1,23 @@
+usr/share/java/mx4j.jar            usr/share/jetty/lib/management/mx4j/mx4j.jar
+usr/share/java/mx4j-tools.jar      usr/share/jetty/lib/management/mx4j/mx4j-tools.jar
+usr/share/java/activation.jar      usr/share/jetty/lib/naming/activation.jar
+usr/share/java/gnumail.jar         usr/share/jetty/lib/naming/mail.jar
+usr/share/java/ant.jar             usr/share/jetty/lib/jsp-2.1/ant.jar
+usr/share/java/jasper.jar          usr/share/jetty/lib/jsp-2.1/jasper.jar
+usr/share/java/jsp-api-2.1.jar     usr/share/jetty/lib/jsp-2.1/jsp-api.jar
+usr/share/java/el-api-2.1.jar      usr/share/jetty/lib/jsp-2.1/el-api.jar
+usr/share/java/jasper-el.jar       usr/share/jetty/lib/jsp-2.1/commons-el.jar
+usr/share/java/tomcat-juli.jar     usr/share/jetty/lib/jsp-2.1/tomcat-juli.jar
+usr/share/java/jcl-over-slf4j.jar  usr/share/jetty/lib/jsp-2.1/jcl-over-slf4j.jar
+usr/share/java/slf4j-api.jar       usr/share/jetty/lib/jsp-2.1/slf4j-api.jar
+usr/share/java/slf4j-simple.jar    usr/share/jetty/lib/jsp-2.1/slf4j-simple.jar
+usr/share/java/xercesImpl.jar      usr/share/jetty/lib/jsp-2.1/xercesImpl.jar
+usr/share/java/xmlParserAPIs.jar   usr/share/jetty/lib/jsp-2.1/xmlParserAPIs.jar
+usr/share/jetty/lib/management/jetty-management-$VERSION.jar     usr/share/java/jetty-management.jar
+usr/share/jetty/lib/naming/jetty-naming-$VERSION.jar             usr/share/java/jetty-naming.jar
+usr/share/jetty/lib/ext/jetty-servlet-tester-$VERSION.jar        usr/share/java/jetty-servlet-tester.jar
+usr/share/jetty/lib/ext/jetty-ajp-$VERSION.jar                   usr/share/java/jetty-ajp.jar
+usr/share/jetty/lib/ext/jetty-java5-threadpool-$VERSION.jar      usr/share/java/jetty-java5-threadpool.jar
+usr/share/jetty/lib/ext/jetty-client-$VERSION.jar                usr/share/java/jetty-client.jar
+usr/share/jetty/lib/ext/jetty-rewrite-handler-$VERSION.jar       usr/share/java/jetty-rewrite-handler.jar
+

Added: trunk/jetty/debian/libjetty-java.dirs
===================================================================
--- trunk/jetty/debian/libjetty-java.dirs	                        (rev 0)
+++ trunk/jetty/debian/libjetty-java.dirs	2009-06-18 19:27:24 UTC (rev 8520)
@@ -0,0 +1,4 @@
+usr/share/jetty
+usr/share/jetty/lib
+usr/share/jetty/lib/jre1.5
+usr/share/jetty/lib/ext

Added: trunk/jetty/debian/libjetty-java.install
===================================================================
--- trunk/jetty/debian/libjetty-java.install	                        (rev 0)
+++ trunk/jetty/debian/libjetty-java.install	2009-06-18 19:27:24 UTC (rev 8520)
@@ -0,0 +1,5 @@
+lib/jetty-util-6*.jar                           usr/share/jetty/lib
+lib/util5/jetty-util5-6*.jar                    usr/share/jetty/lib/jre1.5
+lib/jetty-6*.jar                                usr/share/jetty/lib
+lib/sslengine/jetty-sslengine-6*.jar            usr/share/jetty/lib/ext
+start.jar                                       usr/share/jetty

Added: trunk/jetty/debian/libjetty-java.links
===================================================================
--- trunk/jetty/debian/libjetty-java.links	                        (rev 0)
+++ trunk/jetty/debian/libjetty-java.links	2009-06-18 19:27:24 UTC (rev 8520)
@@ -0,0 +1,6 @@
+usr/share/java/servlet-api-2.5.jar                            usr/share/jetty/lib/servlet-api-2.5.jar
+usr/share/jetty/lib/jetty-util-$VERSION.jar                  usr/share/java/jetty-util.jar
+usr/share/jetty/lib/util5/jetty-util5-$VERSION.jar           usr/share/java/jetty-util5.jar
+usr/share/jetty/lib/jetty-$VERSION.jar                       usr/share/java/jetty.jar
+usr/share/jetty/lib/sslengine/jetty-sslengine-$VERSION.jar   usr/share/java/jetty-sslengine.jar
+usr/share/jetty/start.jar                                    usr/share/java/jetty-start.jar

Added: trunk/jetty/debian/libjetty-setuid-java.install
===================================================================
--- trunk/jetty/debian/libjetty-setuid-java.install	                        (rev 0)
+++ trunk/jetty/debian/libjetty-setuid-java.install	2009-06-18 19:27:24 UTC (rev 8520)
@@ -0,0 +1,3 @@
+lib/ext/jetty-setuid-6*.jar             usr/share/jetty/lib/ext
+lib/ext/libsetuid.so                    usr/lib/jetty
+

Added: trunk/jetty/debian/libjetty-setuid-java.links
===================================================================
--- trunk/jetty/debian/libjetty-setuid-java.links	                        (rev 0)
+++ trunk/jetty/debian/libjetty-setuid-java.links	2009-06-18 19:27:24 UTC (rev 8520)
@@ -0,0 +1 @@
+usr/lib/jetty/libsetuid.so        usr/share/jetty/lib/ext/libsetuid.so

Added: trunk/jetty/debian/module.xml
===================================================================
--- trunk/jetty/debian/module.xml	                        (rev 0)
+++ trunk/jetty/debian/module.xml	2009-06-18 19:27:24 UTC (rev 8520)
@@ -0,0 +1,112 @@
+<project name="jetty module build" basedir="." default="package">
+  <property name="jar.file" value="${module-name}-${module-version}.jar"/>
+  <property name="javac.excludes" value=""/>
+  <target name="package">
+    <delete dir="${build.dir}"/>
+    <mkdir dir="${build.dir}"/>
+    
+    <echo>generating javadoc for ${module-name}</echo>
+    <javadoc packagenames="org.mortbay.*,javax.servlet.*"
+             destdir="${javadoc.dir}"
+             author="true"
+             version="true"
+             public="false"
+             windowtitle="jetty-${module-version} API"
+             doctitle="${module-name}-${module-version}"
+             encoding="ISO-8859-1"
+             bottom="Copyright &amp;copy; 2009 Mortbay Consulting Pty. Ltd. All Rights Reserved.">
+       <classpath>
+         <path refid="classpath"/>
+       </classpath>
+       <sourcepath>
+         <pathelement path="${src.dir}"/>
+       </sourcepath>
+    </javadoc>
+    
+    <echo>compiling ${module-name}</echo>
+    <javac srcdir="${src.dir}"
+           classpathref="classpath"
+           destdir="${build.dir}"
+           deprecation="false"
+           failonerror="true"
+           debug="true"
+           source="1.5"
+           target="1.5"
+           nowarn="true"
+           excludes="${javac.excludes}"
+           listfiles="true"/>
+    
+    <echo>generating ${jar.file}</echo>
+    <available file="${rsrc.dir}" type="dir" property="rsrc.dir.exists"/>
+    <antcall target="generate-jar-with-manifest"/>
+    <antcall target="generate-jar"/>
+    
+    <echo>copying ${jar.file} to ${module-libdir}</echo>
+    <copy file="${target.dir}/${jar.file}" todir="${module-libdir}"/>
+    
+    <available file="${config.dir}" type="dir" property="config.dir.exists"/>
+    <antcall target="copy-to-etc"/>
+  </target>
+  
+  <target name="generate-jar" unless="jar.main.class">
+    <antcall target="jar-with-resources"/>
+    <antcall target="jar"/>
+  </target>
+  
+  <target name="generate-jar-with-manifest" if="jar.main.class">
+    <antcall target="jar-with-manifest-and-resources"/>
+    <antcall target="jar-with-manifest"/>
+  </target>
+  
+  <target name="jar" unless="rsrc.dir.exists">
+    <jar destfile="${target.dir}/${jar.file}">
+      <fileset dir="${build.dir}">
+        <include name="**/*"/>
+      </fileset>
+    </jar>
+  </target>
+  
+  <target name="jar-with-resources" if="rsrc.dir.exists">
+    <jar destfile="${target.dir}/${jar.file}">
+      <fileset dir="${build.dir}">
+        <include name="**/*"/>
+      </fileset>
+      <fileset dir="${rsrc.dir}">
+        <include name="**/*"/>
+      </fileset>
+    </jar>
+  </target>
+
+  <target name="jar-with-manifest" unless="rsrc.dir.exists">
+    <jar destfile="${target.dir}/${jar.file}">
+      <fileset dir="${build.dir}">
+        <include name="**/*"/>
+      </fileset>
+      <manifest>    
+        <attribute name="Main-Class" value="${jar.main.class}"/>
+      </manifest>
+    </jar>
+  </target>
+  
+  <target name="jar-with-manifest-and-resources" if="rsrc.dir.exists">
+    <jar destfile="${target.dir}/${jar.file}">
+      <fileset dir="${build.dir}">
+        <include name="**/*"/>
+      </fileset>
+      <fileset dir="${rsrc.dir}">
+        <include name="**/*"/>
+      </fileset>
+      <manifest>    
+        <attribute name="Main-Class" value="${jar.main.class}"/>
+      </manifest>
+    </jar>
+  </target>
+  
+  <target name="copy-to-etc" if="config.dir.exists">
+    <echo>copying ${config.dir} to ${etc.dir} from ${module-name}</echo>
+    <copy todir="${etc.dir}">
+      <fileset dir="${config.dir}" excludes="**/*.svn"/>
+    </copy>
+  </target>
+</project>
+

Added: trunk/jetty/debian/orig-tar.sh
===================================================================
--- trunk/jetty/debian/orig-tar.sh	                        (rev 0)
+++ trunk/jetty/debian/orig-tar.sh	2009-06-18 19:27:24 UTC (rev 8520)
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+
+TAR=../jetty_$2.orig.tar.gz
+DIR=jetty-$2
+TAG=$(echo jetty-$2 | sed 's,~alpha,-alpha-,')
+
+svn export http://svn.codehaus.org/jetty/jetty/tags/$TAG/ $DIR
+tar -c -z -f $TAR $DIR
+rm -rf $DIR ../$TAG
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+  . .svn/deb-layout
+  mv $TAR $origDir
+  echo "moved $TAR to $origDir"
+fi
+


Property changes on: trunk/jetty/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/jetty/debian/patches/bootstrap.patch
===================================================================
--- trunk/jetty/debian/patches/bootstrap.patch	                        (rev 0)
+++ trunk/jetty/debian/patches/bootstrap.patch	2009-06-18 19:27:24 UTC (rev 8520)
@@ -0,0 +1,87 @@
+--- /dev/null
++++ b/modules/start/src/main/java/org/mortbay/start/Bootstrap.java
+@@ -0,0 +1,26 @@
++
++package org.mortbay.start;
++
++import org.apache.commons.daemon.*;
++
++public class Bootstrap implements Daemon {
++
++  private Main main = new Main();
++
++  public void init(DaemonContext context) {
++    main.init(context.getArguments());
++  }
++
++  public void start() {
++    main.start();
++  }
++
++  public void stop() {
++    System.exit(0);
++  }
++
++  public void destroy() {
++    System.exit(0);
++  }
++}
++
+--- a/modules/start/src/main/java/org/mortbay/start/Main.java
++++ b/modules/start/src/main/java/org/mortbay/start/Main.java
+@@ -436,6 +436,12 @@
+     /* ------------------------------------------------------------ */
+     public void start(String[] args)
+     {
++        init(args);
++        start();
++    }
++
++    public void init(String[] args)
++    {
+         ArrayList al=new ArrayList();
+         for (int i=0; i<args.length; i++)
+         {
+@@ -449,8 +455,6 @@
+         InputStream cpcfg=null;
+         try
+         {
+-            Monitor.monitor();
+-
+             cpcfg=getClass().getClassLoader().getResourceAsStream(_config);
+             if (_debug)
+                 System.err.println("config="+_config);
+@@ -489,6 +493,18 @@
+             System.err.println("classloader="+cl);
+             System.err.println("classloader.parent="+cl.getParent());
+         }
++
++        for (int i=0; i<args.length; i++)
++        {
++            if (args[i]==null)
++                continue;
++            _xml.add(args[i]);
++        }
++     }
++
++     public void start()
++     {
++        ClassLoader cl=_classpath.getClassLoader();
+         // Invoke main(args) using new classloader.
+         Thread.currentThread().setContextClassLoader(cl);
+         // re-eval the policy now that env is set
+@@ -504,13 +520,7 @@
+         }
+         try
+         {
+-            for (int i=0; i<args.length; i++)
+-            {
+-                if (args[i]==null)
+-                    continue;
+-                _xml.add(args[i]);
+-            }
+-            args=(String[])_xml.toArray(args);
++            String[] args=(String[])_xml.toArray(new String[_xml.size()]);
+             //check for override of start class
+             String mainClass=System.getProperty("jetty.server");
+             if (mainClass!=null)

Deleted: trunk/jetty/debian/patches/build-javadoc-src-encoding.patch
===================================================================
--- trunk/jetty/debian/patches/build-javadoc-src-encoding.patch	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/patches/build-javadoc-src-encoding.patch	2009-06-18 19:27:24 UTC (rev 8520)
@@ -1,10 +0,0 @@
---- build.xml.orig	2005-04-07 12:53:50.000000000 +0200
-+++ build.xml	2005-06-30 16:33:27.089524800 +0200
-@@ -372,6 +373,7 @@
-              public="true"
-              windowtitle="${ant.project.name} ${RELEASE.MAJOR.MINOR} API"
-              doctitle="${ant.project.name} ${RELEASE.MAJOR.MINOR}"
-+	     encoding="${javac.encoding}"
-              bottom="Copyright &amp;copy; 2004 Mortbay Consulting Pty. Ltd. All Rights Reserved.">
-        <classpath>
-          <path refid="classpath"/> 

Deleted: trunk/jetty/debian/patches/build-test-no-depend-on-javadoc.patch
===================================================================
--- trunk/jetty/debian/patches/build-test-no-depend-on-javadoc.patch	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/patches/build-test-no-depend-on-javadoc.patch	2009-06-18 19:27:24 UTC (rev 8520)
@@ -1,11 +0,0 @@
---- build.xml.orig	2005-08-06 17:27:29.204125585 +0200
-+++ build.xml	2005-08-06 17:27:35.845809517 +0200
-@@ -402,7 +402,7 @@
-   <!-- ==================================================================== -->
-   <target name="tests" depends="test"/>
-   <target name="test" 
--          depends="webapps,javadoc"
-+          depends="webapps"
-           description="Build and run the test harnesses">
-     <ant  dir="." antfile="${test}/build.xml" inheritAll="false" target="test"/>
-   </target>

Deleted: trunk/jetty/debian/patches/disable-jetty-plus.patch
===================================================================
--- trunk/jetty/debian/patches/disable-jetty-plus.patch	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/patches/disable-jetty-plus.patch	2009-06-18 19:27:24 UTC (rev 8520)
@@ -1,34 +0,0 @@
---- extra/plus/build.xml
-+++ extra/plus/build.xml
-@@ -132,6 +132,7 @@
-         <include name="**/*.properties" />
-       </fileset>
-     </copy>
-+    <!--
-     <javac srcdir="${src}"
-            destdir="${classes}"
-            debug="true"
-@@ -142,6 +143,7 @@
-        </classpath>
-        <include name="**/*.java"/>
-     </javac>
-+    -->
-   </target>
- 
- 
-@@ -197,6 +199,7 @@
- 	  if="jaas.demo.available" 
- 	  description="JAAS demo webapp">
-     <mkdir dir="${jaas.webapp.classes}"/>
-+    <!--
-     <javac srcdir="${demo.src}"
-            destdir="${jaas.webapp.classes}"
-            debug="${javac.debug}"
-@@ -208,6 +211,7 @@
-       </classpath>
-       <include name="**/jaas/**.java" />
-     </javac>
-+    -->
-   </target>
- 
- 

Deleted: trunk/jetty/debian/patches/extras-skip-j2ee.patch
===================================================================
--- trunk/jetty/debian/patches/extras-skip-j2ee.patch	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/patches/extras-skip-j2ee.patch	2009-06-18 19:27:24 UTC (rev 8520)
@@ -1,11 +0,0 @@
---- ../jetty-5.1.4.orig/extra/build.xml	2005-01-16 04:39:30.000000000 +0100
-+++ ./extra/build.xml	2005-06-30 14:52:33.787766544 +0200
-@@ -31,7 +31,7 @@
-   <!-- all                                                                  -->
-   <!-- ==================================================================== -->
-   <target name="all" 
--	  depends="do.plus,do.loadbalancer,do.ftp,do.jdk1.2,do.j2ee,do.jsr77,test"
-+	  depends="do.plus,do.loadbalancer,do.ftp,do.jdk1.2,do.jsr77"
- 	  description="Build all extras">
-   </target>
- 

Deleted: trunk/jetty/debian/patches/jdk-1.2-src-encoding.patch
===================================================================
--- trunk/jetty/debian/patches/jdk-1.2-src-encoding.patch	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/patches/jdk-1.2-src-encoding.patch	2009-06-18 19:27:24 UTC (rev 8520)
@@ -1,12 +0,0 @@
---- extra/jdk1.2/build.xml.orig	2007-10-05 07:31:53.000000000 +0200
-+++ extra/jdk1.2/build.xml	2007-10-05 07:32:17.000000000 +0200
-@@ -127,7 +127,8 @@
-            debug="${javac.debug}"
-            optimize="${javac.optimize}"
-            deprecation="${javac.deprecation}"
--           target="1.2"
-+           source="1.3"
-+           target="1.3"
-            >
-        <classpath>
-          <path refid="extpath"/>

Deleted: trunk/jetty/debian/patches/remove-import-from-sun.patch
===================================================================
--- trunk/jetty/debian/patches/remove-import-from-sun.patch	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/patches/remove-import-from-sun.patch	2009-06-18 19:27:24 UTC (rev 8520)
@@ -1,11 +0,0 @@
---- x	2005-12-13 15:25:19.726692025 +0100
-+++ src/org/mortbay/servlet/PostFileFilter.java	2005-12-13 15:25:07.438317184 +0100
-@@ -30,7 +30,7 @@
- import javax.servlet.http.HttpServletRequest;
- import javax.servlet.http.HttpServletResponse;
- 
--import sun.reflect.ReflectionFactory.GetReflectionFactoryAction;
-+//import sun.reflect.ReflectionFactory.GetReflectionFactoryAction;
- 
- /* ------------------------------------------------------------ */
- /** PostFileFilter.

Added: trunk/jetty/debian/patches/series
===================================================================
--- trunk/jetty/debian/patches/series	                        (rev 0)
+++ trunk/jetty/debian/patches/series	2009-06-18 19:27:24 UTC (rev 8520)
@@ -0,0 +1 @@
+bootstrap.patch

Deleted: trunk/jetty/debian/patches/sunjsse-disable.patch
===================================================================
--- trunk/jetty/debian/patches/sunjsse-disable.patch	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/patches/sunjsse-disable.patch	2009-06-18 19:27:24 UTC (rev 8520)
@@ -1,50 +0,0 @@
---- build.xml.orig	2005-08-27 12:24:26.717664274 +0200
-+++ build.xml	2005-08-27 12:24:11.106455215 +0200
-@@ -87,6 +87,12 @@
-     />
-     <echo message="JMX available=${jmx.available}" level="info"/>
- 
-+    <available property="sunjsse.available"
-+               classname="com.sun.net.ssl.internal.ssl.Provider"
-+               classpathref="extpath"
-+    />
-+    <echo message="Sun JSSE available=${sunjsse.available}" level="info"/>
-+
-   </target>
-   
-   <!-- ==================================================================== -->
-@@ -181,6 +188,7 @@
-          <pathelement path="${classes}"/>
-        </classpath>
-        <include name="**/*.java"/>
--       <exclude name="**/jmx/**" unless="jmx.available"/>
-+       <exclude name="**/jmx/**"/>
-+       <exclude name="**/SunJsseListener.java" unless="sunjsse.available"/>
-     </javac>
- 
-   </target>
---- extra/jdk1.2/build.xml.orig	2005-08-27 12:25:15.641917691 +0200
-+++ extra/jdk1.2/build.xml	2005-08-27 12:26:36.948381880 +0200
-@@ -46,6 +46,12 @@
-                classpathref="extpath"
-     />
-     <echo message="JMX available=${jmx.available}" level="info"/>
-+
-+    <available property="sunjsse.available"
-+               classname="com.sun.net.ssl.internal.ssl.Provider"
-+               classpathref="extpath"
-+    />
-+    <echo message="Sun JSSE available=${sunjsse.available}" level="info"/>
-   </target>
- 
- 
-@@ -135,6 +142,7 @@
-          <pathelement path="${classes}"/>
-        </classpath>
-        <include name="**/*.java"/>
--       <exclude name="**/jmx/**" unless="jmx.available"/>
-+       <exclude name="**/jmx/**"/>
-+       <exclude name="**/SunJsseListener.java" unless="sunjsse.available"/>
-     </javac>
- 
-   </target>

Modified: trunk/jetty/debian/root-webapp/index.html
===================================================================
--- trunk/jetty/debian/root-webapp/index.html	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/root-webapp/index.html	2009-06-18 19:27:24 UTC (rev 8520)
@@ -1,16 +1,13 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>Welcome to Jetty on Debian</title>
-</head
-<body>
-<img border="0" src="images/trans.gif" height="4" width="4"><br>
-<Center><img border="2" src="images/jetty_banner.gif" alt="Jetty
-Java HTTP Servlet Server"></Center>
+<HTML>
+  <HEAD>
+    <TITLE>Welcome to Jetty 6 on Debian</TITLE>
+    <META http-equiv="Pragma" content="no-cache">
+    <META http-equiv="Cache-Control" content="no-cache,no-store">
+  </HEAD>
+<BODY>
+<A HREF="http://jetty.mortbay.org"><IMG SRC="jetty_banner.gif"></A>
+<h1>Welcome to Jetty 6 on Debian</h1>
 
-<p>
-<H2>Jetty:// Web Server &amp; Servlet Container</H2>
-
 <P align="justify">
 <b>Jetty</b> is a 100% Java HTTP Server and Servlet Container.  This means
 that you do not need to configure and run a seperate web server (like Apache)
@@ -22,96 +19,7 @@
 application for demonstration, distribution or deployment. Jetty is available
 on all Java supported platforms. &nbsp;</p>
 
-
-<table cellpadding="0" cellspacing="0" align="center" border="0">
-<tbody><tr>
-
-
-
-<td valign="top" width="48%" align="justify">
 <P align="justify">
-<img src="images/open.gif" alt="Open Source://" width="133" height="14" hspace="8" vspace="5"><BR>
-Jetty is devloped under the guidance of <A href="http://www.mortbay.com">Mort
-Bay Consulting</A> and  released under an <a href="http://www.opensource.org">Open Source</a>
-License, derived from the Artistic License. Full source code is included in
-all releases.<b>
-<a href="LICENSE.html">The
-License</a></b> puts few restrictions on usage of Jetty, which is free for commercial use and distribution.
-The developers of Jetty ask users to inform themselves of the issues,
-political, legal or otherwise that motivate and threaten the development of
-<a href="freesoftware.html">Open
-Source and Free Software</a>.
-The Jetty user and development community is active and welcomes new
-contributors.
-<BR>&nbsp;
-</td>
-
-<td width="4%">&nbsp;</td>
-<td valign="top" align="justify">
-<P align="justify">
-<img src="images/small.gif" alt="Efficient://" width="192" height="13" hspace="8" vspace="5"><BR>
-Jetty has been optimized by commercial and experimental use since 1995 and
-a small and efficient server is the result: <ul><li>A HTTP/1.1 server can be configured in a jar file under 300KB.
-</li><li>Jetty consistently benchmarks as one of the fastest servlet servers.
-</li><li>Jetty servers scale well to thousands of simultaneous connections
-</li><li>Server performance degrades gracefully under stress.</li></ul>
-</td>
-
-
-</tr>
-<tr>
-
-
-<td valign="top" align="justify">
-<P align="justify">
-<img src="images/production.gif" alt="Production Proven://" width="190" height="13" hspace="8" vspace="5"><BR>
-
-Jetty has been widely used in commercial and open source
-projects and applications, ranging across the full spectrum of runtime environments
-from hand helds to main frames. To illustrate this diversity, we have put
-together a (far from exhaustive) <a href="http://www.mortbay.com/mortbay/powered.html">list of Jetty Powered products</a>. Here
-are just a few of highlights:
-<ul>
-<li>Used as the default servlet container in the <a
-href="http://sourceforge.net/projects/jboss//">JBoss</a> and integrated with <a
-href="http://www.objectweb.org/jonas/index.html">JOnAS</a> J2EE application servers.
-</li><li>
-Bundled with the <a href="http://www.jxta.org/">JXTA</a>, <a
-href="http://tapestry.sourceforge.net">Tapestry</a>,
-<a href="http://xml.apache.org/cocoon/">Cocoon</a> and other Open Source projects.
-</li><li>Integrated projects such as 
-<a href="http://jakarta.apache.org/commons/sandbox/jelly/">Jelly executable XML</a>,
-<a href="http://jakarta.apache.org/avalon/phoenix/index.html">Avalon Phoenix
-micro kernel</a>
-and
-<a href="http://maven.apache.org/">Maven project managment</a>
-</li><li>Included in many products including IBM Tivoli, Sonic MQ and
-Cisco SESM.
-</li>
-</ul>
-</td>
-
-<td>&nbsp;</td>
-
-<td valign="top" align="justify">
-<P align="justify">
-<img src="images/embeddable.gif" alt="Embeddable://" width="132" height="13" hspace="8" vspace="5"><BR>
-For many applications, HTTP is just another interface protocol. Jetty can
-easily be embedded in such applications and products without adopting a 
-WWW centric application architecture. Examples of embedded Jetty usage include:<ul><li>Integration into application servers such as  <a href="http://sourceforge.net/projects/jboss//">JBoss</a> and <a href="http://www.objectweb.org/jonas/">Jonas</a>.
-</li><li>Bundled with the <a href="http://www.jxta.org/">JXTA</a> project as the
-basis for its HTTP transport.
-</li><li>Included in many products products including IBM tivolli, Sonic MQ and
-Cisco SESM.
-</li><li>Used for the CD demo disk in several books on XML and Servlets.
-</li><li>Run on embedded systems and handheld devices.
-</li></ul>
-</td>
-
-
-</tr>
-</tbody>
-</table>
-
-</body>
-</html>
+You can also visit Jetty's <a href="javadoc/">Javadoc</a>
+</BODY>
+</HTML>

Modified: trunk/jetty/debian/rules
===================================================================
--- trunk/jetty/debian/rules	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/rules	2009-06-18 19:27:24 UTC (rev 8520)
@@ -1,11 +1,40 @@
 #!/usr/bin/make -f
-# debian/rules for Jetty (uses CDBS)
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-JAVA_HOME		:= /usr/lib/jvm/java-gcj
-ANT_HOME		:= /usr/share/ant
-DEB_JARS		:= mx4j log4j-1.2 log4j junit commons-logging gnumail
-DEB_ANT_INSTALL_TARGET	:= webapps extra javadoc
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME            := /usr/lib/jvm/default-java
+ANT_HOME             := /usr/share/ant
+DEB_JARS             := servlet-api-2.5 slf4j-api mx4j mx4j-tools gnumail activation commons-daemon
+DEB_ANT_BUILD_TARGET := package
+DEB_ANT_BUILDFILE    := ./debian/build.xml
+DEB_ANT_ARGS         := -DVERSION=$(VERSION) -Dbuild.sysclasspath=last
+#API_DOCS             := javadoc/
+
+
+#binary-post-install/$(PACKAGE)::
+#	dh_install -p$(PACKAGE) build/$(PACKAGE)-$(VERSION).jar usr/share/java
+#	dh_link -p$(PACKAGE) usr/share/java/$(PACKAGE)-$(VERSION).jar usr/share/java/$(PACKAGE).jar
+
+extras/setuid/modules/native/target/generated/org_mortbay_setuid_SetUID.c:
+	cd extras/setuid && install -D modules/native/src/main/native/org_mortbay_setuid_SetUID.c modules/native/target/generated/org_mortbay_setuid_SetUID.c
+
+extras/setuid/modules/native/target/generated/org_mortbay_setuid_SetUID.h: extras/setuid/modules/native/target/generated/org_mortbay_setuid_SetUID.c
+	cd extras/setuid && javah -d modules/native/target/generated -classpath ../../lib/ext/jetty-setuid-$(VERSION).jar org.mortbay.setuid.SetUID
+
+lib/ext/libsetuid.so: extras/setuid/modules/native/target/generated/org_mortbay_setuid_SetUID.h
+	cd extras/setuid && gcc -I$(JAVA_HOME)/include/ -I$(JAVA_HOME)/include/linux/  \
+		-shared modules/native/target/generated/org_mortbay_setuid_SetUID.c -fPIC -O \
+		-o ../../lib/ext/libsetuid.so
+
+build/lib$(PACKAGE)-setuid-java:: lib/ext/libsetuid.so
+
+get-orig-source:
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+
+# No documentation released yet.
+#binary-post-install/$(PACKAGE)-doc::
+

Modified: trunk/jetty/debian/start.config
===================================================================
--- trunk/jetty/debian/start.config	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/start.config	2009-06-18 19:27:24 UTC (rev 8520)
@@ -9,8 +9,9 @@
 # where SUBJECT: 
 #   ends with ".class" is the Main class to run.
 #   ends with ".xml" is a configuration file for the command line
-#   ends with "/" is a directory from which add all jar and zip files from. 
-#   ends with "/*" is a directory from which add all unconsidered jar and zip files from.
+#   ends with "/" is a directory from which to add all jar and zip files. 
+#   ends with "/*" is a directory from which to add all unconsidered jar and zip files.
+#   ends with "/**" is a directory from which to recursively add all unconsidered jar and zip files.
 #   Containing = are used to assign system properties.
 #   all other subjects are treated as files to be added to the classpath.
 #
@@ -22,9 +23,10 @@
 # CONDITION is one of:
 #   always
 #   never
-#   available classname
-#   java OPERATOR version
-#   nargs OPERATOR number
+#   available classname        # true if class on classpath
+#   property name              # true of set
+#   java OPERATOR version      # java version compared to literal
+#   nargs OPERATOR number      # number of command line args compared to literal
 #   OPERATOR := one of "<",">","<=",">=","==","!="
 #
 # CONTITIONS can be combined with AND OR or !, with AND being the assume
@@ -34,54 +36,28 @@
 #
 
 $(jetty.class.path)                              always
+$(jetty.lib)/**                                  exists $(jetty.lib)
 
-org.apache.commons.logging.LogFactory=org.mortbay.log.Factory AND ! property org.apache.commons.logging.LogFactory ! property org.apache.commons.logging.Log
 
-# Try different settings of jetty.home until the jetty.jar is found.
-jetty.home=/usr/share/jetty
+jetty.home=/usr/share/jetty                     always 
 
-# Debian jars home
-java.lib.home=/usr/share/java			 always
-tomcat.lib.home=/usr/share/tomcat5.5/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                   
+org.mortbay.xml.XmlConfiguration.class
+$(start.class).class
 
 # The default configuration files
-#/etc/admin.xml                                   nargs == 0
-/etc/jetty/jetty.xml                             nargs == 0
+$(jetty.home)/etc/jetty.xml                      nargs == 0
 
+/usr/share/java/servlet-api-2.5.jar
+/usr/share/java/slf4j-api.jar
+
+# Optional stuff for libjetty-extra-java
+/usr/share/java/gnumail.jar
+/usr/share/java/activation.jar
+/usr/share/java/ant.jar
+ 
 # Set the jetty classpath
-# Always use the >1.2 version because version matching does not work with kaffe
-$(jetty.home)/lib/org.mortbay.jetty.jar          
-#$(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-api-2.4.jar                 
-$(java.lib.home)/jsp-api-2.0.jar                 
+/usr/share/jetty/lib/**
 
-# Always use xercesImpl from debian if it is present
-$(java.lib.home)/xercesImpl.jar                  ! available org.apache.xerces.jaxp.DocumentBuilderImpl.class
-
-# Add the XML support jars if needed.
-$(java.lib.home)/xmlParserAPIs.jar               ! available org.w3c.dom.DOMError
-$(java.lib.home)/xml-apis.jar                    ! available org.w3c.dom.Document
-
-# Set the classpath for the supporting cast
-$(java.lib.home)/commons-logging.jar             ! available org.apache.commons.logging.LogFactory
-$(java.lib.home)/commons-el.jar                  ! available org.apache.commons.el.ExpressionEvaluatorImpl
-$(java.lib.home)/jmxri.jar                       ! available javax.management.MBeanServer
-$(tomcat.lib.home)/jasper-runtime.jar            ! available org.apache.jasper.Constants
-$(tomcat.lib.home)/jasper-compiler.jar           ! available org.apache.jasper.JspCompilationContext
-$(tomcat.lib.home)/jasper-compiler-jdt.jar       ! available org.eclipse.jdt.core.JDTCompilerAdapter
-$(java.lib.home)/ant-1.6.jar                     ! available org.apache.tools.ant.BuildException
-$(java.home)/lib/tools.jar                       ! available com.sun.tools.javac.Main
-$(java.home)/../lib/tools.jar                    ! available com.sun.tools.javac.Main
-
-# Add anything in ext we have not yet considered.
-$(jetty.home)/ext/*                  
+# Add a resources directory if it is there
+$(jetty.home)/resources/

Modified: trunk/jetty/debian/watch
===================================================================
--- trunk/jetty/debian/watch	2009-06-18 19:03:59 UTC (rev 8519)
+++ trunk/jetty/debian/watch	2009-06-18 19:27:24 UTC (rev 8520)
@@ -1,2 +1,3 @@
 version=3
-ftp://ftp.mortbay.org/pub/jetty-5/jetty-(.*)\.tgz debian uupdate
+http://svn.codehaus.org/jetty/jetty/tags/ \
+  jetty-([0-9].*)/ debian debian/orig-tar.sh




More information about the pkg-java-commits mailing list