Author: ludovicc-guest Date: 2009-07-13 20:40:26 +0000 (Mon, 13 Jul 2009) New Revision: 9237
Added: trunk/jetty/debian/jetty-shared-webapps.xml trunk/jetty/debian/jetty.cron.daily trunk/jetty/debian/libjetty-extra-java.poms trunk/jetty/debian/libjetty-java-doc.doc-base trunk/jetty/debian/libjetty-java-doc.docs trunk/jetty/debian/libjetty-java.poms trunk/jetty/debian/libjetty-setuid-java.poms trunk/jetty/debian/maven.rules Removed: trunk/jetty/debian/libjetty-extra-java.install trunk/jetty/debian/libjetty-java.install trunk/jetty/debian/libjetty-setuid-java.install trunk/jetty/debian/libjetty-setuid-java.links trunk/jetty/debian/patches/ Modified: trunk/jetty/debian/TODO trunk/jetty/debian/build.xml trunk/jetty/debian/changelog trunk/jetty/debian/control trunk/jetty/debian/copyright trunk/jetty/debian/jetty-extra.conf trunk/jetty/debian/jetty.conf trunk/jetty/debian/jetty.default trunk/jetty/debian/jetty.dirs trunk/jetty/debian/jetty.init trunk/jetty/debian/jetty.install trunk/jetty/debian/jetty.links trunk/jetty/debian/libjetty-extra-java.links trunk/jetty/debian/libjetty-java.links trunk/jetty/debian/rules trunk/jetty/debian/start.config trunk/jetty/debian/watch Log: * 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-Indep 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) * Update debian/copyright (patch provided by Jan Pascal Vanbest <[email protected]>) Modified: trunk/jetty/debian/TODO =================================================================== --- trunk/jetty/debian/TODO 2009-07-13 20:35:01 UTC (rev 9236) +++ trunk/jetty/debian/TODO 2009-07-13 20:40:26 UTC (rev 9237) @@ -1,7 +1,5 @@ TODO List for jetty in debian -* add better support for /usr/share/webapps like tomcat does. - * evaluate authbind Modules to add: Modified: trunk/jetty/debian/build.xml =================================================================== --- trunk/jetty/debian/build.xml 2009-07-13 20:35:01 UTC (rev 9236) +++ trunk/jetty/debian/build.xml 2009-07-13 20:40:26 UTC (rev 9237) @@ -6,7 +6,7 @@ <property name="target.dir" value="${basedir}/target"/> <property name="lib.dir" value="${basedir}/lib"/> <property name="etc.dir" value="${basedir}/etc"/> - <property name="javadoc.dir" value="${basedir}/javadoc"/> + <property name="javadoc.dir" value="${basedir}/api"/> <property name="module.script" location="debian/module.xml"/> <path id="classpath"> @@ -53,6 +53,14 @@ <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"> Modified: trunk/jetty/debian/changelog =================================================================== --- trunk/jetty/debian/changelog 2009-07-13 20:35:01 UTC (rev 9236) +++ trunk/jetty/debian/changelog 2009-07-13 20:40:26 UTC (rev 9237) @@ -1,3 +1,23 @@ +jetty (6.1.19-1) experimental; urgency=low + + * 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-Indep 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) + * Update debian/copyright (patch provided by Jan Pascal Vanbest + <[email protected]>) + + -- Ludovic Claude <[email protected]> Mon, 13 Jul 2009 13:21:54 +0100 + jetty (6.1.18-1) unstable; urgency=low [Ludovic Claude] Modified: trunk/jetty/debian/control =================================================================== --- trunk/jetty/debian/control 2009-07-13 20:35:01 UTC (rev 9236) +++ trunk/jetty/debian/control 2009-07-13 20:40:26 UTC (rev 9237) @@ -4,7 +4,7 @@ Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Philipp Meier <[email protected]>, Michael Koch <[email protected]>, Thierry Carrez <[email protected]>, Ludovic Claude <[email protected]> -Build-Depends: debhelper (>= 6), cdbs (>> 0.4.5.3), default-jdk, quilt, ant, +Build-Depends: debhelper (>= 6), cdbs (>> 0.4.5.3), default-jdk, ant, maven-repo-helper, libservlet2.5-java, libslf4j-java, libmx4j-java, libgnumail-java, libgnujaf-java, libcommons-daemon-java Standards-Version: 3.8.1 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jetty @@ -21,6 +21,18 @@ extensible and flexible, thus making it an ideal platform for serving dynamic HTTP requests from any Java application. +Package: libjetty-java-doc +Architecture: all +Depends: ${misc:Depends} +Suggests: jetty +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, @@ -50,7 +62,8 @@ Package: jetty Architecture: all -Depends: ${misc:Depends}, libjetty-java (>= ${source:Version}), adduser, jsvc, apache2-utils +Depends: ${misc:Depends}, libjetty-java (>= ${source:Version}), + libjetty-java-doc (>= ${source:Version}), adduser, jsvc, apache2-utils Suggests: libjetty-extra-java (>= ${source:Version}), libjetty-setuid-java (>= ${source:Version}) Description: Java servlet engine and webserver Jetty is an Open Source HTTP Servlet Server written in 100% Java. Modified: trunk/jetty/debian/copyright =================================================================== --- trunk/jetty/debian/copyright 2009-07-13 20:35:01 UTC (rev 9236) +++ trunk/jetty/debian/copyright 2009-07-13 20:40:26 UTC (rev 9237) @@ -36,7 +36,11 @@ 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 +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 @@ -49,13 +53,11 @@ Files: modules/jetty/src/main/java/org/mortbay/jetty/security/HTAccessHandler.java Copyright: 2001, Deville Daniel -License: - Unspecified BSD style license. - . - 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. +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]> @@ -67,14 +69,7 @@ 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: 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'. - License: LGPL-2 On Debian GNU/Linux system you can find the complete text of the - GPL 2 license in '/usr/share/common-licenses/GPL-2'. + LGPL 2 license in '/usr/share/common-licenses/LGPL-2'. Modified: trunk/jetty/debian/jetty-extra.conf =================================================================== --- trunk/jetty/debian/jetty-extra.conf 2009-07-13 20:35:01 UTC (rev 9236) +++ trunk/jetty/debian/jetty-extra.conf 2009-07-13 20:40:26 UTC (rev 9237) @@ -3,7 +3,9 @@ /etc/jetty/jetty-logging.xml /etc/jetty/jetty-jmx.xml /etc/jetty/jetty.xml -/etc/jetty/jetty-plus.xml +/etc/jetty/jetty-shared-webapps.xml +# not available yet - /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 Added: trunk/jetty/debian/jetty-shared-webapps.xml =================================================================== --- trunk/jetty/debian/jetty-shared-webapps.xml (rev 0) +++ trunk/jetty/debian/jetty-shared-webapps.xml 2009-07-13 20:40:26 UTC (rev 9237) @@ -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/java/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/java/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> Modified: trunk/jetty/debian/jetty.conf =================================================================== --- trunk/jetty/debian/jetty.conf 2009-07-13 20:35:01 UTC (rev 9236) +++ trunk/jetty/debian/jetty.conf 2009-07-13 20:40:26 UTC (rev 9237) @@ -1,3 +1,4 @@ # list of jetty configuration and property files /etc/jetty/jetty-logging.xml /etc/jetty/jetty.xml +/etc/jetty/jetty-shared-webapps.xml Added: trunk/jetty/debian/jetty.cron.daily =================================================================== --- trunk/jetty/debian/jetty.cron.daily (rev 0) +++ trunk/jetty/debian/jetty.cron.daily 2009-07-13 20:40:26 UTC (rev 9237) @@ -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 Modified: trunk/jetty/debian/jetty.default =================================================================== --- trunk/jetty/debian/jetty.default 2009-07-13 20:35:01 UTC (rev 9236) +++ trunk/jetty/debian/jetty.default 2009-07-13 20:40:26 UTC (rev 9237) @@ -43,3 +43,5 @@ # 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 Modified: trunk/jetty/debian/jetty.dirs =================================================================== --- trunk/jetty/debian/jetty.dirs 2009-07-13 20:35:01 UTC (rev 9236) +++ trunk/jetty/debian/jetty.dirs 2009-07-13 20:40:26 UTC (rev 9237) @@ -2,7 +2,6 @@ etc/jetty/contexts usr/share/jetty usr/share/doc/jetty -usr/share/doc/jetty/api var/lib/jetty/webapps var/log/jetty var/cache/jetty Modified: trunk/jetty/debian/jetty.init =================================================================== --- trunk/jetty/debian/jetty.init 2009-07-13 20:35:01 UTC (rev 9236) +++ trunk/jetty/debian/jetty.init 2009-07-13 20:40:26 UTC (rev 9237) @@ -71,6 +71,7 @@ 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=/tmp/jetty-temp @@ -125,12 +126,12 @@ /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 @@ -193,8 +194,8 @@ # Define other required variables PIDFILE="/var/run/$NAME.pid" WEBAPPDIR="$JETTY_HOME/webapps" -BOOTSTRAP_CLASS=org.mortbay.start.Bootstrap -JSVC_CLASSPATH="/usr/share/java/commons-daemon.jar:$START_JAR:$JAVA_HOME/lib/tools.jar" +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) Modified: trunk/jetty/debian/jetty.install =================================================================== --- trunk/jetty/debian/jetty.install 2009-07-13 20:35:01 UTC (rev 9236) +++ trunk/jetty/debian/jetty.install 2009-07-13 20:40:26 UTC (rev 9237) @@ -1,4 +1,5 @@ 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 @@ -10,5 +11,4 @@ LICENSES/ccla-* usr/share/doc/jetty/LICENSES LICENSES/contrib usr/share/doc/jetty/LICENSES LICENSES/NOTICE.txt usr/share/doc/jetty/LICENSES -javadoc/* usr/share/doc/jetty/api debian/README.Debian usr/share/doc/jetty Modified: trunk/jetty/debian/jetty.links =================================================================== --- trunk/jetty/debian/jetty.links 2009-07-13 20:35:01 UTC (rev 9236) +++ trunk/jetty/debian/jetty.links 2009-07-13 20:40:26 UTC (rev 9237) @@ -2,4 +2,5 @@ var/log/jetty usr/share/jetty/logs etc/jetty usr/share/jetty/etc etc/jetty/contexts usr/share/jetty/contexts -usr/share/doc/jetty/api usr/share/jetty/javadoc +usr/share/doc/libjetty-java-doc/api usr/share/jetty/javadoc + Deleted: trunk/jetty/debian/libjetty-extra-java.install =================================================================== --- trunk/jetty/debian/libjetty-extra-java.install 2009-07-13 20:35:01 UTC (rev 9236) +++ trunk/jetty/debian/libjetty-extra-java.install 2009-07-13 20:40:26 UTC (rev 9237) @@ -1,9 +0,0 @@ -lib/management/jetty-management-6*.jar usr/share/jetty/lib/management -lib/naming/jetty-naming-6*.jar usr/share/jetty/lib/naming -#lib/plus/jetty-plus-6*.jar usr/share/jetty/lib/plus -lib/ext/jetty-html-6*.jar usr/share/jetty/lib/ext -lib/ext/jetty-servlet-tester-6*.jar usr/share/jetty/lib/ext -lib/ext/jetty-ajp-6*.jar usr/share/jetty/lib/ext -lib/ext/jetty-java5-threadpool-6*.jar usr/share/jetty/lib/ext -lib/ext/jetty-client-6*.jar usr/share/jetty/lib/ext -lib/ext/jetty-rewrite-handler-6*.jar usr/share/jetty/lib/ext Modified: trunk/jetty/debian/libjetty-extra-java.links =================================================================== --- trunk/jetty/debian/libjetty-extra-java.links 2009-07-13 20:35:01 UTC (rev 9236) +++ trunk/jetty/debian/libjetty-extra-java.links 2009-07-13 20:40:26 UTC (rev 9237) @@ -14,11 +14,3 @@ usr/share/java/slf4j-simple.jar usr/share/jetty/lib/jsp-2.1/slf4j-simple.jar usr/share/java/xercesImpl.jar usr/share/jetty/lib/jsp-2.1/xercesImpl.jar usr/share/java/xmlParserAPIs.jar usr/share/jetty/lib/jsp-2.1/xmlParserAPIs.jar -usr/share/jetty/lib/management/jetty-management-$VERSION.jar usr/share/java/jetty-management.jar -usr/share/jetty/lib/naming/jetty-naming-$VERSION.jar usr/share/java/jetty-naming.jar -usr/share/jetty/lib/ext/jetty-servlet-tester-$VERSION.jar usr/share/java/jetty-servlet-tester.jar -usr/share/jetty/lib/ext/jetty-ajp-$VERSION.jar usr/share/java/jetty-ajp.jar -usr/share/jetty/lib/ext/jetty-java5-threadpool-$VERSION.jar usr/share/java/jetty-java5-threadpool.jar -usr/share/jetty/lib/ext/jetty-client-$VERSION.jar usr/share/java/jetty-client.jar -usr/share/jetty/lib/ext/jetty-rewrite-handler-$VERSION.jar usr/share/java/jetty-rewrite-handler.jar - Added: trunk/jetty/debian/libjetty-extra-java.poms =================================================================== --- trunk/jetty/debian/libjetty-extra-java.poms (rev 0) +++ trunk/jetty/debian/libjetty-extra-java.poms 2009-07-13 20:40:26 UTC (rev 9237) @@ -0,0 +1,9 @@ +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 + Added: trunk/jetty/debian/libjetty-java-doc.doc-base =================================================================== --- trunk/jetty/debian/libjetty-java-doc.doc-base (rev 0) +++ trunk/jetty/debian/libjetty-java-doc.doc-base 2009-07-13 20:40:26 UTC (rev 9237) @@ -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-doc/api/index.html +Files: /usr/share/doc/libjetty-java-doc/api/* Added: trunk/jetty/debian/libjetty-java-doc.docs =================================================================== --- trunk/jetty/debian/libjetty-java-doc.docs (rev 0) +++ trunk/jetty/debian/libjetty-java-doc.docs 2009-07-13 20:40:26 UTC (rev 9237) @@ -0,0 +1 @@ +api/ Deleted: trunk/jetty/debian/libjetty-java.install =================================================================== --- trunk/jetty/debian/libjetty-java.install 2009-07-13 20:35:01 UTC (rev 9236) +++ trunk/jetty/debian/libjetty-java.install 2009-07-13 20:40:26 UTC (rev 9237) @@ -1,5 +0,0 @@ -lib/jetty-util-6*.jar usr/share/jetty/lib -lib/util5/jetty-util5-6*.jar usr/share/jetty/lib/jre1.5 -lib/jetty-6*.jar usr/share/jetty/lib -lib/sslengine/jetty-sslengine-6*.jar usr/share/jetty/lib/ext -start.jar usr/share/jetty Modified: trunk/jetty/debian/libjetty-java.links =================================================================== --- trunk/jetty/debian/libjetty-java.links 2009-07-13 20:35:01 UTC (rev 9236) +++ trunk/jetty/debian/libjetty-java.links 2009-07-13 20:40:26 UTC (rev 9237) @@ -1,6 +1,2 @@ -usr/share/java/servlet-api-2.5.jar usr/share/jetty/lib/servlet-api-2.5.jar -usr/share/jetty/lib/jetty-util-$VERSION.jar usr/share/java/jetty-util.jar -usr/share/jetty/lib/util5/jetty-util5-$VERSION.jar usr/share/java/jetty-util5.jar -usr/share/jetty/lib/jetty-$VERSION.jar usr/share/java/jetty.jar -usr/share/jetty/lib/sslengine/jetty-sslengine-$VERSION.jar usr/share/java/jetty-sslengine.jar -usr/share/jetty/start.jar usr/share/java/jetty-start.jar +usr/share/java/servlet-api-2.5.jar usr/share/jetty/lib/servlet-api-2.5.jar + Added: trunk/jetty/debian/libjetty-java.poms =================================================================== --- trunk/jetty/debian/libjetty-java.poms (rev 0) +++ trunk/jetty/debian/libjetty-java.poms 2009-07-13 20:40:26 UTC (rev 9237) @@ -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 + Deleted: trunk/jetty/debian/libjetty-setuid-java.install =================================================================== --- trunk/jetty/debian/libjetty-setuid-java.install 2009-07-13 20:35:01 UTC (rev 9236) +++ trunk/jetty/debian/libjetty-setuid-java.install 2009-07-13 20:40:26 UTC (rev 9237) @@ -1,3 +0,0 @@ -lib/ext/jetty-setuid-6*.jar usr/share/jetty/lib/ext -lib/ext/libsetuid.so usr/lib/jetty - Deleted: trunk/jetty/debian/libjetty-setuid-java.links =================================================================== --- trunk/jetty/debian/libjetty-setuid-java.links 2009-07-13 20:35:01 UTC (rev 9236) +++ trunk/jetty/debian/libjetty-setuid-java.links 2009-07-13 20:40:26 UTC (rev 9237) @@ -1 +0,0 @@ -usr/lib/jetty/libsetuid.so usr/share/jetty/lib/ext/libsetuid.so Added: trunk/jetty/debian/libjetty-setuid-java.poms =================================================================== --- trunk/jetty/debian/libjetty-setuid-java.poms (rev 0) +++ trunk/jetty/debian/libjetty-setuid-java.poms 2009-07-13 20:40:26 UTC (rev 9237) @@ -0,0 +1,3 @@ +extras/setuid/pom.xml +extras/setuid/modules/java/pom.xml + Added: trunk/jetty/debian/maven.rules =================================================================== --- trunk/jetty/debian/maven.rules (rev 0) +++ trunk/jetty/debian/maven.rules 2009-07-13 20:40:26 UTC (rev 9237) @@ -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/ Modified: trunk/jetty/debian/rules =================================================================== --- trunk/jetty/debian/rules 2009-07-13 20:35:01 UTC (rev 9236) +++ trunk/jetty/debian/rules 2009-07-13 20:40:26 UTC (rev 9237) @@ -2,7 +2,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk PACKAGE := $(DEB_SOURCE_PACKAGE) VERSION := $(DEB_UPSTREAM_VERSION) @@ -14,10 +13,26 @@ DEB_ANT_ARGS := -DVERSION=$(VERSION) -Dbuild.sysclasspath=last #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/lib/usr/share/java/servlet-api-2.5.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/$(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 +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 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 @@ -32,6 +47,12 @@ build/lib$(PACKAGE)-setuid-java:: lib/ext/libsetuid.so +binary-post-install/lib$(PACKAGE)-setuid-java:: + mh_installpoms -plib$(PACKAGE)-setuid-java + mh_installjar -plib$(PACKAGE)-setuid-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 + dh_install -plib$(PACKAGE)-setuid-java --sourcedir=lib/ext libsetuid.so /usr/lib/jetty + dh_link -plib$(PACKAGE)-setuid-java /usr/lib/jetty/libsetuid.so /usr/share/jetty/lib/ext/libsetuid.so + get-orig-source: uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename Modified: trunk/jetty/debian/start.config =================================================================== --- trunk/jetty/debian/start.config 2009-07-13 20:35:01 UTC (rev 9236) +++ trunk/jetty/debian/start.config 2009-07-13 20:40:26 UTC (rev 9237) @@ -29,7 +29,7 @@ # 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 +# 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. @@ -38,9 +38,8 @@ $(jetty.class.path) always $(jetty.lib)/** exists $(jetty.lib) +jetty.home=/usr/share/jetty always -jetty.home=/usr/share/jetty always - # The main class to run org.mortbay.xml.XmlConfiguration.class $(start.class).class @@ -55,7 +54,7 @@ /usr/share/java/gnumail.jar /usr/share/java/activation.jar /usr/share/java/ant.jar - + # Set the jetty classpath /usr/share/jetty/lib/** Modified: trunk/jetty/debian/watch =================================================================== --- trunk/jetty/debian/watch 2009-07-13 20:35:01 UTC (rev 9236) +++ trunk/jetty/debian/watch 2009-07-13 20:40:26 UTC (rev 9237) @@ -1,3 +1,3 @@ version=3 http://svn.codehaus.org/jetty/jetty/tags/ \ - jetty-([0-9].*)/ debian debian/orig-tar.sh + jetty-([0-6].*)/ debian debian/orig-tar.sh _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
