This is an automated email from the git hooks/post-receive script. xhaakon-guest pushed a commit to branch master in repository jetty9.
commit e97ab191cc32c8bf85ea382e8a58b627ee4aaa2a Author: Jakub Adam <[email protected]> Date: Sun Feb 19 21:28:49 2012 +0100 Imported debian directory from Jetty 6 packaging SVN repo --- debian/NEWS | 10 + debian/README.Debian | 43 ++++ debian/README.Debian-source | 60 +++++ debian/README.source | 21 ++ debian/TODO | 12 + debian/build.xml | 160 ++++++++++++ debian/changelog | 524 ++++++++++++++++++++++++++++++++++++++ debian/compat | 1 + debian/control | 83 ++++++ debian/copyright | 75 ++++++ debian/jetty-extra.conf | 11 + debian/jetty-shared-webapps.xml | 42 +++ debian/jetty.conf | 4 + debian/jetty.cron.daily | 21 ++ debian/jetty.default | 48 ++++ debian/jetty.dirs | 7 + debian/jetty.init | 413 ++++++++++++++++++++++++++++++ debian/jetty.install | 12 + debian/jetty.links | 6 + debian/jetty.postinst | 24 ++ debian/jetty.postrm | 46 ++++ debian/libjetty-extra-java.dirs | 6 + debian/libjetty-extra-java.links | 18 ++ debian/libjetty-extra-java.poms | 13 + debian/libjetty-java-doc.doc-base | 9 + debian/libjetty-java-doc.install | 1 + debian/libjetty-java.dirs | 4 + debian/libjetty-java.links | 2 + debian/libjetty-java.poms | 8 + debian/maven.rules | 4 + debian/module.xml | 179 +++++++++++++ debian/orig-tar.sh | 27 ++ debian/patches/series | 1 + debian/root-webapp/index.html | 25 ++ debian/rules | 65 +++++ debian/source/format | 1 + debian/start.config | 62 +++++ debian/watch | 3 + 38 files changed, 2051 insertions(+) diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 0000000..e64cb96 --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,10 @@ +jetty (6.1.21-1) unstable; urgency=medium + + Stopped using /tmp/jetty-temp in /etc/init.d/jetty for security + reasons. From now all temporary data will be stored within + /var/cache/jetty as denoted below: + - JVM_TMP is now /var/cache/jetty/tmp + - JETTY_TMP is now /var/cache/jetty/data + + -- Niels Thykier <[email protected]> Fri, 23 Oct 2009 20:33:24 +0200 + diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..adbd8fc --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,43 @@ +jetty for Debian +---------------- + +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. + +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 <[email protected]> +and Michael Koch <[email protected]>. + +-- +Greg Wilkins <[email protected]> Thu Nov 8 18:10:06 EST 2007 +David Yu <[email protected]> Thu May 21 15:06:30 EST 2009 diff --git a/debian/README.Debian-source b/debian/README.Debian-source new file mode 100644 index 0000000..909d065 --- /dev/null +++ b/debian/README.Debian-source @@ -0,0 +1,60 @@ +jetty for Debian +---------------- + +BUILD DEPENDENCIES: + cdbs + debhelper + devscripts + fakeroot + + JAVA DEBS: + ant + libservlet2.5-java + libmx4j-java + libgnumail-java + libgnujaf-java + libtomcat6-java + geronimo-jta-1.0.1b-spec + +------------------------------------------------------------------- + +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-plus, jetty-annotations + + jetty + - The standalone http server (depends: libjetty-java) + - includes: + scripts, config files, docs diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..e9cb8d1 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,21 @@ +Building the source tarball +--------------------------- + +The source tarball was created from the upstream Subversion repository +[1]. The following files and directories were removed because they are +likely to contain non-free code, code under too many or unclear licenses +or unstable code: + +* modules/jsp-api-2.0 +* extras/win32service +* contrib/cometd +* contrib/rpms +* contrib/debian +* contrib/grizzly +* contrib/maven-beanshell-plugin + +None of those sources are necessary for the core Jetty functionality. + +[1] http://svn.codehaus.org/jetty/ + + -- Marcus Better <[email protected]>, Wed, 13 May 2009 10:49:17 +0200 diff --git a/debian/TODO b/debian/TODO new file mode 100644 index 0000000..1c7bbe5 --- /dev/null +++ b/debian/TODO @@ -0,0 +1,12 @@ +TODO List for jetty in debian + +* evaluate authbind + +Modules to add: + +jetty-terracota + +jetty-xbean + - spring-framework must be available as a deb package (build dependency) + - xbean must include the module xbean-spring + diff --git a/debian/build.xml b/debian/build.xml new file mode 100644 index 0000000..93adcee --- /dev/null +++ b/debian/build.xml @@ -0,0 +1,160 @@ +<project name="jetty build" basedir=".." default="package"> + <property name="src.dir" value="src/main/java"/> + <property name="test.dir" value="src/test/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}/api"/> + <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}"/> + <property name="run-tests" value="true"/> + </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"/> + <property name="run-tests" value="true"/> + </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}"/> + <property name="run-tests" value="true"/> + </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> + + <ant dir="${basedir}/contrib/start-daemon/" antfile="${module.script}" inheritRefs="true"> + <property name="module-name" value="jetty-start-daemon"/> + <property name="module-version" value="${VERSION}"/> + <property name="module-libdir" value="${basedir}"/> + <property name="jar.main.class" value="org.mortbay.jetty.start.daemon.Bootstrap"/> + <property name="jar.file" value="start-daemon.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> + + <ant dir="${basedir}/modules/plus/" antfile="${module.script}" inheritRefs="true"> + <property name="module-name" value="jetty-plus"/> + <property name="module-version" value="${VERSION}"/> + <property name="module-libdir" value="${lib.dir}/plus"/> + </ant> + + <ant dir="${basedir}/modules/annotations/" antfile="${module.script}" inheritRefs="true"> + <property name="module-name" value="jetty-annotations"/> + <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> + <fileset dir="${basedir}/modules" includes="**/test/java/**/*.class"/> + </delete> + <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"/> + <delete file="${basedir}/start-daemon.jar" quiet="true"/> + <delete file="${basedir}/extras/setuid/modules/native/target/generated/org_mortbay_setuid_SetUID.c" quiet="true"/> + <delete file="${basedir}/extras/setuid/modules/native/target/generated/org_mortbay_setuid_SetUID.h" quiet="true"/> + </target> + +</project> + diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..cd33247 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,524 @@ +jetty (6.1.24-6) unstable; urgency=medium + + * Removed Depends on JREs for library packages, no longer required + by the policy. + * Added missing depends on JREs for the jetty package. + * Made init script ignore weird exit statuses from logrotate. + (Closes: 589681, LP: #607202) + * Fixed broken restart command in jetty init script. Was missing a + negation. + + -- Niels Thykier <[email protected]> Mon, 05 Jul 2010 22:28:14 +0200 + +jetty (6.1.24-5) unstable; urgency=low + + * Ignore test failures. (Closes: #586635) + * Remove debian/.mh in clean target. + + -- Torsten Werner <[email protected]> Tue, 29 Jun 2010 20:53:42 +0200 + +jetty (6.1.24-4) unstable; urgency=low + + * Updated the versions in the Manifests to match the actual version + of jetty. + * Remove all use of sudo in jetty.init. (Closes: #580639) + * Fixed some formatting issues in the NEWS file. + * Bumped debhelper compat to 7. + * Made the javadoc link against system javadocs. This includes adding + Recommends on various java-doc packages. + + -- Niels Thykier <[email protected]> Sun, 20 Jun 2010 14:49:32 +0200 + +jetty (6.1.24-3) unstable; urgency=low + + [ Torsten Werner ] + * Merge changes from Ubuntu version 6.1.22-1ubuntu1: + - debian/build.xml, debian/module.xml: Enable tests in the jetty module + - debian/rules: Adding slf4j-simple to the DEB_JARS since it's used in + tests + - debian/rules, debian/control: Added junit and ant-optional needed for + tests + + [ Miguel Landaeta ] + * Enable jetty-plus and jetty-annotations modules. (Closes: #585387). + + -- Torsten Werner <[email protected]> Thu, 10 Jun 2010 14:07:51 -0430 + +jetty (6.1.24-2) unstable; urgency=low + + * Set JAVA_HOME in d/rules to /usr/lib/jvm/default-java. (Closes: #578618, + #579469) + * Fix the installation of jetty-util5.jar. (Closes: #569328) + + -- Torsten Werner <[email protected]> Thu, 29 Apr 2010 07:36:43 +0200 + +jetty (6.1.24-1) unstable; urgency=low + + [ Niels Thykier ] + * Reduced Depends on libjetty-java-doc to a Suggests. (Closes: #569293) + * Clarified what JETTY_HOST should be set to in order to accept all + connections. (Closes: #554874) + * Bumped Standards-Version to 3.8.4 - no changes required. + + [ Torsten Werner ] + * New upstream release. + * Change Build-Depends: default-jdk. (Closes: #578618) + * Switch to source format 3.0. + + -- Torsten Werner <[email protected]> Fri, 23 Apr 2010 23:55:35 +0200 + +jetty (6.1.22-1ubuntu1) lucid; urgency=low + + * debian/build.xml, debian/module.xml: Enable tests in the jetty module + * debian/rules: Adding slf4j-simple to the DEB_JARS since it's used in tests + * debian/rules, debian/control: Added junit and ant-optional needed for tests + * debian/control, debian/rules: Build with default-jdk. + + -- Thierry Carrez <[email protected]> Tue, 26 Jan 2010 09:52:06 +0100 + +jetty (6.1.22-1) unstable; urgency=medium + + * New upstream release. (Closes: #553644) + * Added OSGi bundle metadata (by upstream). (Closes: #558187) + * Corrected path to jetty web-apps (by Niels Thykier). (Closes: #554877) + + -- Pablo Duboue <[email protected]> Sun, 13 Dec 2009 1:55:00 -0400 + +jetty (6.1.21-1) unstable; urgency=medium + + * New upstream release. + * Stopped using /tmp/jetty-temp in /etc/init.d/jetty for security + reasons. + - JVM_TMP is now /var/cache/jetty/tmp + - JETTY_TMP is now /var/cache/jetty/data + * The postrm script no longer deletes files in /tmp/jetty-temp. + * Removed Philipp Meier from Uploaders (last upload was 2006-06-07). + Thanks for your work on this package. + * Corrected javadoc symlink in binary package jetty. + + -- Niels Thykier <[email protected]> Fri, 23 Oct 2009 20:45:43 +0200 + +jetty (6.1.20-2) unstable; urgency=low + + * Move documentation to /usr/share/doc/libjetty-java + * Better postinst and postrm scripts, aligned with tomcat6 scripts: + - postinst: user jetty is created with its own group + - postrm: better cleanup of temporary data, + thourough remove and purge of data + * debian/changelog: + - fix suggest for package libjetty-java-doc, add libjetty-java-doc + to the list of Suggests for libjetty-java + - add libjetty-extra to the list of Suggests for package jetty. + + -- Ludovic Claude <[email protected]> Mon, 07 Sep 2009 00:22:20 +0100 + +jetty (6.1.20-1) unstable; urgency=medium + + [ Niels Thykier ] + * New upstream release. + * Stop using Build-Depends-Indep, since the policy and the build + daemons disagree on when it should be used (Closes: #540861). + * Corrected jetty.install to reflect the move of some license files + in the source tree. + * Bumped to Standard-Versions 3.8.3 - no changes required. + * Updated jetty.post{install,rm} scripts to use "set -e" instead of + passing it to sh. + * Installed "VERSION.txt" as upstream changelog. + * A previous version (6.1.18-1) fixed the following security problems, which + were not mentioned in the changelog: CVE-2007-5613, CVE-2007-5614, + CVE-2007-5615, CVE-2009-1523, and CVE-2009-1524 (see below for more + information). + + [ Torsten Werner ] + * Set urgency to medium because this version fixes a FTBFS. + + -- Torsten Werner <[email protected]> Sun, 06 Sep 2009 23:06:45 +0200 + +jetty (6.1.19-2) unstable; urgency=low + + * Upload to unstable. + + -- Torsten Werner <[email protected]> Sun, 09 Aug 2009 08:48:10 +0200 + +jetty (6.1.19-1) experimental; urgency=low + + [ Ludovic Claude ] + * New upstream release fixing a security vulnerability + (cookies are not secure if you are running behind a netscaler). + * Remove the bootstrap patch as it has been added upstream and update + the build to use the new start-daemon component. + * Remove the Build-Depend on quilt as the patch is not needed anymore. + * Add the Maven POM to the package. + * Add a Build-Depends dependency on maven-repo-helper. + * Use mh_installpom and mh_installjar to install the POM and the jar to the + Maven repository. + * Add optional support for web applications located in /usr/share/webapps. + * Add a cron job that cleans up the old log files in /var/log/jetty. + * Register the Javadoc into Debian documentation and put it in a + separate package (libjetty-java-doc). + * Use openjdk-6-jdk for the build; add a Build-Depends on this + package. Required to build the javadoc. + * Update debian/copyright (patch provided by Jan Pascal Vanbest + <[email protected]>). + + [ Torsten Werner ] + * Add myself to Uploaders. + * Update Standards-Version: 3.8.2. + * Move package libjetty-java-doc to Section: doc. + * Fix init script: check for /etc/default/rcS before reading it. + + -- Torsten Werner <[email protected]> Tue, 14 Jul 2009 11:50:43 +0200 + +jetty (6.1.18-1) unstable; urgency=low + + [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. + + [David Yu] + * New upstream release for jetty + (Closes: #528389, #527571, #454529, #425152). + * Fixed jetty.links. Now delegates install of start.jar to libjetty-java. + + [ Torsten Werner ] + * fixes several security issues: + - CVE-2007-5613: Cross-site scripting (XSS) vulnerability in Dump Servlet. + - CVE-2007-5614: Quote Sequence vulnerability. + - CVE-2007-5615: CRLF injection vulnerability. + - CVE-2009-1523: Directory traversal vulnerability in the HTTP server in + Mort Bay Jetty. + - CVE-2009-1524: Cross-site scripting (XSS) vulnerability in Mort + Bay Jetty. + (Closes: #454529, #528389, #527571, #543462). + + -- Ludovic Claude <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Tue, 30 May 2006 10:40:18 +0200 + +jetty (5.1.8-3) unstable; urgency=low + + * Enhance dependencies. + + -- Philipp Meier <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Wed, 30 Nov 2005 15:20:47 +0100 + +jetty (5.1.5rc1-5) unstable; urgency=low + + Patch from Oyvind Harboe <[email protected]>: + + * 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 <[email protected]> Thu, 22 Sep 2005 16:13:16 +0200 + +jetty (5.1.5rc1-4) unstable; urgency=low + + Patch from Oyvind Harboe <[email protected]>: + + * Fixed rc script /etc/init.d/jetty. "stop" could leave dangling + /var/run/jetty.pid. Fixed this by adding "--oknodo" to + "start-stop-daemon --stop" command. + * Removed trailing "/" from LOGDIR which caused + /var/log/out.log not to be created. + * /etc/init.d/jetty start will now deal more gracefully with a + dangling /var/run/jetty.pid. A dangling jetty.pid is detected + and ignored. + * Closes: #326176. + + -- Philipp Meier <[email protected]> Fri, 2 Sep 2005 13:40:59 +0200 + +jetty (5.1.5rc1-3) unstable; urgency=low + + * Removed -v from ant opts during build. + * Remove pid file on stop. Closes: #325667 + * Fix location of ant-1.6.jar in start.config. Closes: #324472. + + -- Philipp Meier <[email protected]> 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 <[email protected]> Sat, 27 Aug 2005 14:21:12 +0200 + +jetty (5.1.5rc1-1) unstable; urgency=low + + * New upstream release. + + -- Philipp Meier <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Mon, 25 Oct 2004 11:52:25 +0200 + +jetty (5.0.0-1) unstable; urgency=low + + * New upstream release. + + -- Philipp Meier <[email protected]> Thu, 16 Sep 2004 00:40:41 +0200 + +jetty (4.2.22-2) unstable; urgency=low + + * New upstream release. + * Changed mantainer email. + + -- Philipp Meier <[email protected]> Wed, 25 Aug 2004 18:14:56 +0200 + +jetty (4.2.21-1) unstable; urgency=low + + * New upstream release. + + -- Philipp Meier <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Fri, 29 Aug 2003 14:43:40 +0200 + +jetty (4.2.12-1) unstable; urgency=low + + * New upstream release. + + -- Philipp Meier <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Tue, 15 Jul 2003 21:50:36 +0200 + +jetty (4.2.11-1) unstable; urgency=low + + * Initial Release. + + -- Philipp Meier <[email protected]> Mon, 14 Jul 2003 13:21:36 +0200 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +7 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..39aef43 --- /dev/null +++ b/debian/control @@ -0,0 +1,83 @@ +Source: jetty +Section: java +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Michael Koch <[email protected]>, Thierry Carrez <[email protected]>, + Ludovic Claude <[email protected]>, Torsten Werner <[email protected]>, + Niels Thykier <[email protected]>, Pablo Duboue <[email protected]> +Build-Depends: debhelper (>= 7), cdbs (>> 0.4.5.3), default-jdk, ant-optional, maven-repo-helper, + libservlet2.5-java, libslf4j-java, libmx4j-java, libgnumail-java, + libgnujaf-java, libcommons-daemon-java, junit, libgeronimo-jta-1.0.1b-spec-java, + libtomcat6-java, default-jdk-doc, libgnumail-java-doc, libservlet2.5-java-doc +Standards-Version: 3.8.4 +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}, libservlet2.5-java, libslf4j-java +Suggests: jetty, libjetty-java-doc +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-java-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Recommends: default-jdk-doc, libgnumail-java-doc, libservlet2.5-java-doc +Suggests: libjetty-java +Description: Javadoc for the Jetty API + 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. + . + This package contains the Javadoc for libjetty-java. + +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), libgeronimo-jta-1.0.1b-spec-java +Recommends: libjetty-extra +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, jetty-plus, jetty-annotations + +Package: libjetty-extra +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libjetty-extra-java (>= ${source:Version}) +Conflicts: libjetty-setuid-java +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. + This package contains the platform-dependent libraries used by Jetty. + Currently it contains libsetuid.so which can be used to start Jetty as root + so that privileged ports may be accessed and then switched to a non-root + user for security. + +Package: jetty +Architecture: all +Depends: ${misc:Depends}, libjetty-java (>= ${source:Version}), + adduser, jsvc, apache2-utils, default-jre-headless | java5-runtime-headless +Suggests: libjetty-extra-java (>= ${source:Version}), libjetty-extra (>= ${source:Version}), + libjetty-java-doc (>= ${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. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..8338b6b --- /dev/null +++ b/debian/copyright @@ -0,0 +1,75 @@ +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: contrib/jboss/src/main/java/org/jboss/jetty/JettyDeployer.java +Copyright: 2006, Mort Bay Consulting Pty. Ltd. +License: LGPL-2 + +Files: contrib/jetty-ant/src/main/java/org/mortbay/jetty/ant/* +Copyright: 2006-2007, Sabre Holdings +License: Apache-2.0 + +Files: examples/test-webapp/src/main/webapp/WEB-INF/tags/panel.tag +Copyright: 2002, The Apache Software Foundation +License: Apache-2.0 + +Files: examples/test-webapp/src/test/java/com/acme/DispatchServletTest.java +Copyright: 2009, Webtide LLC +License: Apache-2.0 + +Files: extras/xbean/* +Copyright: 2005-2006, The Apache Software Foundation +License: Apache-2.0 + +Files: extras/gwt/src/main/java/org/mortbay/gwt/AsyncRemoteServiceServlet.java, + extras/gwt/src/main/java/com/google/gwt/user/server/rpc/OpenRemoteServiceServlet.java +Copyright: 2006, Google Inc +Copyright: 2006, Craig Day <[email protected]> +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: other + Permission to use, copy, modify and distribute this software + for non-commercial or commercial purposes and without fee is + hereby granted provided that this copyright notice appears in + all copies. + +Files: modules/jetty/src/test/java/org/mortbay/jetty/servlet/SessionManagerTest.java, + modules/util/src/main/java/org/mortbay/servlet/ThrottlingFilter.java +Copyright: 2006, Tim Vernum +License: Apache-2.0 + +Files: modules/jetty/src/main/java/org/mortbay/jetty/security/PKCS12Import.java +Copyright: 1999, Jason Gilbert +License: Apache-2.0 + +Files: modules/jetty/src/main/java/org/mortbay/jetty/security/HTAccessHandler.java +Copyright: 2001, Deville Daniel +License: other + Permission to use, copy, modify and distribute this software + for non-commercial or commercial purposes and without fee is + hereby granted provided that this copyright notice appears in + all copies. + +Files: debian/* +Copyright: 2003, Philipp Meier <[email protected]> +Copyright: 2009, Ludovic Claude <[email protected]> +Copyright: 2009, David Yu <[email protected]> +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'. + +License: LGPL-2 + On Debian GNU/Linux system you can find the complete text of the + LGPL 2 license in '/usr/share/common-licenses/LGPL-2'. + diff --git a/debian/jetty-extra.conf b/debian/jetty-extra.conf new file mode 100644 index 0000000..5d47d78 --- /dev/null +++ b/debian/jetty-extra.conf @@ -0,0 +1,11 @@ +# 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-shared-webapps.xml +/etc/jetty/jetty-plus.xml +/etc/jetty/jetty-ajp.xml +/etc/jetty/jetty-ssl.xml +/etc/jetty/jetty-sslengine.xml +/etc/jetty/jetty-stats.xml diff --git a/debian/jetty-shared-webapps.xml b/debian/jetty-shared-webapps.xml new file mode 100644 index 0000000..d076928 --- /dev/null +++ b/debian/jetty-shared-webapps.xml @@ -0,0 +1,42 @@ +<?xml version="1.0"?> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd";> + +<!-- =============================================================== --> +<!-- Configure the Jetty Server to use webapps located in --> +<!-- /usr/share/java/webapps --> +<!-- --> +<!-- Documentation of this file format can be found at: --> +<!-- http://docs.codehaus.org/display/JETTY/jetty.xml --> +<!-- --> +<!-- =============================================================== --> + + +<Configure id="Server" class="org.mortbay.jetty.Server"> + + <!-- =========================================================== --> + <!-- Configure the webapp deployer. --> + <!-- A webapp deployer will deploy standard webapps discovered --> + <!-- in a directory at startup, without the need for additional --> + <!-- configuration files. It does not support hot deploy or --> + <!-- non standard contexts (see ContextDeployer above). --> + <!-- --> + <!-- This deployer is configured to deploy webapps from the --> + <!-- /usr/share/jetty/webapps directory --> + <!-- --> + <!-- Normally only one type of deployer need be used. --> + <!-- --> + <!-- =========================================================== --> + <Call name="addLifeCycle"> + <Arg> + <New class="org.mortbay.jetty.deployer.WebAppDeployer"> + <Set name="contexts"><Ref id="Contexts"/></Set> + <Set name="webAppDir">/usr/share/jetty/webapps</Set> + <Set name="parentLoaderPriority">false</Set> + <Set name="extract">true</Set> + <Set name="allowDuplicates">false</Set> + <Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set> + </New> + </Arg> + </Call> + +</Configure> diff --git a/debian/jetty.conf b/debian/jetty.conf new file mode 100644 index 0000000..c5eb802 --- /dev/null +++ b/debian/jetty.conf @@ -0,0 +1,4 @@ +# list of jetty configuration and property files +/etc/jetty/jetty-logging.xml +/etc/jetty/jetty.xml +/etc/jetty/jetty-shared-webapps.xml diff --git a/debian/jetty.cron.daily b/debian/jetty.cron.daily new file mode 100644 index 0000000..6a90e45 --- /dev/null +++ b/debian/jetty.cron.daily @@ -0,0 +1,21 @@ +#!/bin/sh + +NAME=jetty +DEFAULT=/etc/default/$NAME + +# The following variables can be overwritten in $DEFAULT + +# Default for number of days to keep old log files in /var/log/jetty/ +LOGFILE_DAYS=14 + +# End of variables that can be overwritten in $DEFAULT + +# overwrite settings from default file +if [ -f "$DEFAULT" ]; then + . "$DEFAULT" +fi + +if [ -d /var/log/$NAME ]; then + find /var/log/$NAME/ -name \*.log -mtime +$LOGFILE_DAYS -print0 \ + | xargs --no-run-if-empty -0 rm -- +fi diff --git a/debian/jetty.default b/debian/jetty.default new file mode 100644 index 0000000..d517847 --- /dev/null +++ b/debian/jetty.default @@ -0,0 +1,48 @@ +# 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 + +# Listen to connections from this network host +# Use 0.0.0.0 as host to accept all connections. +# Uncomment to restrict access to localhost +#JETTY_HOST=$(uname -n) + +# 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 + +# Jetty uses a config file to setup its boot classpath +#JETTY_START_CONFIG=/etc/jetty/start.config + +# Default for number of days to keep old log files in /var/log/jetty/ +#LOGFILE_DAYS=14 diff --git a/debian/jetty.dirs b/debian/jetty.dirs new file mode 100644 index 0000000..27f1475 --- /dev/null +++ b/debian/jetty.dirs @@ -0,0 +1,7 @@ +etc/jetty +etc/jetty/contexts +usr/share/jetty +usr/share/doc/jetty +var/lib/jetty/webapps +var/log/jetty +var/cache/jetty diff --git a/debian/jetty.init b/debian/jetty.init new file mode 100644 index 0000000..872341c --- /dev/null +++ b/debian/jetty.init @@ -0,0 +1,413 @@ +#!/bin/sh -e +# +# /etc/init.d/jetty -- startup script for jetty 6.1.18 +# +# Written by Philipp Meier <[email protected]> +# Modified for Jetty 6 by Ludovic Claude <[email protected]> +# +### BEGIN INIT INFO +# Provides: jetty +# 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_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 +LOGDIR="/var/log/jetty" +START_JAR="$JETTY_HOME/start.jar" +START_DAEMON_JAR="$JETTY_HOME/start-daemon.jar" +DEFAULT=/etc/default/$NAME +DAEMON=/usr/bin/jsvc +JVM_TMP=/var/cache/jetty/tmp + +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 + +if [ -r /etc/default/rcS ]; then + . /etc/default/rcS +fi + + +# The following variables can be overwritten in /etc/default/jetty + +# Whether to start jetty (as a daemon) or not +NO_START=0 + +# Run Jetty as this user ID (default: jetty) +# Set this to an empty string to prevent Jetty from starting automatically +JETTY_USER=jetty + +# Listen to connections from this network host (leave empty to accept all connections) +#JETTY_HOST=$(uname -n) +JETTY_HOST= + +# 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). 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.5-ibm \ + /usr/lib/j2sdk1.4-sun \ + /usr/lib/j2sdk1.4 \ + /usr/lib/j2se/1.4 \ + /usr/lib/kaffe/ \ + " + +# Timeout in seconds for the shutdown of all webapps +JETTY_SHUTDOWN=30 + +# Jetty uses a directory to store temporary files like unpacked webapps +JETTY_TMP=/var/cache/jetty/data + +# 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 "$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 + 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" ] && 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 + 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 +done +export JAVA_HOME + +export JAVA="$JAVA_HOME/bin/java" + +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" +WEBAPPDIR="$JETTY_HOME/webapps" +BOOTSTRAP_CLASS=org.mortbay.jetty.start.daemon.Bootstrap +JSVC_CLASSPATH="/usr/share/java/commons-daemon.jar:$START_JAR:$START_DAEMON_JAR:$JAVA_HOME/lib/tools.jar" +ROTATELOGS=/usr/sbin/rotatelogs +HOSTNAME=$(uname -n) + +################################################## +# Check for JAVA_HOME +################################################## +if [ -z "$JAVA_HOME" ]; then + 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 + +##################################################### +# 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 + + if [ -f $PIDFILE ] ; then + log_warning_msg "$PIDFILE exists, but jetty was not running. Ignoring $PIDFILE" + fi + + if [ -s "$LOGDIR/out.log" ]; then + log_progress_msg "Rotate logs" + $ROTATELOGS "$LOGDIR/out.log" 86400 \ + < "$LOGDIR/out.log" || true + fi + > "$LOGDIR/out.log" + chown -R $JETTY_USER:adm "$LOGDIR" + + # 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://$HOSTNAME:$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 + log_warning_msg "(already running)." + log_end_msg 0 + exit 1 + fi + ;; + + stop) + log_daemon_msg "Stopping $DESC (was reachable on http://$HOSTNAME:$JETTY_PORT/)." "$NAME" + + if start-stop-daemon --quiet --test --start --pidfile "$PIDFILE" \ + --user "$JETTY_USER" --startas "$JAVA" > /dev/null; then + if [ -x "$PIDFILE" ]; then + log_warning_msg "(not running but $PIDFILE exists)." + else + 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 + 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 + 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) + 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) + 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 + log_success_msg "$DESC is running with pid `cat $PIDFILE`, and is reachable on http://$JETTY_HOST:$JETTY_PORT/"; + exit 0 + fi + exit 1 + ;; + + *) + log_success_msg "Usage: $0 {start|stop|restart|force-reload|try-restart|status|check}" + exit 1 + ;; +esac + +exit 0 diff --git a/debian/jetty.install b/debian/jetty.install new file mode 100644 index 0000000..d6616fc --- /dev/null +++ b/debian/jetty.install @@ -0,0 +1,12 @@ +etc/* etc/jetty +debian/jetty-shared-webapps.xml 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 +LICENSES/cla-* usr/share/doc/jetty/LICENSES +LICENSES/ccla-* usr/share/doc/jetty/LICENSES +NOTICE.txt usr/share/doc/jetty/LICENSES +debian/README.Debian usr/share/doc/jetty diff --git a/debian/jetty.links b/debian/jetty.links new file mode 100644 index 0000000..5010583 --- /dev/null +++ b/debian/jetty.links @@ -0,0 +1,6 @@ +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/libjetty-java/api usr/share/jetty/javadoc + diff --git a/debian/jetty.postinst b/debian/jetty.postinst new file mode 100644 index 0000000..14fec6d --- /dev/null +++ b/debian/jetty.postinst @@ -0,0 +1,24 @@ +#!/bin/sh +set -e + +case "$1" in + configure) + if ! id jetty > /dev/null 2>&1 ; then + adduser --system --home /usr/share/jetty --no-create-home \ + --group --disabled-password --shell /bin/false \ + jetty + fi + chown -R jetty:adm /var/cache/jetty /var/log/jetty /var/lib/jetty + chmod 750 /var/log/jetty + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "$0 called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# diff --git a/debian/jetty.postrm b/debian/jetty.postrm new file mode 100644 index 0000000..7cd6f2d --- /dev/null +++ b/debian/jetty.postrm @@ -0,0 +1,46 @@ +#!/bin/sh +set -e + +#DEBHELPER# + +# Remove cached files +rm -rf /var/cache/jetty/* + +case "$1" in + remove) + # Remove ROOT webapp if not modified + RWLOC="/var/lib/jetty/webapps/root" + RWFILES="$RWLOC/index.html $RWLOC/jetty_banner.gif" + if [ "`(cat $RWFILES | md5sum -) 2>/dev/null | cut -d ' ' -f 1`" \ + = "12471c4b3020defb7ebd30ef84c0f9dd" ] ; then + rm $RWFILES + rmdir --ignore-fail-on-non-empty \ + /var/lib/jetty/webapps/root \ + /var/lib/jetty/webapps \ + /var/lib/jetty || true + fi + if [ -d "/var/cache/jetty" ] ; then + rm -rf /var/cache/jetty + fi + ;; + + purge) + # Remove user/group and log files (don't remove everything under + # /var/lib/jetty because there might be user-installed webapps) + deluser jetty || true + rm -rf /var/log/jetty + if [ -d "/var/lib/jetty" ] ; then + rmdir --ignore-fail-on-non-empty /var/lib/jetty || true + fi + rmdir --ignore-fail-on-non-empty /etc/jetty/contexts /etc/jetty || true + ;; + + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + # Nothing to do here + ;; + + *) + echo "$0 called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac diff --git a/debian/libjetty-extra-java.dirs b/debian/libjetty-extra-java.dirs new file mode 100644 index 0000000..cfab775 --- /dev/null +++ b/debian/libjetty-extra-java.dirs @@ -0,0 +1,6 @@ +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.1 +usr/share/jetty/lib/plus diff --git a/debian/libjetty-extra-java.links b/debian/libjetty-extra-java.links new file mode 100644 index 0000000..a464167 --- /dev/null +++ b/debian/libjetty-extra-java.links @@ -0,0 +1,18 @@ +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/ant-launcher.jar usr/share/jetty/lib/jsp-2.1/ant-launcher.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/java/annotations-api.jar usr/share/jetty/lib/annotations-api.jar +usr/share/java/geronimo-jta-1.0.1b-spec.jar usr/share/jetty/lib/geronimo-jta-1.0.1b-spec.jar diff --git a/debian/libjetty-extra-java.poms b/debian/libjetty-extra-java.poms new file mode 100644 index 0000000..83c5a63 --- /dev/null +++ b/debian/libjetty-extra-java.poms @@ -0,0 +1,13 @@ +modules/html/pom.xml +modules/management/pom.xml +modules/naming/pom.xml +extras/servlet-tester/pom.xml +extras/ajp/pom.xml +extras/threadpool/pom.xml +extras/client/pom.xml +contrib/jetty-rewrite-handler/pom.xml +extras/setuid/pom.xml +extras/setuid/modules/java/pom.xml +modules/plus/pom.xml +modules/annotations/pom.xml + diff --git a/debian/libjetty-java-doc.doc-base b/debian/libjetty-java-doc.doc-base new file mode 100644 index 0000000..5b5af3d --- /dev/null +++ b/debian/libjetty-java-doc.doc-base @@ -0,0 +1,9 @@ +Document: libjetty-java +Title: API Javadoc for jetty +Author: Mortbay Consulting +Abstract: This is the API Javadoc provided by Jetty. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libjetty-java/api/index.html +Files: /usr/share/doc/libjetty-java/api/* diff --git a/debian/libjetty-java-doc.install b/debian/libjetty-java-doc.install new file mode 100644 index 0000000..1521394 --- /dev/null +++ b/debian/libjetty-java-doc.install @@ -0,0 +1 @@ +api usr/share/doc/libjetty-java diff --git a/debian/libjetty-java.dirs b/debian/libjetty-java.dirs new file mode 100644 index 0000000..541db3d --- /dev/null +++ b/debian/libjetty-java.dirs @@ -0,0 +1,4 @@ +usr/share/jetty +usr/share/jetty/lib +usr/share/jetty/lib/jre1.5 +usr/share/jetty/lib/ext diff --git a/debian/libjetty-java.links b/debian/libjetty-java.links new file mode 100644 index 0000000..94d8e06 --- /dev/null +++ b/debian/libjetty-java.links @@ -0,0 +1,2 @@ +usr/share/java/servlet-api-2.5.jar usr/share/jetty/lib/servlet-api-2.5.jar + diff --git a/debian/libjetty-java.poms b/debian/libjetty-java.poms new file mode 100644 index 0000000..c58bddb --- /dev/null +++ b/debian/libjetty-java.poms @@ -0,0 +1,8 @@ +pom.xml --no-parent +modules/util/pom.xml +modules/util5/pom.xml +modules/jetty/pom.xml +extras/sslengine/pom.xml +modules/start/pom.xml +contrib/start-daemon/pom.xml + diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..38888d9 --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1,4 @@ +junit junit jar s/3\..*/3.x/ +s/ant/org.apache.ant/ * * s/.*/debian/ +org.mortbay.jetty * * s/6\..*/6.x/ +s/org.mortbay.jetty/javax.servlet/ servlet-api jar s/.*/2.5/ diff --git a/debian/module.xml b/debian/module.xml new file mode 100644 index 0000000..a00a783 --- /dev/null +++ b/debian/module.xml @@ -0,0 +1,179 @@ +<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 &copy; 2009 Mortbay Consulting Pty. Ltd. All Rights Reserved."> + <classpath> + <path refid="classpath"/> + </classpath> + <link href="/usr/share/doc/default-jdk-doc/api/" /> + <link href="/usr/share/doc/libgnumail-java/api/" /> + <link href="/usr/share/doc/libservlet2.5-java/api/" /> + <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> + <property name="manifest.file" value="${rsrc.dir}/META-INF/MANIFEST.MF"/> + <available file="${manifest.file}" type="file" property="manifest.file.exists"/> + <available file="${rsrc.dir}" type="dir" property="rsrc.dir.exists"/> + <antcall target="generate-jar-with-given-manifest"/> + <antcall target="generate-jar-without-given-manifest"/> + + <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"/> + <antcall target="tests" inheritRefs="true"/> + </target> + + <target name="generate-jar" unless="jar.main.class"> + <antcall target="jar-with-resources"/> + <antcall target="jar"/> + </target> + + <target name="generate-jar-with-given-manifest" if="manifest.file.exists"> + <antcall target="jar-with-given-manifest-and-resources"/> + <antcall target="jar-with-given-manifest"/> + </target> + + <target name="generate-jar-without-given-manifest" unless="manifest.file.exists"> + <antcall target="generate-jar-with-manifest"/> + <antcall target="generate-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="jar-with-given-manifest" unless="rsrc.dir.exists"> + <jar destfile="${target.dir}/${jar.file}" manifest="${manifest.file}"> + <fileset dir="${build.dir}"> + <include name="**/*"/> + </fileset> + <fileset dir="${rsrc.dir}"> + <include name="**/*"/> + </fileset> + </jar> + </target> + + <target name="jar-with-given-manifest-and-resources" if="rsrc.dir.exists"> + <jar destfile="${target.dir}/${jar.file}" manifest="${manifest.file}"> + <fileset dir="${build.dir}"> + <include name="**/*"/> + </fileset> + <fileset dir="${rsrc.dir}"> + <include name="**/*"/> + </fileset> + </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> + + <target name="tests" if="run-tests"> + <javac srcdir="${test.dir}" + classpathref="classpath" + deprecation="false" + failonerror="true" + debug="true" + source="1.5" + target="1.5" + nowarn="true" + listfiles="true"/> + <junit haltonfailure="off"> + <classpath> + <path refid="classpath"/> + <pathelement path="${test.dir}"/> + </classpath> + <formatter type="plain" usefile="false"/> + <batchtest> + <fileset dir="${test.dir}"> + <include name="**/*Test.java"/> + <include name="**/*TestCase.java"/> + <exclude name="org/mortbay/jetty/servlet/AbstractSessionTest.java"/> + <exclude name="org/mortbay/jetty/AsyncStressTest.java"/> + <exclude name="org/mortbay/resource/*.java"/> + <exclude name="org/mortbay/xml/XmlConfigurationTest.java"/> + </fileset> + </batchtest> + </junit> + </target> +</project> + diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh new file mode 100755 index 0000000..eeaec77 --- /dev/null +++ b/debian/orig-tar.sh @@ -0,0 +1,27 @@ +#!/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 +rm -r $DIR/modules/jsp-api-2.0 +rm -r $DIR/extras/win32service +rm -r $DIR/contrib/cometd +rm -r $DIR/contrib/rpms +rm -r $DIR/contrib/debian +rm -r $DIR/contrib/grizzly +rm -r $DIR/contrib/maven-beanshell-plugin + +tar -c -z -f $TAR $DIR +# drop ../$TAG to avoid "self-destruct" behavior +#rm -rf $DIR ../$TAG +rm -rf $DIR + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + mv $TAR $origDir + echo "moved $TAR to $origDir" +fi + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..987ef29 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01_add_manifests_with_osgi_bundles_info.patch diff --git a/debian/root-webapp/index.html b/debian/root-webapp/index.html new file mode 100644 index 0000000..dc30e0e --- /dev/null +++ b/debian/root-webapp/index.html @@ -0,0 +1,25 @@ +<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 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) +in order to use java, servlets and JSPs to generate dynamic content. Jetty +is a fully featured web server for static and dynamic content. Unlike separate +server/container solutions, this means that your web server and web application +run in the same process, without interconnection overheads and complications. +Furthermore, as a pure java component, Jetty can be simply included in your +application for demonstration, distribution or deployment. Jetty is available +on all Java supported platforms. </p> + +<P align="justify"> +You can also visit Jetty's <a href="javadoc/">Javadoc</a> +</BODY> +</HTML> diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..a2b1c61 --- /dev/null +++ b/debian/rules @@ -0,0 +1,65 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/ant.mk + +PACKAGE := $(DEB_SOURCE_PACKAGE) +VERSION := $(DEB_UPSTREAM_VERSION) +JAVA_HOME := /usr/lib/jvm/default-java +DEB_JARS := servlet-api-2.5 slf4j-api slf4j-simple mx4j mx4j-tools gnumail activation commons-daemon junit ant-junit geronimo-jta-1.0.1b-spec annotations-api +DEB_ANT_BUILD_TARGET := package +DEB_ANT_BUILDFILE := debian/build.xml +DEB_ANT_ARGS := -DVERSION=$(VERSION) -Dbuild.sysclasspath=last +DEB_INSTALL_CHANGELOGS_ALL := VERSION.txt +#API_DOCS := javadoc/ + +binary-post-install/lib$(PACKAGE)-java:: + mh_installpoms -plib$(PACKAGE)-java + mh_installjar -plib$(PACKAGE)-java -l --usj-name=jetty-util modules/util/pom.xml lib/jetty-util-$(VERSION).jar /usr/share/jetty/lib/jetty-util.jar + mh_installjar -plib$(PACKAGE)-java -l --usj-name=jetty-util5 modules/util5/pom.xml lib/util5/jetty-util5-$(VERSION).jar /usr/share/jetty/jre1.5/jetty-util5-$(VERSION).jar usr/share/jetty/lib/jre1.5/jetty-util5.jar + mh_installjar -plib$(PACKAGE)-java -l --usj-name=jetty modules/jetty/pom.xml lib/jetty-$(VERSION).jar /usr/share/jetty/lib/jetty.jar + mh_installjar -plib$(PACKAGE)-java -l --usj-name=jetty-sslengine extras/sslengine/pom.xml lib/sslengine/jetty-sslengine-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-sslengine.jar + mh_installjar -plib$(PACKAGE)-java -l --usj-name=jetty-start modules/start/pom.xml start.jar /usr/share/jetty/start.jar + mh_installjar -plib$(PACKAGE)-java -l --usj-name=jetty-start-daemon contrib/start-daemon/pom.xml start-daemon.jar /usr/share/jetty/start-daemon.jar + +binary-post-install/lib$(PACKAGE)-extra-java:: + mh_installpoms -plib$(PACKAGE)-extra-java + mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-html modules/html/pom.xml lib/ext/jetty-html-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-html.jar + mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-management modules/management/pom.xml lib/management/jetty-management-$(VERSION).jar /usr/share/jetty/lib/management/jetty-management.jar + mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-naming modules/naming/pom.xml lib/naming/jetty-naming-$(VERSION).jar /usr/share/jetty/lib/naming/jetty-naming.jar + mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-plus modules/plus/pom.xml lib/plus/jetty-plus-$(VERSION).jar /usr/share/jetty/lib/plus/jetty-plus.jar + mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-servlet-tester extras/servlet-tester/pom.xml lib/ext/jetty-servlet-tester-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-servlet-tester.jar + mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-ajp extras/ajp/pom.xml lib/ext/jetty-ajp-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-ajp.jar + mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-java5-threadpool extras/threadpool/pom.xml lib/ext/jetty-java5-threadpool-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-java5-threadpool.jar + mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-client extras/client/pom.xml lib/ext/jetty-client-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-client.jar + mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-rewrite-handler contrib/jetty-rewrite-handler/pom.xml lib/ext/jetty-rewrite-handler-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-rewrite-handler.jar + mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-setuid extras/setuid/modules/java/pom.xml lib/ext/jetty-setuid-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-setuid.jar + mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-annotations modules/annotations/pom.xml lib/ext/jetty-annotations-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-annotations.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)-extra:: lib/ext/libsetuid.so + +binary-post-install/lib$(PACKAGE)-extra:: + mh_installpoms -plib$(PACKAGE)-extra + dh_install -plib$(PACKAGE)-extra --sourcedir=lib/ext libsetuid.so /usr/lib/jetty + dh_link -plib$(PACKAGE)-extra /usr/lib/jetty/libsetuid.so /usr/share/jetty/lib/ext/libsetuid.so + +clean:: + $(RM) -r debian/.mh + +get-orig-source: + uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename + +# No documentation released yet. +#binary-post-install/$(PACKAGE)-doc:: + diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/start.config b/debian/start.config new file mode 100644 index 0000000..a8db0f5 --- /dev/null +++ b/debian/start.config @@ -0,0 +1,62 @@ +# 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 "<",">","<=",">=","==","!=" +# +# CONDITIONS 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/jetty 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 libjetty-extra-java +/usr/share/java/gnumail.jar +/usr/share/java/activation.jar +/usr/share/java/ant.jar + +# Set the jetty classpath +/usr/share/jetty/lib/** + +# Add a resources directory if it is there +$(jetty.home)/resources/ diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..a1d215e --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://svn.codehaus.org/jetty/jetty/tags/ \ + jetty-([0-6].*)/ debian debian/orig-tar.sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
