[tomcat7] 02/02: Install the extra jar catalina-jmx-remote.jar (Closes: #719921)

[Emmanuel Bourg]

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

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

commit adac2a895b20c48694a4b9953b5f8ec3299ede32
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Sep 26 12:15:05 2014 +0200

    Install the extra jar catalina-jmx-remote.jar (Closes: #719921)
---
 debian/changelog            |  1 +
 debian/libtomcat7-java.poms |  1 +
 debian/rules                | 17 +++++++++++------
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d7e9a00..799d17f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 tomcat7 (7.0.55-2) UNRELEASED; urgency=medium
 
+  * Install the extra jar catalina-jmx-remote.jar (Closes: #719921)
   * Removed the note about the authbind IPv6 incompatibility
     in /etc/defaults/tomcat7
   * Added the SimpleInstanceManager from Tomcat 8 to help integrating
diff --git a/debian/libtomcat7-java.poms b/debian/libtomcat7-java.poms
index c7628f8..ddfc14f 100644
--- a/debian/libtomcat7-java.poms
+++ b/debian/libtomcat7-java.poms
@@ -2,6 +2,7 @@ debian/poms/tomcat-annotations-api.pom
 debian/poms/tomcat-api.pom
 debian/poms/tomcat-catalina.pom
 debian/poms/tomcat-catalina-ha.pom
+debian/poms/tomcat-catalina-jmx-remote.pom
 debian/poms/tomcat-coyote.pom
 debian/poms/tomcat-jasper.pom
 debian/poms/tomcat-jasper-el.pom
diff --git a/debian/rules b/debian/rules
index a949c01..93a2f8a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \
 T_VER := $(shell dpkg-parsechangelog | egrep '^Version:' \
 	| cut -f 2 -d ' ' | cut -f 2 -d ' '|sed 's/-[^-]*$$//')
 T_JARS := tomcat-i18n-fr tomcat-i18n-es tomcat-i18n-ja catalina-ant
-T_MAVENIZED_JARS := jasper-el annotations-api jasper catalina-ha catalina 
+T_MAVENIZED_JARS := jasper-el annotations-api jasper catalina-ha catalina
 T_VER_MAJOR := $(shell echo $(T_VER) | cut -d'.' -f1)
 T_VER_MINOR := $(shell echo $(T_VER) | cut -d'.' -f2)
 T_VER_BUILD := $(shell echo $(T_VER) | cut -d'.' -f3)
@@ -64,9 +64,9 @@ ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 	mkdir -p webapps/examples/WEB-INF/lib
 	cp /usr/share/java/jstl1.1.jar webapps/examples/WEB-INF/lib/jstl.jar
 	cp /usr/share/java/standard.jar webapps/examples/WEB-INF/lib/standard.jar
-	$(ANT_INVOKE) deploy test
+	$(ANT_INVOKE) extras-jmx-remote deploy test
 else
-	$(ANT_INVOKE) deploy
+	$(ANT_INVOKE) extras-jmx-remote deploy
 endif
 	javadoc -subpackages "javax.servlet" -d "output/api" \
 		-sourcepath "java" -author -version -breakiterator \
@@ -145,9 +145,14 @@ binary-indep: build install
 	              $(BLDLIB)/tomcat-util.jar \
 	              usr/share/tomcat7/lib/tomcat-util.jar
 	mh_installjar -plibtomcat7-java -l --usj-name=tomcat-jdbc \
-				  debian/poms/tomcat-jdbc.pom \
-			  	  output/jdbc-pool/tomcat-jdbc.jar \
-				  usr/share/tomcat7/lib/tomcat-jdbc.jar
+	              debian/poms/tomcat-jdbc.pom \
+	              output/jdbc-pool/tomcat-jdbc.jar \
+	              usr/share/tomcat7/lib/tomcat-jdbc.jar
+	mh_installjar -plibtomcat7-java -l --usj-name=tomcat-catalina-jmx-remote \
+	              debian/poms/tomcat-catalina-jmx-remote.pom \
+	              output/extras/catalina-jmx-remote.jar \
+	              usr/share/tomcat7/lib/catalina-jmx-remote.jar
+
 	for i in $(T_JARS); do \
 		mv $(BLDLIB)/$$i.jar $(BLDLIB)/$$i-$(T_VER).jar && \
 		dh_install -plibtomcat7-java \

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