[guice] 04/12: Build and install the servlet extension

Thu Oct 9 15:15:39 BST 2014

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository guice.

commit 5e3e0be801d7e0eacfff9ba3ca7c1796cd543cd1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Oct 9 12:13:24 2014 +0200

    Build and install the servlet extension
---
 debian/changelog                                   |  1 +
 debian/control                                     |  1 +
 debian/libguice-java.poms                          |  1 +
 debian/maven.rules                                 |  1 +
 ...stedinject.diff => 03_system-dependencies.diff} | 46 ++++++++++++++++------
 debian/patches/series                              |  2 +-
 debian/rules                                       | 11 +++++-
 7 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d13c52d..8d01138 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 guice (3.0-6) UNRELEASED; urgency=medium
 
+  * Build and install the servlet extension
   * Fixed a build failure caused by the cglib/asm transition
   * Standards-Version updated to 3.9.6 (no changes)
 
diff --git a/debian/control b/debian/control
index de2b916..ba7ac48 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends: ant,
                libatinject-jsr330-api-java,
                libcglib3-java,
                libjarjar-java,
+               libservlet3.1-java,
                maven-debian-helper
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/guice.git
diff --git a/debian/libguice-java.poms b/debian/libguice-java.poms
index 09a13bc..ecf5b56 100644
--- a/debian/libguice-java.poms
+++ b/debian/libguice-java.poms
@@ -1,3 +1,4 @@
 core/pom.xml --no-parent
 extensions/pom.xml
 extensions/assistedinject/pom.xml
+extensions/servlet/pom.xml
diff --git a/debian/maven.rules b/debian/maven.rules
index 2a6531e..bb9cb0b 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1 +1,2 @@
 s/org.sonatype.sisu.inject/cglib/ cglib * s/.*/3.x/ * *
+javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * *
diff --git a/debian/patches/03_extensions-assistedinject.diff b/debian/patches/03_system-dependencies.diff
similarity index 55%
rename from debian/patches/03_extensions-assistedinject.diff
rename to debian/patches/03_system-dependencies.diff
index 1387890..4cda671 100644
--- a/debian/patches/03_extensions-assistedinject.diff
+++ b/debian/patches/03_system-dependencies.diff
@@ -1,18 +1,16 @@
-Description: Enable build of assistedinject extension
-Author: Miguel Landaeta <miguel at miguel.cc>
+Description: Enable build of extensions using the system dependencies
+Author: Miguel Landaeta <miguel at miguel.cc>, Emmanuel Bourg <ebourg at pache.org>
 Bug-Debian: http://bugs.debian.org/683644
-Forwarded: no
-Last-Update: 2012-08-09
-
---- guice-3.0.orig/extensions/assistedinject/build.properties
-+++ guice-3.0/extensions/assistedinject/build.properties
-@@ -5,3 +5,4 @@ build.dir=build
+Forwarded: not-needed
+--- a/extensions/assistedinject/build.properties
++++ b/extensions/assistedinject/build.properties
+@@ -5,3 +5,4 @@
  test.class=com.google.inject.assistedinject.FactoryProviderTest
  module=com.google.inject.assistedinject
  fragment=true
 +debian.lib.dir=/usr/share/java
---- guice-3.0.orig/extensions/assistedinject/build.xml
-+++ guice-3.0/extensions/assistedinject/build.xml
+--- a/extensions/assistedinject/build.xml
++++ b/extensions/assistedinject/build.xml
 @@ -5,8 +5,9 @@
    <import file="../../common.xml"/>
    
@@ -25,8 +23,8 @@ Last-Update: 2012-08-09
      <pathelement path="../../build/classes"/>
    </path>
  
---- guice-3.0.orig/common.xml
-+++ guice-3.0/common.xml
+--- a/common.xml
++++ b/common.xml
 @@ -139,11 +139,11 @@
      <mkdir dir="${build.dir}/dist"/>
      <dirname property="common.basedir" file="${ant.file.common}"/>
@@ -42,3 +40,27 @@ Last-Update: 2012-08-09
        <rule pattern="net.sf.cglib.*" result="com.google.inject.internal.cglib.$@1"/>
        <rule pattern="net.sf.cglib.**.*" result="com.google.inject.internal.cglib. at 1.$@2"/>
        <rule pattern="org.objectweb.asm.*" result="com.google.inject.internal.asm.$@1"/>
+--- a/extensions/servlet/build.properties
++++ b/extensions/servlet/build.properties
+@@ -6,3 +6,4 @@
+ test.class=com.google.inject.servlet.AllTests
+ module=com.google.inject.servlet
+ fragment=true
++debian.lib.dir=/usr/share/java
+--- a/extensions/servlet/build.xml
++++ b/extensions/servlet/build.xml
+@@ -5,10 +5,10 @@
+   <import file="../../common.xml"/>
+ 
+   <path id="compile.classpath">
+-    <fileset dir="${lib.dir}" includes="*.jar"/>
+-    <fileset dir="${lib.dir}/build" includes="*.jar"/>
+-  	<fileset dir="${ext.lib.dir}" includes="*.jar"/>
+-    <fileset dir="${ext.lib.dir}/build" includes="*.jar"/>
++    <fileset dir="${debian.lib.dir}">
++      <include name="atinject-jsr330-api.jar"/>
++      <include name="servlet-api-3.1.jar"/>
++    </fileset>
+     <pathelement path="../../build/classes"/>
+   </path>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 926d08a..4db286c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 01_fix_build.diff
 02_link_javadocs.diff
-03_extensions-assistedinject.diff
+03_system-dependencies.diff
 04_java8-compatibility.diff
 05_upgrade-asm-and-cglib.patch
diff --git a/debian/rules b/debian/rules
index 6d93e8c..e2cdbe0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,22 +11,31 @@ override_dh_auto_build:
 	ant -Dversion=$(VERSION) jar javadoc
 	# build assistedinject extension
 	cd extensions/assistedinject && ant -Dversion=$(VERSION) jar
+	cd extensions/servlet && ant -Dversion=$(VERSION) jar
 
 override_dh_auto_install:
 	dh_auto_install
+
 	# install main jar
 	mh_installjar -plibguice-java --set-version=$(VERSION) -l -v \
 		core/pom.xml build/dist/guice-$(VERSION).jar
 	mh_installpoms -plibguice-java --set-version=$(VERSION)
+
 	# install assistedinject extension
 	mh_installjar -plibguice-java --set-version=$(VERSION) -l -v \
 		extensions/assistedinject/pom.xml \
 		extensions/assistedinject/build/guice-assistedinject-$(VERSION).jar
 
+	# install servlet extension
+	mh_installjar -plibguice-java --set-version=$(VERSION) -l -v \
+		extensions/servlet/pom.xml \
+		extensions/servlet/build/guice-servlet-$(VERSION).jar
+
 override_dh_auto_clean:
 	dh_auto_clean
-	# clean assistedinject extension build files
+	# clean extensions build files
 	cd extensions/assistedinject && ant clean
+	cd extensions/servlet && ant clean
 	mh_clean
 
 override_dh_compress:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/guice.git

