[pkg-java] r8479 - in trunk/jetty6: . debian

Ludovic Claude ludovicc-guest at alioth.debian.org
Fri Jun 12 19:59:17 UTC 2009


Author: ludovicc-guest
Date: 2009-06-12 19:59:17 +0000 (Fri, 12 Jun 2009)
New Revision: 8479

Added:
   trunk/jetty6/.classpath
   trunk/jetty6/.project
   trunk/jetty6/debian/
   trunk/jetty6/debian/README.Debian
   trunk/jetty6/debian/README.Debian-source
   trunk/jetty6/debian/TODO
   trunk/jetty6/debian/build.xml
   trunk/jetty6/debian/changelog
   trunk/jetty6/debian/compat
   trunk/jetty6/debian/control
   trunk/jetty6/debian/copyright
   trunk/jetty6/debian/jetty-extra.conf
   trunk/jetty6/debian/jetty.conf
   trunk/jetty6/debian/jetty6.default
   trunk/jetty6/debian/jetty6.dirs
   trunk/jetty6/debian/jetty6.install
   trunk/jetty6/debian/jetty6.links
   trunk/jetty6/debian/jetty6.postinst
   trunk/jetty6/debian/jetty6.postrm
   trunk/jetty6/debian/libjetty6-extra-java.dirs
   trunk/jetty6/debian/libjetty6-extra-java.install
   trunk/jetty6/debian/libjetty6-extra-java.links
   trunk/jetty6/debian/libjetty6-java.dirs
   trunk/jetty6/debian/libjetty6-java.install
   trunk/jetty6/debian/libjetty6-java.links
   trunk/jetty6/debian/module.xml
   trunk/jetty6/debian/orig-tar.sh
   trunk/jetty6/debian/rules
   trunk/jetty6/debian/start.config
   trunk/jetty6/debian/watch
Log:
[svn-inject] Applying Debian modifications to trunk

Added: trunk/jetty6/.classpath
===================================================================
--- trunk/jetty6/.classpath	                        (rev 0)
+++ trunk/jetty6/.classpath	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="webapps/template/src"/>
+	<classpathentry kind="src" path="extra/j2ee/gensrc"/>
+	<classpathentry kind="src" path="extra/j2ee/src"/>
+	<classpathentry kind="src" path="test/src"/>
+	<classpathentry kind="src" path="demo/src"/>
+	<classpathentry kind="src" path="extra/ftp/src"/>
+	<classpathentry kind="src" path="extra/ftp/test/src"/>
+	<classpathentry kind="src" path="extra/plus/src"/>
+	<classpathentry kind="src" path="extra/loadbalancer/src"/>
+	<classpathentry kind="src" path="extra/plus/demo/src"/>
+	<classpathentry kind="lib" path="ext/commons-el.jar"/>
+	<classpathentry kind="lib" path="ext/xercesImpl.jar"/>
+	<classpathentry kind="lib" path="extra/ext/jts1_0.jar"/>
+	<classpathentry kind="lib" path="extra/ext/jotm.jar"/>
+	<classpathentry kind="lib" path="ext/xml-apis.jar"/>
+	<classpathentry kind="lib" path="extra/ext/jta-spec1_0_1.jar"/>
+	<classpathentry kind="lib" path="extra/ext/hsqldb.jar"/>
+	<classpathentry kind="lib" path="extra/ext/commons-cli.jar"/>
+	<classpathentry kind="lib" path="extra/ext/jonas_timer.jar"/>
+	<classpathentry kind="lib" path="extra/ext/carol.jar"/>
+	<classpathentry kind="lib" path="extra/ext/jotm_jrmp_stubs.jar"/>
+	<classpathentry kind="lib" path="extra/ext/activation.jar"/>
+	<classpathentry sourcepath="ext/jasper-src.jar" kind="lib" path="ext/jasper-runtime.jar"/>
+	<classpathentry kind="lib" path="ext/mx4j-jmx.jar"/>
+	<classpathentry kind="lib" path="extra/ext/objectweb-datasource.jar"/>
+	<classpathentry kind="lib" path="ext/commons-logging.jar"/>
+	<classpathentry kind="lib" path="extra/ext/xapool.jar"/>
+	<classpathentry kind="lib" path="ext/ant.jar"/>
+	<classpathentry sourcepath="ext/jasper-src.jar" kind="lib" path="ext/jasper-compiler.jar"/>
+	<classpathentry kind="lib" path="extra/ext/jotm_iiop_stubs.jar"/>
+	<classpathentry kind="lib" path="extra/ext/mail.jar"/>
+	<classpathentry kind="lib" path="ext/mx4j-tools.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="/usr/share/java/junit.jar"/>
+	<classpathentry kind="lib" path="extra/ext/log4j.jar"/>
+	<classpathentry kind="var" path="JBOSS/lib/jboss-common.jar"/>
+	<classpathentry kind="var" path="JBOSS/lib/jboss-jmx.jar"/>
+	<classpathentry kind="var" path="JBOSS/lib/jboss-system.jar"/>
+	<classpathentry kind="var" path="JBOSS/server/all/lib/jboss.jar"/>
+	<classpathentry kind="var" path="JBOSS/server/all/lib/jboss-common-jdbc-wrapper.jar"/>
+	<classpathentry kind="var" path="JBOSS/server/all/lib/jbossha.jar"/>
+	<classpathentry kind="var" path="JBOSS/server/all/lib/jboss-iiop.jar"/>
+	<classpathentry kind="var" path="JBOSS/server/all/lib/jboss-j2ee.jar"/>
+	<classpathentry kind="var" path="JBOSS/server/all/lib/jboss-jaas.jar"/>
+	<classpathentry kind="var" path="JBOSS/server/all/lib/jboss-jsr77.jar"/>
+	<classpathentry kind="var" path="JBOSS/server/all/lib/jboss-management.jar"/>
+	<classpathentry kind="var" path="JBOSS/server/all/lib/jbossmq.jar"/>
+	<classpathentry kind="var" path="JBOSS/server/all/lib/jbosssx.jar"/>
+	<classpathentry kind="var" path="JBOSS/server/all/lib/jboss-transaction.jar"/>
+	<classpathentry kind="var" path="JBOSS/server/all/lib/jgroups.jar"/>
+	<classpathentry kind="var" path="JBOSS"/>
+	<classpathentry kind="output" path="classes"/>
+</classpath>

