Bug#585387: Please enable jetty-plus and jetty-annotations modules
Miguel Landaeta
miguel at miguel.cc
Thu Jun 10 02:37:51 UTC 2010
Package: jetty
Version: jetty_6.1.24-2
Severity: wishlist
Tags: patch
Now it should be possible to enable jetty-plus and
jetty-annotations modules.
Instead of committing these changes directly to the svn repo
I preferred someone else review these changes.
It works for me(tm).
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_US.UTF-8)
Shell: /bin/sh linked to /bin/bash
--
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
-------------- next part --------------
diff -Nru jetty-6.1.24/debian/build.xml jetty-6.1.24/debian/build.xml
--- jetty-6.1.24/debian/build.xml 2009-12-16 03:18:44.000000000 -0430
+++ jetty-6.1.24/debian/build.xml 2010-06-09 20:28:21.000000000 -0430
@@ -116,7 +116,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}"/>
diff -Nru jetty-6.1.24/debian/changelog jetty-6.1.24/debian/changelog
--- jetty-6.1.24/debian/changelog 2010-04-29 01:16:41.000000000 -0430
+++ jetty-6.1.24/debian/changelog 2010-06-09 21:43:15.000000000 -0430
@@ -1,3 +1,10 @@
+jetty (6.1.24-3) unstable; urgency=low
+
+ * Team upload.
+ * Enable jetty-plus and jetty-annotations modules. (Closes: #XXXXXX).
+
+ -- Miguel Landaeta <miguel at miguel.cc> Wed, 09 Jun 2010 21:42:27 -0430
+
jetty (6.1.24-2) unstable; urgency=low
* Set JAVA_HOME in d/rules to /usr/lib/jvm/default-java. (Closes: #578618,
diff -Nru jetty-6.1.24/debian/control jetty-6.1.24/debian/control
--- jetty-6.1.24/debian/control 2010-04-23 17:28:31.000000000 -0430
+++ jetty-6.1.24/debian/control 2010-06-09 21:29:05.000000000 -0430
@@ -7,7 +7,8 @@
Niels Thykier <niels at thykier.net>, Pablo Duboue <pablo.duboue at gmail.com>
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
+ libgnujaf-java, libcommons-daemon-java, 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
diff -Nru jetty-6.1.24/debian/jetty-extra.conf jetty-6.1.24/debian/jetty-extra.conf
--- jetty-6.1.24/debian/jetty-extra.conf 2009-07-13 16:10:26.000000000 -0430
+++ jetty-6.1.24/debian/jetty-extra.conf 2010-06-09 19:31:16.000000000 -0430
@@ -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
diff -Nru jetty-6.1.24/debian/libjetty-extra-java.dirs jetty-6.1.24/debian/libjetty-extra-java.dirs
--- jetty-6.1.24/debian/libjetty-extra-java.dirs 2009-06-27 16:38:18.000000000 -0430
+++ jetty-6.1.24/debian/libjetty-extra-java.dirs 2010-06-09 20:23:58.000000000 -0430
@@ -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
diff -Nru jetty-6.1.24/debian/libjetty-extra-java.links jetty-6.1.24/debian/libjetty-extra-java.links
--- jetty-6.1.24/debian/libjetty-extra-java.links 2009-07-13 16:10:26.000000000 -0430
+++ jetty-6.1.24/debian/libjetty-extra-java.links 2010-06-09 21:01:45.000000000 -0430
@@ -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
diff -Nru jetty-6.1.24/debian/libjetty-extra-java.poms jetty-6.1.24/debian/libjetty-extra-java.poms
--- jetty-6.1.24/debian/libjetty-extra-java.poms 2009-09-06 19:04:55.000000000 -0430
+++ jetty-6.1.24/debian/libjetty-extra-java.poms 2010-06-09 20:45:17.000000000 -0430
@@ -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
diff -Nru jetty-6.1.24/debian/README.Debian-source jetty-6.1.24/debian/README.Debian-source
--- jetty-6.1.24/debian/README.Debian-source 2009-06-18 14:57:24.000000000 -0430
+++ jetty-6.1.24/debian/README.Debian-source 2010-06-09 21:30:08.000000000 -0430
@@ -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)
diff -Nru jetty-6.1.24/debian/rules jetty-6.1.24/debian/rules
--- jetty-6.1.24/debian/rules 2010-04-29 01:16:41.000000000 -0430
+++ jetty-6.1.24/debian/rules 2010-06-09 20:44:57.000000000 -0430
@@ -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 mx4j mx4j-tools gnumail activation commons-daemon
+DEB_JARS := servlet-api-2.5 slf4j-api mx4j mx4j-tools gnumail activation commons-daemon 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
diff -Nru jetty-6.1.24/debian/TODO jetty-6.1.24/debian/TODO
--- jetty-6.1.24/debian/TODO 2009-07-13 16:10:26.000000000 -0430
+++ jetty-6.1.24/debian/TODO 2010-06-09 21:30:57.000000000 -0430
@@ -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
More information about the pkg-java-maintainers
mailing list