[pkg-java] r12553 - trunk/jetty/debian
Torsten Werner
twerner at alioth.debian.org
Fri Jun 11 15:37:41 UTC 2010
Author: twerner
Date: 2010-06-11 15:37:40 +0000 (Fri, 11 Jun 2010)
New Revision: 12553
Modified:
trunk/jetty/debian/README.Debian-source
trunk/jetty/debian/TODO
trunk/jetty/debian/build.xml
trunk/jetty/debian/changelog
trunk/jetty/debian/control
trunk/jetty/debian/jetty-extra.conf
trunk/jetty/debian/libjetty-extra-java.dirs
trunk/jetty/debian/libjetty-extra-java.links
trunk/jetty/debian/libjetty-extra-java.poms
trunk/jetty/debian/rules
Log:
Enable jetty-plus and jetty-annotations modules. (Closes: #585387).
Modified: trunk/jetty/debian/README.Debian-source
===================================================================
--- trunk/jetty/debian/README.Debian-source 2010-06-11 14:21:39 UTC (rev 12552)
+++ trunk/jetty/debian/README.Debian-source 2010-06-11 15:37:40 UTC (rev 12553)
@@ -1,58 +1,60 @@
jetty for Debian
----------------
-BUILD DEPENDENCIES:
- cdbs
- debhelper
- devscripts
- fakeroot
-
- JAVA DEBS:
- ant
- libservlet2.5-java
- libmx4j-java
- libgnumail-java
- libgnujaf-java
-
--------------------------------------------------------------------
-
-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
- - The standalone http server (depends: libjetty-java)
- - includes:
- scripts, config files, docs
+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
Modified: trunk/jetty/debian/TODO
===================================================================
--- trunk/jetty/debian/TODO 2010-06-11 14:21:39 UTC (rev 12552)
+++ trunk/jetty/debian/TODO 2010-06-11 15:37:40 UTC (rev 12553)
@@ -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
Modified: trunk/jetty/debian/build.xml
===================================================================
--- trunk/jetty/debian/build.xml 2010-06-11 14:21:39 UTC (rev 12552)
+++ trunk/jetty/debian/build.xml 2010-06-11 15:37:40 UTC (rev 12553)
@@ -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}"/>
Modified: trunk/jetty/debian/changelog
===================================================================
--- trunk/jetty/debian/changelog 2010-06-11 14:21:39 UTC (rev 12552)
+++ trunk/jetty/debian/changelog 2010-06-11 15:37:40 UTC (rev 12553)
@@ -1,6 +1,6 @@
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 +8,11 @@
- debian/rules, debian/control: Added junit and ant-optional needed for
tests
- -- Torsten Werner <twerner at debian.org> Tue, 04 May 2010 21:28:35 +0200
+ [ Miguel Landaeta ]
+ * Enable jetty-plus and jetty-annotations modules. (Closes: #585387).
+ -- Torsten Werner <twerner at debian.org> 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,
Modified: trunk/jetty/debian/control
===================================================================
--- trunk/jetty/debian/control 2010-06-11 14:21:39 UTC (rev 12552)
+++ trunk/jetty/debian/control 2010-06-11 15:37:40 UTC (rev 12553)
@@ -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-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
Modified: trunk/jetty/debian/jetty-extra.conf
===================================================================
--- trunk/jetty/debian/jetty-extra.conf 2010-06-11 14:21:39 UTC (rev 12552)
+++ trunk/jetty/debian/jetty-extra.conf 2010-06-11 15:37:40 UTC (rev 12553)
@@ -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
Modified: trunk/jetty/debian/libjetty-extra-java.dirs
===================================================================
--- trunk/jetty/debian/libjetty-extra-java.dirs 2010-06-11 14:21:39 UTC (rev 12552)
+++ trunk/jetty/debian/libjetty-extra-java.dirs 2010-06-11 15:37:40 UTC (rev 12553)
@@ -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
Modified: trunk/jetty/debian/libjetty-extra-java.links
===================================================================
--- trunk/jetty/debian/libjetty-extra-java.links 2010-06-11 14:21:39 UTC (rev 12552)
+++ trunk/jetty/debian/libjetty-extra-java.links 2010-06-11 15:37:40 UTC (rev 12553)
@@ -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
Modified: trunk/jetty/debian/libjetty-extra-java.poms
===================================================================
--- trunk/jetty/debian/libjetty-extra-java.poms 2010-06-11 14:21:39 UTC (rev 12552)
+++ trunk/jetty/debian/libjetty-extra-java.poms 2010-06-11 15:37:40 UTC (rev 12553)
@@ -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
Modified: trunk/jetty/debian/rules
===================================================================
--- trunk/jetty/debian/rules 2010-06-11 14:21:39 UTC (rev 12552)
+++ trunk/jetty/debian/rules 2010-06-11 15:37:40 UTC (rev 12553)
@@ -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
More information about the pkg-java-commits
mailing list