This is an automated email from the git hooks/post-receive script. xhaakon-guest pushed a commit to branch master in repository jetty9.
commit 6c74abb1631f38380f6f4cd7f22099a5eba94c80 Author: Jakub Adam <[email protected]> Date: Sun Mar 4 12:33:09 2012 +0100 Updated debian directory --- debian/NEWS | 10 --- debian/README.Debian-source | 60 ------------- debian/README.source | 21 ----- debian/build.xml | 160 ---------------------------------- debian/changelog | 6 ++ debian/control | 63 ++++++-------- debian/jetty-shared-webapps.xml | 4 +- debian/jetty.init | 14 +-- debian/jetty.install | 37 +++++--- debian/libjetty-extra-java.dirs | 5 -- debian/libjetty-extra-java.links | 30 +++---- debian/libjetty-extra-java.poms | 19 ++--- debian/libjetty-java.dirs | 1 - debian/libjetty-java.links | 3 +- debian/libjetty-java.poms | 44 ++++++++-- debian/maven.ignoreRules | 20 +++++ debian/maven.properties | 1 + debian/maven.rules | 22 ++++- debian/module.xml | 179 --------------------------------------- debian/patches/series | 1 - debian/root-webapp/index.html | 4 +- debian/rules | 99 +++++++++------------- debian/start.config | 62 -------------- 23 files changed, 203 insertions(+), 662 deletions(-) diff --git a/debian/NEWS b/debian/NEWS deleted file mode 100644 index e64cb96..0000000 --- a/debian/NEWS +++ /dev/null @@ -1,10 +0,0 @@ -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-source b/debian/README.Debian-source deleted file mode 100644 index 909d065..0000000 --- a/debian/README.Debian-source +++ /dev/null @@ -1,60 +0,0 @@ -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 deleted file mode 100644 index e9cb8d1..0000000 --- a/debian/README.source +++ /dev/null @@ -1,21 +0,0 @@ -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/build.xml b/debian/build.xml deleted file mode 100644 index 93adcee..0000000 --- a/debian/build.xml +++ /dev/null @@ -1,160 +0,0 @@ -<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 index cd33247..206c6ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +jetty (8.1.1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Jakub Adam <[email protected]> Thu, 01 Mar 2012 21:05:15 +0100 + jetty (6.1.24-6) unstable; urgency=medium * Removed Depends on JREs for library packages, no longer required diff --git a/debian/control b/debian/control index 39aef43..dd8b468 100644 --- a/debian/control +++ b/debian/control @@ -6,9 +6,10 @@ Uploaders: Michael Koch <[email protected]>, Thierry Carrez <thierry.carrez@ubunt 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 + javahelper, maven-debian-helper, libbuild-helper-maven-plugin-java, libgnumail-java (>= 1.1.2-7), + libgnujaf-java, junit, libtomcat7-java (>= 7.0.26), default-jdk-doc, libmaven-bundle-plugin-java, + libmockito-java, glassfish-jmac-api (>= 1:2.1.1-b31g-2), libgeronimo-jta-1.1-spec-java, + libjstl1.1-java, libservlet3.0-java 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 @@ -16,7 +17,7 @@ Homepage: http://jetty.mortbay.com/ Package: libjetty-java Architecture: all -Depends: ${misc:Depends}, libservlet2.5-java, libslf4j-java +Depends: ${misc:Depends}, libservlet3.0-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. @@ -24,26 +25,26 @@ Description: Java servlet engine and webserver -- core libraries 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-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 +Depends: ${misc:Depends}, libjetty-java (>= ${source:Version}), + libtomcat7-java (>= 7.0.26), libasm3-java, libgnujaf-java, + libgnumail-java, libjakarta-taglibs-standard-java, libservlet3.0-java, + jstl1.1-java Suggests: jetty Description: Java servlet engine and webserver -- extra libraries Jetty is an Open Source HTTP Servlet Server written in 100% Java. @@ -54,27 +55,11 @@ Description: Java servlet engine and webserver -- extra libraries 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}), + adduser, apache2-utils, default-jre-headless | java5-runtime-headless | java6-runtime-headless +Suggests: libjetty-extra-java (>= ${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. diff --git a/debian/jetty-shared-webapps.xml b/debian/jetty-shared-webapps.xml index d076928..1c09ada 100644 --- a/debian/jetty-shared-webapps.xml +++ b/debian/jetty-shared-webapps.xml @@ -11,7 +11,7 @@ <!-- =============================================================== --> -<Configure id="Server" class="org.mortbay.jetty.Server"> +<Configure id="Server" class="org.eclipse.jetty.server.Server"> <!-- =========================================================== --> <!-- Configure the webapp deployer. --> @@ -28,7 +28,7 @@ <!-- =========================================================== --> <Call name="addLifeCycle"> <Arg> - <New class="org.mortbay.jetty.deployer.WebAppDeployer"> + <New class="org.eclipse.jetty.deploy.WebAppDeployer"> <Set name="contexts"><Ref id="Contexts"/></Set> <Set name="webAppDir">/usr/share/jetty/webapps</Set> <Set name="parentLoaderPriority">false</Set> diff --git a/debian/jetty.init b/debian/jetty.init index b304549..55cf135 100644 --- a/debian/jetty.init +++ b/debian/jetty.init @@ -67,7 +67,6 @@ 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 @@ -194,11 +193,13 @@ 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" +BOOTSTRAP_CLASS=org.eclipse.jetty.start.Main +START_CLASSPATH="/usr/share/java/commons-daemon.jar:$START_JAR:$JAVA_HOME/lib/tools.jar" ROTATELOGS=/usr/sbin/rotatelogs HOSTNAME=$(uname -n) +JAVA_OPTIONS="$JAVA_OPTIONS -cp $START_CLASSPATH" + ################################################## # Check for JAVA_HOME ################################################## @@ -292,10 +293,9 @@ case "$1" in 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 + start-stop-daemon --start --pidfile "$PIDFILE" --chuid "$JETTY_USER" \ + --chdir "$JETTY_HOME" --background --make-pidfile --startas $JAVA -- \ + $JAVA_OPTIONS $BOOTSTRAP_CLASS $JETTY_ARGS --daemon $CONFIGS log_daemon_msg "$DESC started, reachable on http://$HOSTNAME:$JETTY_PORT/."; "$NAME" diff --git a/debian/jetty.install b/debian/jetty.install index d6616fc..2ddc0cc 100644 --- a/debian/jetty.install +++ b/debian/jetty.install @@ -1,12 +1,25 @@ -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 +jetty-webapp/src/main/config/etc/* etc/jetty +jetty-policy/src/main/config/etc/* etc/jetty +jetty-security/src/main/config/etc/* etc/jetty +jetty-server/src/main/config/etc/* etc/jetty +jetty-ajp/src/main/config/etc/* etc/jetty +jetty-annotations/src/main/config/etc/* etc/jetty +jetty-monitor/src/main/config/etc/* etc/jetty +jetty-overlay-deployer/src/main/config/etc/* etc/jetty +jetty-rewrite/src/main/config/etc/* etc/jetty +jetty-plus/src/main/config/etc/* etc/jetty +jetty-util/src/main/config/etc/* etc/jetty +jetty-jmx/src/main/config/etc/* etc/jetty +debian/jetty-shared-webapps.xml etc/jetty +debian/jetty.conf etc/jetty + +debian/root-webapp/* var/lib/jetty/webapps/root +test-jetty-webapp/src/main/webapp/jetty_banner.gif var/lib/jetty/webapps/root +jetty-distribution/src/main/resources/contexts etc/jetty +jetty-distribution/src/main/resources/resources usr/share/jetty +jetty-start/target/classes/org/eclipse/jetty/start/start.config etc/jetty + +LICENSE-CONTRIBUTOR/cla-* usr/share/doc/jetty/LICENSES +LICENSE-CONTRIBUTOR/ccla-* usr/share/doc/jetty/LICENSES +NOTICE.txt usr/share/doc/jetty/LICENSES +debian/README.Debian usr/share/doc/jetty diff --git a/debian/libjetty-extra-java.dirs b/debian/libjetty-extra-java.dirs index cfab775..61cf297 100644 --- a/debian/libjetty-extra-java.dirs +++ b/debian/libjetty-extra-java.dirs @@ -1,6 +1 @@ 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 index a464167..aae25cc 100644 --- a/debian/libjetty-extra-java.links +++ b/debian/libjetty-extra-java.links @@ -1,18 +1,12 @@ -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 +usr/share/java/tomcat-annotations-api.jar usr/share/jetty/lib/annotations/javax.annotation.jar +usr/share/java/asm3.jar usr/share/jetty/lib/annotations/org.objectweb.asm.jar +usr/share/java/asm3-commons.jar usr/share/jetty/lib/annotations/org.objectweb.asm.commons.jar + +usr/share/java/activation.jar usr/share/jetty/lib/jndi/javax.activation.jar +usr/share/java/gnumail.jar usr/share/jetty/lib/jndi/javax.mail.jar + +usr/share/java/tomcat-jsp-api-2.2.jar usr/share/jetty/lib/jsp/javax.servlet.jsp.jar +usr/share/java/tomcat-jasper.jar usr/share/jetty/lib/jsp/org.apache.jasper.jar +usr/share/java/jstl1.1.jar usr/share/jetty/lib/jsp/javax.servlet.jsp.jstl.jar +usr/share/java/tomcat-el-api-2.2.jar usr/share/jetty/lib/jsp/javax.el.jar +usr/share/java/standard.jar usr/share/jetty/lib/jsp/org.apache.taglibs.standard.jar diff --git a/debian/libjetty-extra-java.poms b/debian/libjetty-extra-java.poms index 83c5a63..b0463df 100644 --- a/debian/libjetty-extra-java.poms +++ b/debian/libjetty-extra-java.poms @@ -1,13 +1,6 @@ -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 - +jetty-ajp/pom.xml --java-lib --usj-name=jetty-ajp +jetty-annotations/pom.xml --java-lib --usj-name=jetty-annotations +jetty-client/pom.xml --java-lib --usj-name=jetty-client +jetty-jndi/pom.xml --java-lib --usj-name=jetty-jndi +jetty-monitor/pom.xml --java-lib --usj-name=jetty-monitor +jetty-plus/pom.xml --java-lib --usj-name=jetty-plus diff --git a/debian/libjetty-java.dirs b/debian/libjetty-java.dirs index 541db3d..f0b415c 100644 --- a/debian/libjetty-java.dirs +++ b/debian/libjetty-java.dirs @@ -1,4 +1,3 @@ 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 index 94d8e06..b766370 100644 --- a/debian/libjetty-java.links +++ b/debian/libjetty-java.links @@ -1,2 +1 @@ -usr/share/java/servlet-api-2.5.jar usr/share/jetty/lib/servlet-api-2.5.jar - +usr/share/java/tomcat-servlet-api-3.0.jar usr/share/jetty/lib/servlet-api-3.0.jar diff --git a/debian/libjetty-java.poms b/debian/libjetty-java.poms index c58bddb..a497384 100644 --- a/debian/libjetty-java.poms +++ b/debian/libjetty-java.poms @@ -1,8 +1,40 @@ 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 +jetty-webapp/pom.xml --java-lib --usj-name=jetty-webapp +jetty-policy/pom.xml --java-lib --usj-name=jetty-policy +jetty-jsp/pom.xml +jetty-security/pom.xml --java-lib --usj-name=jetty-security +jetty-server/pom.xml --java-lib --usj-name=jetty-server +jetty-jndi/pom.xml --ignore-pom +jetty-xml/pom.xml --java-lib --usj-name=jetty-xml +jetty-aggregate/jetty-webapp/pom.xml +jetty-aggregate/jetty-server/pom.xml +jetty-aggregate/jetty-all/pom.xml +jetty-aggregate/jetty-all-server/pom.xml +jetty-aggregate/jetty-client/pom.xml +jetty-aggregate/jetty-plus/pom.xml --ignore-pom +jetty-aggregate/pom.xml +jetty-aggregate/jetty-websocket/pom.xml --java-lib --usj-name=jetty-websocket +jetty-aggregate/jetty-servlet/pom.xml --java-lib --usj-name=jetty-servlet +jetty-ajp/pom.xml --ignore-pom +jetty-continuation/pom.xml --java-lib --usj-name=jetty-continuation +jetty-annotations/pom.xml --ignore-pom +jetty-nosql/pom.xml --ignore-pom +jetty-monitor/pom.xml --ignore-pom +jetty-client/pom.xml --ignore-pom +jetty-overlay-deployer/pom.xml --java-lib --usj-name=jetty-overlay-deployer +jetty-rewrite/pom.xml --java-lib --usj-name=jetty-rewrite +jetty-plus/pom.xml --ignore-pom +jetty-deploy/pom.xml --java-lib --usj-name=jetty-deploy +jetty-distribution/pom.xml +jetty-http/pom.xml --java-lib --usj-name=jetty-http +jetty-nested/pom.xml +jetty-websocket/pom.xml +jetty-start/pom.xml --java-lib --usj-name=jetty-start +jetty-http-spi/pom.xml +jetty-io/pom.xml --java-lib --usj-name=jetty-io +jetty-util/pom.xml --java-lib --usj-name=jetty-util +jetty-jaspi/pom.xml +jetty-jmx/pom.xml --java-lib --usj-name=jetty-jmx +jetty-servlets/pom.xml --java-lib --usj-name=jetty-servlets +jetty-servlet/pom.xml --java-lib --usj-name=jetty-servlet diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..a7f4f01 --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,20 @@ +* maven-release-plugin * * * * +org.apache.derby derby * * * * +org.apache.maven.plugins maven-assembly-plugin * * * * +org.apache.maven.plugins maven-dependency-plugin * * * * +org.apache.maven.plugins maven-eclipse-plugin * * * * +org.apache.maven.plugins maven-enforcer-plugin * * * * +#org.apache.maven.plugins maven-javadoc-plugin * * * * +org.apache.maven.plugins maven-pmd-plugin * * * * +org.apache.maven.plugins maven-remote-resources-plugin * * * * +org.apache.maven.plugins maven-source-plugin * * * * +org.codehaus.mojo findbugs-maven-plugin * * * * +org.eclipse.equinox.http servlet * * * * +org.eclipse.jetty test-jetty-servlet * * * * +org.eclipse.jetty test-jetty-webapp * * * * +org.eclipse.jetty.orbit com.sun.el * * * * +org.eclipse.jetty.orbit org.apache.taglibs.standard.glassfish * * * * +org.eclipse.jetty.orbit org.eclipse.jdt.core * * * * +org.eclipse.jetty.toolchain jetty-test-helper * * * * +org.eclipse.jetty.toolchain jetty-version-maven-plugin * * * * +org.ops4j.pax.exam * * * * * diff --git a/debian/maven.properties b/debian/maven.properties new file mode 100644 index 0000000..d2f1b82 --- /dev/null +++ b/debian/maven.properties @@ -0,0 +1 @@ +maven.test.skip=true diff --git a/debian/maven.rules b/debian/maven.rules index 38888d9..15767d4 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,4 +1,18 @@ -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/ +asm asm-commons * 3.x * * +javax.servlet jstl jar s/.*/1.1/ * * +s/javax.servlet.jsp/org.apache.tomcat/ s/jsp-api/tomcat-jsp-api/ jar s/.*/debian/ * * +junit junit * s/4\..*/4.x/ * * +org.apache.felix maven-bundle-plugin * s/.*/2.3.5/ * * +s/org.eclipse.jetty.orbit/asm/ s/org.objectweb.asm/asm/ jar s/.*/3.x/ * * +s/org.eclipse.jetty.orbit/javax.mail/ s/javax.mail.glassfish/gnumail/ jar s/.*/debian/ * * +s/org.eclipse.jetty.orbit/javax.security.auth.message/ s/javax.security.auth.message/jmac-api/ jar s/.*/debian/ * * +s/org.eclipse.jetty.orbit/org.apache.geronimo.specs/ s/javax.transaction/geronimo-jta_1.1_spec/ jar s/.*/debian/ * * +s/org.eclipse.jetty.orbit/javax.activation/ s/javax.activation/gnujaf/ jar s/.*/debian/ * * +s/org.eclipse.jetty.orbit/org.apache.tomcat/ s/javax.annotation/tomcat-annotations-api/ jar s/.*/debian/ * * +s/org.eclipse.jetty.orbit/org.apache.tomcat/ s/javax.el/tomcat-el-api/ jar s/.*/debian/ * * +s/org.eclipse.jetty.orbit/org.apache.tomcat/ s/javax.servlet/tomcat-servlet-api/ jar s/.*/debian/ * * +s/org.eclipse.jetty.orbit/org.apache.tomcat/ s/javax.servlet.jsp/tomcat-jsp-api/ jar s/.*/debian/ * * +s/org.eclipse.jetty.orbit/javax.servlet/ s/javax.servlet.jsp.jstl/jstl/ jar s/.*/1.1/ * * +s/org.eclipse.jetty.orbit/org.apache.tomcat/ s/org.apache.jasper.glassfish/tomcat-jasper/ jar s/.*/debian/ * * +s/org.mortbay.jetty/org.apache.tomcat/ s/servlet-api/tomcat-servlet-api/ jar s/.*/debian/ * * +org.mortbay.jetty jetty-util * s/6\..*/6.x/ * * diff --git a/debian/module.xml b/debian/module.xml deleted file mode 100644 index a00a783..0000000 --- a/debian/module.xml +++ /dev/null @@ -1,179 +0,0 @@ -<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/patches/series b/debian/patches/series deleted file mode 100644 index 987ef29..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -01_add_manifests_with_osgi_bundles_info.patch diff --git a/debian/root-webapp/index.html b/debian/root-webapp/index.html index dc30e0e..94c600c 100644 --- a/debian/root-webapp/index.html +++ b/debian/root-webapp/index.html @@ -1,12 +1,12 @@ <HTML> <HEAD> - <TITLE>Welcome to Jetty 6 on Debian</TITLE> + <TITLE>Welcome to Jetty 8 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> +<h1>Welcome to Jetty 8 on Debian</h1> <P align="justify"> <b>Jetty</b> is a 100% Java HTTP Server and Servlet Container. This means diff --git a/debian/rules b/debian/rules index b08e37c..cbcd8d8 100755 --- a/debian/rules +++ b/debian/rules @@ -1,68 +1,51 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +include /usr/share/cdbs/1/class/javahelper.mk +include /usr/share/cdbs/1/class/maven.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/ +JAVA_HOME := /usr/lib/jvm/default-java -# Some java sources contain UTF-8 characters, build fails with C locale -export LC_ALL=C.UTF-8 - -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 +DEB_MAVEN_INSTALL_TARGET := +DEB_MAVEN_DOC_TARGET := +DEB_MAVEN_ARGS := -P-aggregates -P-osgi -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 +LIBJETTY_JARS := continuation deploy http io jmx overlay-deployer policy rewrite security \ + server servlet servlets start util webapp xml -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 +LIBJETTY_EXTRA_JARS := ajp annotations client jndi monitor plus -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 +# Some java sources contain UTF-8 characters, build fails with C locale +export LC_ALL=C.UTF-8 -# No documentation released yet. -#binary-post-install/$(PACKAGE)-doc:: +install/libjetty-java:: libjetty-java-mh-install + version=$(wildcard debian/libjetty-java/usr/share/maven-repo/org/eclipse/jetty/jetty-server/8*); \ + version=$$(basename $$version); \ + for lib in $(LIBJETTY_JARS); do \ + mh_installjar -plibjetty-java --java-lib --usj-name=jetty-$$lib \ + jetty-$$lib/pom.xml jetty-$$lib/target/jetty-$$lib-*.jar; \ + if [ $$lib = "start" ]; then \ + continue; \ + fi; \ + jar=jetty-$$lib-$$version.jar; \ + dh_link -plibjetty-java usr/share/java/$$jar usr/share/jetty/lib/$$jar; \ + done; \ + dh_link -plibjetty-java usr/share/java/jetty-start-$$version.jar usr/share/jetty/start.jar + +install/libjetty-extra-java:: libjetty-extra-java-mh-install + version=$(wildcard debian/libjetty-extra-java/usr/share/maven-repo/org/eclipse/jetty/jetty-ajp/8*); \ + version=$$(basename $$version); \ + for lib in $(LIBJETTY_EXTRA_JARS); do \ + mh_installjar -plibjetty-extra-java --java-lib --usj-name=jetty-$$lib \ + jetty-$$lib/pom.xml jetty-$$lib/target/jetty-$$lib-*.jar; \ + if [ $$lib = "monitor" ]; then \ + continue; \ + fi; \ + jar=jetty-$$lib-$$version.jar; \ + dh_link -plibjetty-extra-java usr/share/java/$$jar usr/share/jetty/lib/$$jar; \ + done; \ + dh_link -plibjetty-extra-java usr/share/java/jetty-monitor-$$version.jar usr/share/jetty/lib/monitor/jetty-monitor.jar + +%-mh-install: + mh_install -p$(patsubst %-mh-install,%,$@) diff --git a/debian/start.config b/debian/start.config deleted file mode 100644 index a8db0f5..0000000 --- a/debian/start.config +++ /dev/null @@ -1,62 +0,0 @@ -# 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/ -- 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