Added: trunk/jetty6/.project
===================================================================
--- trunk/jetty6/.project	                        (rev 0)
+++ trunk/jetty6/.project	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Jetty_5</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>jboss-ha</name>
+			<type>2</type>
+			<location>JBOSS_HOME/server/all/deploy/jbossha-httpsession.sar</location>
+		</link>
+	</linkedResources>
+</projectDescription>


Property changes on: trunk/jetty6/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Added: trunk/jetty6/debian/README.Debian
===================================================================
--- trunk/jetty6/debian/README.Debian	                        (rev 0)
+++ trunk/jetty6/debian/README.Debian	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,43 @@
+jetty6 for Debian
+----------------
+
+This debian package installs Jetty 6 into /usr/share/jetty6
+and other directories under /var and /etc, which are linked to
+from the /usr/share/jetty6 directory.
+
+The configuration of the server is in /etc/jetty6. The configuration
+files listed in /etc/jetty6/jetty.conf are passed to the command
+line of Jetty when it is started by /etc/init.d/jetty6
+
+Webapps can be deployed by placing them in /var/lib/jetty6/webapps
+(linked from /usr/share/jetty6/webapps)
+Additional contexts can be configured and (hot) deployed via the 
+/etc/jetty6/contexts directory (linked from /usr/share/jetty6/contexts).
+
+Installing:
+
+$ sudo apt-get install libjetty6-java
+$ sudo apt-get install libjetty6-extra-java
+$ sudo apt-get install jetty6
+
+Starting:
+
+Edit /etc/default/jetty6
+Set:
+NO_START=0
+
+Then do:
+$ sudo service jetty6 start
+
+Stopping:
+
+$ sudo service jetty6 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/jetty6/debian/README.Debian-source
===================================================================
--- trunk/jetty6/debian/README.Debian-source	                        (rev 0)
+++ trunk/jetty6/debian/README.Debian-source	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,58 @@
+jetty6 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 libjetty6-java_6.1.18-1_all.deb
+$ sudo dpkg -i libjetty6-extra-java_6.1.18-1_all.deb
+$ sudo dpkg -i jetty6_6.1.18-1_all.deb
+
+-------------------------------------------------------------------
+
+GENERATED DEB SOURCES:
+ jetty6-6.1.18.orig.tar.gz
+ jetty6_6.1.18-1.dsc
+ jetty6_6.1.18-1.diff.gz
+
+
+GENERATED DEB BINARIES:
+ libjetty6-java
+  - Jetty 6 core modules
+  - includes:
+     jetty-util, jetty-util5, jetty, jetty-sslengine, jetty-start
+ 
+ libjetty6-extra-java
+  - Jetty 6 extra modules (depends: libjetty6-java)
+  - includes:
+     jetty-management, jetty-naming, jetty-servlet-tester, jetty-ajp, jetty-java5-threadpool, jetty-client, jetty-rewrite-handler
+ 
+ jetty6
+  - The standalone http server (depends: libjetty6-java)
+  - includes:
+     scripts, config files, docs

