On Thu, Jun 10, 2010 at 07:08:40PM +0200, Torsten Werner wrote: > may you prepare a patch for the SVN HEAD, please? Your patch does not > apply without errors.
Sure, my bad for not checking if there was ongoing work on svn. Please see the attached patch. Thanks, -- Miguel Landaeta, miguel at miguel.cc secure email with PGP 0x7D8967E9 available at http://keyserver.pgp.com/ "Faith means not wanting to know what is true." -- Nietzsche
Index: control =================================================================== --- control (revision 12547) +++ control (working copy) @@ -7,7 +7,8 @@ Niels Thykier <[email protected]>, Pablo Duboue <[email protected]> Build-Depends: debhelper (>= 6), 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 + libgnujaf-java, libcommons-daemon-java, junit, libgeronimo-jta-1.0.1b-spec-java, + libtomcat6-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 @@ -40,7 +41,7 @@ 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) + 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 @@ -50,7 +51,7 @@ 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-client, jetty-rewrite-handler, jetty-plus, jetty-annotations Package: libjetty-extra Section: libs Index: libjetty-extra-java.dirs =================================================================== --- libjetty-extra-java.dirs (revision 12547) +++ libjetty-extra-java.dirs (working copy) @@ -3,3 +3,4 @@ usr/share/jetty/lib/management/mx4j usr/share/jetty/lib/naming usr/share/jetty/lib/jsp-2.1 +usr/share/jetty/lib/plus Index: build.xml =================================================================== --- build.xml (revision 12547) +++ build.xml (working copy) @@ -120,7 +120,19 @@ <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}"/> Index: jetty-extra.conf =================================================================== --- jetty-extra.conf (revision 12547) +++ jetty-extra.conf (working copy) @@ -4,7 +4,7 @@ /etc/jetty/jetty-jmx.xml /etc/jetty/jetty.xml /etc/jetty/jetty-shared-webapps.xml -# not available yet - /etc/jetty/jetty-plus.xml +/etc/jetty/jetty-plus.xml /etc/jetty/jetty-ajp.xml /etc/jetty/jetty-ssl.xml /etc/jetty/jetty-sslengine.xml Index: libjetty-extra-java.links =================================================================== --- libjetty-extra-java.links (revision 12547) +++ libjetty-extra-java.links (working copy) @@ -14,3 +14,5 @@ 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 Index: changelog =================================================================== --- changelog (revision 12547) +++ changelog (working copy) @@ -1,6 +1,7 @@ jetty (6.1.24-3) unstable; urgency=low * UNRELEASED + [ 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 @@ -8,8 +9,11 @@ - debian/rules, debian/control: Added junit and ant-optional needed for tests - -- Torsten Werner <[email protected]> Tue, 04 May 2010 21:28:35 +0200 + [ 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, Index: rules =================================================================== --- rules (revision 12547) +++ rules (working copy) @@ -6,7 +6,7 @@ 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 +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 @@ -27,13 +27,14 @@ 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-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 Index: libjetty-extra-java.poms =================================================================== --- libjetty-extra-java.poms (revision 12547) +++ libjetty-extra-java.poms (working copy) @@ -8,4 +8,6 @@ contrib/jetty-rewrite-handler/pom.xml extras/setuid/pom.xml extras/setuid/modules/java/pom.xml +modules/plus/pom.xml +modules/annotations/pom.xml Index: TODO =================================================================== --- TODO (revision 12547) +++ TODO (working copy) @@ -4,12 +4,6 @@ Modules to add: -jetty-plus - - geronimo-jta must be available as a deb package (build & runtime dependency) - -jetty-annotations - - genonimo-annotation must be available as a deb package (build & runtime dependency) - jetty-terracota jetty-xbean Index: README.Debian-source =================================================================== --- README.Debian-source (revision 12547) +++ README.Debian-source (working copy) @@ -13,6 +13,8 @@ libmx4j-java libgnumail-java libgnujaf-java + libtomcat6-java + geronimo-jta-1.0.1b-spec ------------------------------------------------------------------- @@ -50,7 +52,7 @@ 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-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)