Added: trunk/jetty6/debian/TODO
===================================================================
--- trunk/jetty6/debian/TODO	                        (rev 0)
+++ trunk/jetty6/debian/TODO	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,8 @@
+update debian/changelog (jetty-version) before building for a new release.
+
+Modules to add:
+jetty-jsp-2.1
+ - glassfish jsp source + jetty-jsp source needs to be compiled/built to generate a separate deb package
+
+jetty-plus
+ - geronimo-jta must be available as a deb package (build & runtime dependency)

Added: trunk/jetty6/debian/build.xml
===================================================================
--- trunk/jetty6/debian/build.xml	                        (rev 0)
+++ trunk/jetty6/debian/build.xml	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,117 @@
+<project name="jetty6 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"/>
+
+  <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="../../debian/module.xml" 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="../../debian/module.xml" 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="../../debian/module.xml" 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="../../debian/module.xml" 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="../../debian/module.xml" 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/management/" antfile="../../debian/module.xml" 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="../../debian/module.xml" 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="../../debian/module.xml" 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="../../debian/module.xml" 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/threadpool/" antfile="../../debian/module.xml" 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="../../debian/module.xml" 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="../../debian/module.xml" 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>
+

Added: trunk/jetty6/debian/changelog
===================================================================
--- trunk/jetty6/debian/changelog	                        (rev 0)
+++ trunk/jetty6/debian/changelog	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,328 @@
+jetty6 (6.1.18-0ubuntu1~ppa3) jaunty; urgency=low
+
+  [Ludovic Claude]
+  * 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)
+  * Remmove empty prerm and preinst scripts
+  * Update copyright and remove full text of Apache license
+
+  [David Yu]
+  * New upstream release for jetty6 
+    (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.
+    - Removed debian/patches/cve-2007-6969.patch. Applied upstream.
+  * Added recognition of installed libcommons-el-java to debian/start.config.
+    Closes: #352093.
+  * Fixed short and long service description in debian/jetty.init.
+    Closes: #446788.
+  * Removed libapache2-mod-webapp from Suggests.
+  * Added watch file.
+
+ -- Michael Koch <konqueror at gmx.de>  Wed, 24 Oct 2007 14:14:45 +0200
+
+jetty (5.1.10-4) unstable; urgency=low
+
+  * Added patch to fix CVE-2006-6969. Thanks to Greg Wilkins for the patch.
+    Closes: #445283.
+  * Updated debian/patches/jdk-1.2-src-encoding.patch to make it work with
+    current ecj.
+
+ -- Michael Koch <konqueror at gmx.de>  Fri, 05 Oct 2007 07:34:55 +0200
+
+jetty (5.1.10-3) unstable; urgency=low
+
+  * Fix debian/jetty.init to permit removal without purge and offer a new
+    NO_START option in /etc/default/jetty. Closes: #356067.
+    Thanks to Loic Minier for the patch.
+  * Added additional paths to JDK_DIRS in debian/jetty.init.
+    Closes: #405851.
+  * (Build-)Depends on java-gcj-compat.
+  * Moved debhelper from Build-Depends-Indep to Build-Depends.
+  * Removed Build-Depends on libtomcat5-java and replace Depends on
+    libtomcat5-java by libtomcat5.5-java.
+  * Added LSB section in debian/jetty.init.
+  * Removed extra license file from /usr/share/doc/jetty.
+  * Added myself to Uploaders.
+
+ -- Michael Koch <konqueror at gmx.de>  Tue, 24 Jul 2007 20:40:27 +0200
+
+jetty (5.1.10-2) unstable; urgency=low
+
+  * Fix in init script for new version of su (closes #367491).
+  * Create logfile if not existing. Aknolwedge NMU (closes #356066).
+
+ -- Philipp Meier <meier at fnogol.de>  Tue, 30 May 2006 10:46:21 +0200
+
+jetty (5.1.10-1) unstable; urgency=low
+
+  * New upstream release
+  * Sercurity fixes for windows
+  * Fixed path aliasing with // on windows.
+  * Fix for AJP13 with multiple headers
+  * Fix for AJP13 with encoded path
+  * Remove null dispatch attributes from getAttributeNames
+  * Put POST content default back to iso_8859_1. GET is UTF-8
+    still
+
+ -- Philipp Meier <meier at fnogol.de>  Tue, 30 May 2006 10:40:18 +0200
+
+jetty (5.1.8-3) unstable; urgency=low
+
+  * Enhance dependencies. 
+
+ -- Philipp Meier <meier at fnogol.de>  Fri, 16 Dec 2005 10:53:48 +0100
+
+jetty (5.1.8-2) unstable; urgency=low
+
+  * Add dependeny on apache2-util for log rotation. Closes: #343177.
+
+ -- Philipp Meier <meier at fnogol.de>  Tue, 13 Dec 2005 14:28:09 +0100
+
+jetty (5.1.8-1) unstable; urgency=low
+
+  * New upstream release
+
+  From 5.1.8:
+
+  * Fixed space in URL issued created in 5.1.6
+
+  From 5.1.7:
+
+  * improved server stats
+  * char encoding for MultiPartRequest
+  * fixed merging of POST params in dispatch query string.
+  * protect from NPE in dispatcher getValues
+  * Updated to 2.6.2 xerces
+  * JSP file servlet mappings copy JspServlet init params.
+  * Prefix servlet context logs with org.mortbay.jetty.context
+  * better support for URI character encodings
+  * use commons logging jar instead of api jar.
+
+ -- Philipp Meier <meier at fnogol.de>  Wed,  7 Dec 2005 11:06:10 +0100
+
+jetty (5.1.6-1) unstable; urgency=high
+
+  * New upstream release
+  * Fixed JSP visibility security issue in upstream.
+  * Fix location of jasper since upgrade to tomcat5. Closes: #333010.
+
+ -- Philipp Meier <meier at fnogol.de>  Wed, 30 Nov 2005 15:20:47 +0100
+
+jetty (5.1.5rc1-5) unstable; urgency=low
+
+  Patch from Oyvind Harboe <oyvind.harboe at zylin.com>:
+
+  * increased default amount of memory available to 256Mbyte.
+    the advantage of having more heap available is that more
+    applications will be able to run without modification to
+    the standard Jetty configuration.
+  * added -Djava.library.path=/usr/lib to VM arguments. This is
+    requried to make e.g. the librxtx-java package work.
+  * Closes: #32960.
+
+ -- Philipp Meier <meier at fnogol.de>  Thu, 22 Sep 2005 16:13:16 +0200
+
+jetty (5.1.5rc1-4) unstable; urgency=low
+
+  Patch from Oyvind Harboe <oyvind.harboe at zylin.com>:
+
+  * Fixed rc script /etc/init.d/jetty. "stop" could leave dangling
+    /var/run/jetty.pid. Fixed this by adding "--oknodo" to 
+    "start-stop-daemon --stop" command. 
+  * Removed trailing "/" from LOGDIR which caused
+    /var/log/out.log not to be created.
+  * /etc/init.d/jetty start will now deal more gracefully with a 
+    dangling /var/run/jetty.pid. A dangling jetty.pid is detected
+    and ignored.
+  * Closes: #326176.
+
+ -- Philipp Meier <meier at fnogol.de>  Fri,  2 Sep 2005 13:40:59 +0200
+
+jetty (5.1.5rc1-3) unstable; urgency=low
+
+  * Removed -v from ant opts during build.
+  * Remove pid file on stop. Closes: #325667
+  * Fix location of ant-1.6.jar in start.config. Closes: #324472.
+
+ -- Philipp Meier <meier at fnogol.de>  Tue, 30 Aug 2005 13:37:15 +0200
+
+jetty (5.1.5rc1-2) unstable; urgency=low
+
+  * Builds with kaffe.
+  * Adds patch to exclude Sun JSSE if not available.
+
+ -- Philipp Meier <meier at fnogol.de>  Sat, 27 Aug 2005 14:21:12 +0200
+
+jetty (5.1.5rc1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Philipp Meier <meier at fnogol.de>  Fri, 26 Aug 2005 12:53:50 +0200
+
+jetty (5.1.4-1) unstable; urgency=low
+
+  * New upstream release
+  * Added myself to Uploaders in control.
+  * Standards-Version bumbed to 3.6.2
+  * Removed debian/watch which will not work with sourceforge
+  * Manage changes to upstream with cdbs simple-patchsys
+  * Fixed rc script /etc/init.d/jetty
+  * Adjusted new location of servlet.jar. Closes: #280139.
+
+ -- Philipp Meier <meier at fnogol.de>  Fri, 12 Aug 2005 18:14:28 +0200
+
+jetty (5.0.0-3) unstable; urgency=low
+
+  * Package is now maintained by pkg-java. Maintainer was updated.
+  * Disable validation of xml files in start.config by default.
+    Closes: #298731.
+  * Add /usr/lib/j2sdk1.5-sun to JAVA_HOME_DIRS in debian/rules
+
+ -- Philipp Meier <meier at fnogol.de>  Thu, 30 Jun 2005 14:32:31 +0200
+
+jetty (5.0.0-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Transition to liblog4j1.2-java.  Closes: #306761.
+
+ -- Matej Vela <vela at debian.org>  Mon,  2 May 2005 12:12:12 +0200
+
+jetty (5.0.0-2) unstable; urgency=low
+
+  * Shipping working default configuration in /etc/jetty/jetty.xml.
+    Closes: #278134
+
+ -- Philipp Meier <meier at fnogol.de>  Mon, 25 Oct 2004 11:52:25 +0200
+
+jetty (5.0.0-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Philipp Meier <meier at fnogol.de>  Thu, 16 Sep 2004 00:40:41 +0200
+
+jetty (4.2.22-2) unstable; urgency=low
+
+  * New upstream release
+  * Changed mantainer email
+
+ -- Philipp Meier <meier at fnogol.de>  Wed, 25 Aug 2004 18:14:56 +0200
+
+jetty (4.2.21-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Philipp Meier <meier at meisterbohne.de>  Mon, 23 Aug 2004 15:23:25 +0200
+
+jetty (4.2.19-1) unstable; urgency=high
+
+  * New upstream release.
+  * Fixed DOS attack problem
+
+ -- Philipp Meier <meier at meisterbohne.de>  Fri, 19 Mar 2004 17:55:45 +0100
+
+jetty (4.2.18-1) unstable; urgency=low
+
+  * New upstream release.
+  * Package description of jetty-extra lists the 
+    extensions provided. Closes: #232824
+
+ -- Philipp Meier <meier at meisterbohne.de>  Mon,  1 Mar 2004 13:54:01 +0100
+
+jetty (4.2.15-1) unstable; urgency=low
+
+  * Adds missing javadoc to /usr/share/doc/
+  * Removes invalid libxdoclet-java from Build-Depends.
+  * Fixed clean target in upstreams extra build file. Building
+    jetty twice from the debianized source should work now.
+
+ -- Philipp Meier <meier at meisterbohne.de>  Thu, 15 Jan 2004 14:00:13 +0100
+
+jetty (4.2.15) unstable; urgency=low
+
+  * New upstream release
+  * New additional package jetty-extra.
+  * Updated standards version from 3.5.10 to 3.6.0
+  * Build target directory are no longer in debian because
+    the customization of the build process does not really pay off.
+
+ -- Philipp Meier <meier at meisterbohne.de>  Wed, 14 Jan 2004 14:00:01 +0100
+
+jetty (4.2.12-2) unstable; urgency=low
+
+  * Fixes start.config to make jetty run with kaffe
+  * Updated standards version from 3.5.8 to 3.5.10
+
+ -- Philipp Meier <meier at meisterbohne.de>  Fri, 29 Aug 2003 14:43:40 +0200
+
+jetty (4.2.12-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Philipp Meier <meier at meisterbohne.de>  Tue, 12 Aug 2003 14:07:56 +0200
+
+jetty (4.2.11-7) unstable; urgency=low
+
+  * Adds alternative dependency on j2sdk1.4
+  * Fixes typos in debian/TODO
+  * Adds ant to classpath because jasper needs it. 
+
+ -- Philipp Meier <meier at meisterbohne.de>  Thu,  7 Aug 2003 20:34:19 +0200
+
+jetty (4.2.11-6) unstable; urgency=low
+
+  * Removes DH_VERBOSE from debian/rules
+  * /etc/jetty will be removed on purge
+  * Add build-dependency on j2sdk1.4
+
+ -- Philipp Meier <meier at meisterbohne.de>  Wed, 23 Jul 2003 15:38:05 +0200
+
+jetty (4.2.11-5) unstable; urgency=low
+
+  * Fix for /etc/default/jetty which was misplaced
+  * Fixes messed-up corrections for javadoc tags. Introduced before.
+
+ -- Philipp Meier <meier at meisterbohne.de>  Wed, 23 Jul 2003 01:11:42 +0200
+
+jetty (4.2.11-4) unstable; urgency=low
+
+  * Jetty depends on j2re1.4 until build process of jetty 
+    with java < 1.4 works.
+  * Fixes in build process 
+
+ -- Philipp Meier <meier at meisterbohne.de>  Thu, 17 Jul 2003 12:56:14 +0200
+
+jetty (4.2.11-3) unstable; urgency=low
+
+  * Creates /usr/share/java/webapps if necessary
+  * Not longer uses symlinks in ext but a debianized start.config
+  * Changed to multiline logging.
+  * Removed demo webapps and provides a preliminary debian jetty root
+  * Fixes /etc/defaults/jetty to be /etc/default/jetty
+
+ -- Philipp Meier <meier at meisterbohne.de>  Thu, 17 Jul 2003 12:56:03 +0200
+
+jetty (4.2.11-2) unstable; urgency=low
+
+  * Adds build dependencies on libmx4j-java and iblog4j-java
+  * Removes comment about "Tomcat 4" from /etc/jetty.init 
+  * Renamed debian/{pre,post}{inst,rm} to debian/jetty.*
+  * Enables javac.debug to provide useful stackstraces
+
+ -- Philipp Meier <meier at meisterbohne.de>  Tue, 15 Jul 2003 21:50:36 +0200
+
+jetty (4.2.11-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Philipp Meier <meier at meisterbohne.de>  Mon, 14 Jul 2003 13:21:36 +0200
+

Added: trunk/jetty6/debian/compat
===================================================================
--- trunk/jetty6/debian/compat	                        (rev 0)
+++ trunk/jetty6/debian/compat	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1 @@
+6

Added: trunk/jetty6/debian/control
===================================================================
--- trunk/jetty6/debian/control	                        (rev 0)
+++ trunk/jetty6/debian/control	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,42 @@
+Source: jetty6
+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>, Thierry Carrez <thierry.carrez at ubuntu.com>
+Build-Depends: debhelper (>= 6), cdbs (>> 0.4.5.3)
+Build-Depends-Indep: java-gcj-compat-dev, ant, libservlet2.5-java, libmx4j-java, libgnumail-java, libgnujaf-java,
+ libslf4j-java
+Standards-Version: 3.8.1
+
+Package: libjetty6-java
+Architecture: all
+Depends: ${misc:Depends}, default-jre-headless | java5-runtime-headless, libservlet2.5-java, libslf4j-java
+Suggests: jetty6
+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: libjetty6-extra-java
+Architecture: all
+Depends: ${misc:Depends}, libjetty6-java, libmx4j-java, libgnumail-java, libgnujaf-java
+Suggests: jetty6
+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: jetty6
+Architecture: all
+Depends: ${misc:Depends}, libjetty6-java, adduser
+Suggests: libjetty6-extra-java
+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.

Added: trunk/jetty6/debian/copyright
===================================================================
--- trunk/jetty6/debian/copyright	                        (rev 0)
+++ trunk/jetty6/debian/copyright	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,29 @@
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: Jetty
+Maintainer: Mortbay Consulting
+Source: http://jetty.mortbay.com/
+
+Files: *
+Copyright: 2004-2009, Mortbay Consulting
+License: Apache-2.0
+
+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'.
+
+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
+
+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'.
+

Added: trunk/jetty6/debian/jetty-extra.conf
===================================================================
--- trunk/jetty6/debian/jetty-extra.conf	                        (rev 0)
+++ trunk/jetty6/debian/jetty-extra.conf	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,10 @@
+# list of jetty configuration and property files
+# Replace jetty.conf with this file to use the extra features
+/etc/jetty6/jetty-logging.xml
+/etc/jetty6/jetty-jmx.xml
+/etc/jetty6/jetty.xml
+/etc/jetty6/jetty-jaas.xml
+/etc/jetty6/jetty-plus.xml
+/etc/jetty6/jetty-ajp.xml
+/etc/jetty6/jetty-ssl.xml
+/etc/jetty6/jetty-sslengine.xml

Added: trunk/jetty6/debian/jetty.conf
===================================================================
--- trunk/jetty6/debian/jetty.conf	                        (rev 0)
+++ trunk/jetty6/debian/jetty.conf	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,3 @@
+# list of jetty configuration and property files
+/etc/jetty6/jetty-logging.xml
+/etc/jetty6/jetty.xml

Added: trunk/jetty6/debian/jetty6.default
===================================================================
--- trunk/jetty6/debian/jetty6.default	                        (rev 0)
+++ trunk/jetty6/debian/jetty6.default	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,7 @@
+# Defaults for jetty see /etc/init.d/jetty for more
+
+NO_START=1 # change to 0 to allow Jetty to start
+
+TMP=/var/cache/jetty6
+JAVA_OPTIONS="-Xmx256m -Djava.awt.headless=true $JETTY6_OPTIONS"
+JETTY_USER=jetty

Added: trunk/jetty6/debian/jetty6.dirs
===================================================================
--- trunk/jetty6/debian/jetty6.dirs	                        (rev 0)
+++ trunk/jetty6/debian/jetty6.dirs	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,8 @@
+etc/jetty6
+etc/jetty6/contexts
+usr/share/jetty6
+usr/share/doc/jetty6
+usr/share/doc/jetty6/api
+var/lib/jetty6/webapps
+var/log/jetty6
+var/cache/jetty6

Added: trunk/jetty6/debian/jetty6.install
===================================================================
--- trunk/jetty6/debian/jetty6.install	                        (rev 0)
+++ trunk/jetty6/debian/jetty6.install	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,7 @@
+etc/*                   etc/jetty6
+webapps/README.TXT      var/lib/jetty6/webapps
+contexts/README.TXT     etc/jetty6/contexts
+README.txt              usr/share/doc/jetty6
+VERSION.txt             usr/share/doc/jetty6
+LICENSES                usr/share/doc/jetty6
+javadoc/*               usr/share/doc/jetty6/api

Added: trunk/jetty6/debian/jetty6.links
===================================================================
--- trunk/jetty6/debian/jetty6.links	                        (rev 0)
+++ trunk/jetty6/debian/jetty6.links	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,4 @@
+var/lib/jetty6/webapps  usr/share/jetty6/webapps
+var/log/jetty6          usr/share/jetty6/logs
+etc/jetty6              usr/share/jetty6/etc
+etc/jetty6/contexts     usr/share/jetty6/contexts

Added: trunk/jetty6/debian/jetty6.postinst
===================================================================
--- trunk/jetty6/debian/jetty6.postinst	                        (rev 0)
+++ trunk/jetty6/debian/jetty6.postinst	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,23 @@
+#!/bin/sh -e
+
+case "$1" in
+    configure)
+	if ! id jetty > /dev/null 2>&1 ; then
+	    adduser --system --home /usr/share/jetty6 --no-create-home \
+		--ingroup nogroup --disabled-password --shell /bin/false \
+		jetty
+	fi
+	chown -R jetty:adm /var/cache/jetty6 /var/log/jetty6 /var/lib/jetty6
+	chmod 750 /var/log/jetty6
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+	echo "$0 called with unknown argument \`$1'" >&2
+	exit 1
+    ;;
+esac
+
+#DEBHELPER#

Added: trunk/jetty6/debian/jetty6.postrm
===================================================================
--- trunk/jetty6/debian/jetty6.postrm	                        (rev 0)
+++ trunk/jetty6/debian/jetty6.postrm	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,22 @@
+#!/bin/sh -e
+
+#DEBHELPER#
+
+# Remove cached files
+rm -rf /var/cache/jetty6/*
+
+case "$1" in
+    purge)
+	userdel jetty || true
+        rm -rf /var/log/jetty6
+    ;;
+
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+        # Nothing to do here
+    ;;
+
+    *)
+        echo "$0 called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac

Added: trunk/jetty6/debian/libjetty6-extra-java.dirs
===================================================================
--- trunk/jetty6/debian/libjetty6-extra-java.dirs	                        (rev 0)
+++ trunk/jetty6/debian/libjetty6-extra-java.dirs	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,4 @@
+usr/share/jetty6/lib/ext
+usr/share/jetty6/lib/management
+usr/share/jetty6/lib/naming
+usr/share/jetty6/lib/plus

Added: trunk/jetty6/debian/libjetty6-extra-java.install
===================================================================
--- trunk/jetty6/debian/libjetty6-extra-java.install	                        (rev 0)
+++ trunk/jetty6/debian/libjetty6-extra-java.install	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,8 @@
+lib/management/jetty-management-6*.jar  usr/share/jetty6/lib/management
+lib/naming/jetty-naming-6*.jar          usr/share/jetty6/lib/naming
+#lib/plus/jetty-plus-6*.jar              usr/share/jetty6/lib/plus
+lib/ext/jetty-servlet-tester-6*.jar     usr/share/jetty6/lib/ext
+lib/ext/jetty-ajp-6*.jar                usr/share/jetty6/lib/ext
+lib/ext/jetty-java5-threadpool-6*.jar   usr/share/jetty6/lib/ext
+lib/ext/jetty-client-6*.jar             usr/share/jetty6/lib/ext
+lib/ext/jetty-rewrite-handler-6*.jar    usr/share/jetty6/lib/ext

Added: trunk/jetty6/debian/libjetty6-extra-java.links
===================================================================
--- trunk/jetty6/debian/libjetty6-extra-java.links	                        (rev 0)
+++ trunk/jetty6/debian/libjetty6-extra-java.links	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,8 @@
+usr/share/jetty6/lib/management/jetty-management-$VERSION.jar     usr/share/java/jetty6-management.jar
+usr/share/jetty6/lib/naming/jetty-naming-$VERSION.jar             usr/share/java/jetty6-naming.jar
+usr/share/jetty6/lib/ext/jetty-servlet-tester-$VERSION.jar        usr/share/java/jetty6-servlet-tester.jar
+usr/share/jetty6/lib/ext/jetty-ajp-$VERSION.jar                   usr/share/java/jetty6-ajp.jar
+usr/share/jetty6/lib/ext/jetty-java5-threadpool-$VERSION.jar      usr/share/java/jetty6-java5-threadpool.jar
+usr/share/jetty6/lib/ext/jetty-client-$VERSION.jar                usr/share/java/jetty6-client.jar
+usr/share/jetty6/lib/ext/jetty-rewrite-handler-$VERSION.jar       usr/share/java/jetty6-rewrite-handler.jar
+

Added: trunk/jetty6/debian/libjetty6-java.dirs
===================================================================
--- trunk/jetty6/debian/libjetty6-java.dirs	                        (rev 0)
+++ trunk/jetty6/debian/libjetty6-java.dirs	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,4 @@
+usr/share/jetty6
+usr/share/jetty6/lib
+usr/share/jetty6/lib/util5
+usr/share/jetty6/lib/sslengine

Added: trunk/jetty6/debian/libjetty6-java.install
===================================================================
--- trunk/jetty6/debian/libjetty6-java.install	                        (rev 0)
+++ trunk/jetty6/debian/libjetty6-java.install	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,5 @@
+lib/jetty-util-6*.jar                           usr/share/jetty6/lib
+lib/util5/jetty-util5-6*.jar                    usr/share/jetty6/lib/util5
+lib/jetty-6*.jar                                usr/share/jetty6/lib
+lib/sslengine/jetty-sslengine-6*.jar            usr/share/jetty6/lib/sslengine
+start.jar                                       usr/share/jetty6

Added: trunk/jetty6/debian/libjetty6-java.links
===================================================================
--- trunk/jetty6/debian/libjetty6-java.links	                        (rev 0)
+++ trunk/jetty6/debian/libjetty6-java.links	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,5 @@
+usr/share/jetty6/lib/jetty-util-$VERSION.jar                  usr/share/java/jetty6-util.jar
+usr/share/jetty6/lib/util5/jetty-util5-$VERSION.jar           usr/share/java/jetty6-util5.jar
+usr/share/jetty6/lib/jetty-$VERSION.jar                       usr/share/java/jetty6.jar
+usr/share/jetty6/lib/sslengine/jetty-sslengine-$VERSION.jar   usr/share/java/jetty6-sslengine.jar
+usr/share/jetty6/start.jar                                    usr/share/java/jetty6-start.jar

Added: trunk/jetty6/debian/module.xml
===================================================================
--- trunk/jetty6/debian/module.xml	                        (rev 0)
+++ trunk/jetty6/debian/module.xml	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,112 @@
+<project name="jetty6 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/jetty6/debian/orig-tar.sh
===================================================================
--- trunk/jetty6/debian/orig-tar.sh	                        (rev 0)
+++ trunk/jetty6/debian/orig-tar.sh	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+
+TAR=../jetty6_$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
+

Added: trunk/jetty6/debian/rules
===================================================================
--- trunk/jetty6/debian/rules	                        (rev 0)
+++ trunk/jetty6/debian/rules	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,26 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME            := /usr/lib/jvm/java-gcj
+ANT_HOME             := /usr/share/ant
+DEB_JARS             := servlet-api-2.5 slf4j-api mx4j mx4j-tools gnumail activation
+DEB_ANT_BUILD_TARGET := package
+DEB_ANT_BUILDFILE    := ./debian/build.xml
+DEB_ANT_ARGS         := -DVERSION=$(VERSION) -Dbuild.sysclasspath=last
+#API_DOCS             := javadoc/
+
+get-orig-source:
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+
+#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
+
+# No documentation released yet.
+#binary-post-install/$(PACKAGE)-doc::
+


Property changes on: trunk/jetty6/debian/rules
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/jetty6/debian/start.config
===================================================================
--- trunk/jetty6/debian/start.config	                        (rev 0)
+++ trunk/jetty6/debian/start.config	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,63 @@
+# This file controls what file are to be put on classpath or command line.
+#
+# Format is as follows:
+# Each line contains entry for one JAR file.
+# Format of line:
+#
+#  SUBJECT [ [!] CONDITION [AND|OR] ]*
+# 
+# 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 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.
+#
+# Subjects may include system properties with $(propertyname) syntax. 
+#
+# Files starting with "/" are considered absolute, all others are relative to
+# the home directory.
+#
+# CONDITION is one of:
+#   always
+#   never
+#   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
+# operator for a list of CONDITIONS.
+# Classpath operations are evaluated on the fly, so once a class or jar is
+# added to the classpath, subsequent available conditions will see that class.
+#
+
+$(jetty.class.path)                              always
+$(jetty.lib)/**                                  exists $(jetty.lib)
+
+
+jetty.home=/usr/share/jetty6                     always 
+
+# The main class to run
+org.mortbay.xml.XmlConfiguration.class
+$(start.class).class
+
+# The default configuration files
+$(jetty.home)/etc/jetty.xml                      nargs == 0
+
+/usr/share/java/servlet-api-2.5.jar
+/usr/share/java/slf4j-api.jar
+
+# Optional stuff for libjetty6-extra-java
+/usr/share/java/gnumail.jar
+/usr/share/java/activation.jar
+/usr/share/java/ant.jar
+ 
+# Set the jetty classpath
+/usr/share/jetty6/lib/**
+
+# Add a resources directory if it is there
+$(jetty.home)/resources/

Added: trunk/jetty6/debian/watch
===================================================================
--- trunk/jetty6/debian/watch	                        (rev 0)
+++ trunk/jetty6/debian/watch	2009-06-12 19:59:17 UTC (rev 8479)
@@ -0,0 +1,3 @@
+version=3
+http://svn.codehaus.org/jetty/jetty/tags/ \
+  jetty-([0-9].*)/ debian debian/orig-tar.sh




More information about the pkg-java-commits mailing list