[tomcat8] 08/14: Renamed the jars in /usr/share/java to tomcat8-xxx to avoid conflicts with other versions of Tomcat
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Fri Sep 13 16:05:01 UTC 2013
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat8.
commit 88bce1f61b6ff7f1e643e009495e2cf1db43ac7f
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Sep 13 16:03:13 2013 +0200
Renamed the jars in /usr/share/java to tomcat8-xxx to avoid conflicts with other versions of Tomcat
---
debian/changelog | 2 ++
debian/control | 1 -
debian/libtomcat8-java.manifest | 10 +++++-----
debian/rules | 40 ++++++++++++++++++++++-----------------
debian/tomcat8-common.links | 2 +-
5 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2549ad3..6e14fdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ tomcat8 (8.0.0~RC1-1) UNRELEASED; urgency=low
* The spec jars under the org.apache.tomcat groupId are now deployed with
the upstream version instead of the specification version to match the
artifacts available on Maven central.
+ * Renamed the jars in /usr/share/java to tomcat8-xxx to avoid conflicts
+ with other versions of Tomcat
-- Emmanuel Bourg <ebourg at apache.org> Thu, 12 Sep 2013 16:10:10 +0200
diff --git a/debian/control b/debian/control
index 82fc479..e7faaa1 100644
--- a/debian/control
+++ b/debian/control
@@ -70,7 +70,6 @@ Depends: libecj-java,
libcommons-pool-java,
libcommons-dbcp-java,
libservlet3.1-java (>= ${source:Version}), ${misc:Depends}
-Conflicts: libtomcat6-java, libtomcat7-java
Suggests: tomcat8 (>= ${source:Version})
Description: Apache Tomcat 8 - Servlet and JSP engine -- core libraries
Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
diff --git a/debian/libtomcat8-java.manifest b/debian/libtomcat8-java.manifest
index d6c397f..fbf78a0 100644
--- a/debian/libtomcat8-java.manifest
+++ b/debian/libtomcat8-java.manifest
@@ -1,4 +1,4 @@
-usr/share/java/tomcat-api.jar:
+usr/share/java/tomcat8-api.jar:
Bundle-Vendor: Apache Software Foundation
Bundle-Localization: plugin
Bundle-Name: Apache Tomcat API
@@ -9,7 +9,7 @@ usr/share/java/tomcat-api.jar:
Import-Package: javax.naming;version="0",javax.servlet;version="[2.6.0, 4.0.0)"
Unversioned-Imports: javax.naming.*
-usr/share/java/tomcat-jasper.jar:
+usr/share/java/tomcat8-jasper.jar:
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.apache.jasper
Bundle-Version: 7.0.26
@@ -20,7 +20,7 @@ usr/share/java/tomcat-jasper.jar:
Import-Package: javax.el;version="[1.0.0, 3.0.0)",javax.servlet;version="[2.6.0, 4.0.0)",javax.servlet.descriptor;version="[2.6.0, 4.0.0)",javax.servlet.http;version="[2.6.0, 4.0.0)",javax.servlet.jsp;version="[2.2.0, 3.0.0)",javax.servlet.jsp.el;version="[2.2.0, 3.0.0)",javax.servlet.jsp.resources;version="[2.2.0, 3.0.0)",javax.servlet.jsp.tagext;version="[2.2.0, 3.0.0)",javax.servlet.resources;version="[2.6.0, 4.0.0)",javax.xml.parsers;version="0",org.apache.el;version="[7.0.26, 7.0.2 [...]
Unversioned-Imports: javax.xml.parsers.*,org.w3c.dom.*,org.xml.sax.*
-usr/share/java/tomcat-juli.jar:
+usr/share/java/tomcat8-juli.jar:
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.apache.juli
Bundle-Version: 7.0.26
@@ -28,7 +28,7 @@ usr/share/java/tomcat-juli.jar:
Bundle-Vendor: Apache Software Foundation
Export-Package: org.apache.juli;version="7.0.26",org.apache.juli.logging;version="7.0.26"
-usr/share/java/tomcat-jasper-el.jar:
+usr/share/java/tomcat8-jasper-el.jar:
Bundle-ManifestVersion: 2
Bundle-Vendor: Apache Software Foundation
Bundle-Localization: plugin
@@ -38,7 +38,7 @@ usr/share/java/tomcat-jasper-el.jar:
Bundle-Version: 7.0.26
Import-Package: javax.el;version="[1.0.0, 3.0.0)"
-usr/share/java/tomcat-util.jar:
+usr/share/java/tomcat8-util.jar:
Bundle-ManifestVersion: 2
Bundle-Vendor: Apache Software Foundation
Bundle-Localization: plugin
diff --git a/debian/rules b/debian/rules
index 9a4a512..27175b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,9 +21,6 @@ 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/-[^-]*$$//' | sed 's/~/-/')
-# The Tomcat jars linked to /usr/share/tomcat8/lib in the tomcat-common package
-T_JARS := tomcat-i18n-fr tomcat-i18n-es tomcat-i18n-ja catalina-ant
-
# The Tomcat jars without the tomcat- prefix generated in the BLDLIB directory
T_MAVENIZED_JARS := jasper-el annotations-api jasper catalina-ha catalina websocket-api
@@ -114,28 +111,37 @@ binary-indep: build install
for i in $(T_MAVENIZED_JARS); \
do \
mh_installjar -plibtomcat8-java -l \
+ --usj-name=tomcat8-$$i \
debian/poms/tomcat-$$i.pom \
$(BLDLIB)/$$i.jar \
usr/share/tomcat8/lib/$$i.jar; \
done
- mh_installjar -plibtomcat8-java -l --usj-name=catalina-tribes debian/poms/tomcat-tribes.pom $(BLDLIB)/catalina-tribes.jar usr/share/tomcat8/lib/catalina-tribes.jar
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat-api debian/poms/tomcat-api.pom $(BLDLIB)/tomcat-api.jar usr/share/tomcat8/lib/tomcat-api.jar
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat-coyote debian/poms/tomcat-coyote.pom $(BLDLIB)/tomcat-coyote.jar usr/share/tomcat8/lib/tomcat-coyote.jar
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat-juli debian/poms/tomcat-juli.pom $(BLDBIN)/tomcat-juli.jar
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat-util debian/poms/tomcat-util.pom $(BLDLIB)/tomcat-util.jar usr/share/tomcat8/lib/tomcat-util.jar
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat-jni debian/poms/tomcat-jni.pom $(BLDLIB)/tomcat-jni.jar usr/share/tomcat8/lib/tomcat-jni.jar
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat-spdy debian/poms/tomcat-spdy.pom $(BLDLIB)/tomcat-spdy.jar usr/share/tomcat8/lib/tomcat-spdy.jar
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat-websocket debian/poms/tomcat-websocket.pom $(BLDLIB)/tomcat-websocket.jar usr/share/tomcat8/lib/tomcat-websocket.jar
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat-jdbc debian/poms/tomcat-jdbc.pom output/jdbc-pool/tomcat-jdbc.jar usr/share/tomcat8/lib/tomcat-jdbc.jar
+ mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-tribes debian/poms/tomcat-tribes.pom $(BLDLIB)/catalina-tribes.jar usr/share/tomcat8/lib/catalina-tribes.jar
+ mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-api debian/poms/tomcat-api.pom $(BLDLIB)/tomcat-api.jar usr/share/tomcat8/lib/tomcat-api.jar
+ mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-coyote debian/poms/tomcat-coyote.pom $(BLDLIB)/tomcat-coyote.jar usr/share/tomcat8/lib/tomcat-coyote.jar
+ mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-juli debian/poms/tomcat-juli.pom $(BLDBIN)/tomcat-juli.jar
+ mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-util debian/poms/tomcat-util.pom $(BLDLIB)/tomcat-util.jar usr/share/tomcat8/lib/tomcat-util.jar
+ mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-jni debian/poms/tomcat-jni.pom $(BLDLIB)/tomcat-jni.jar usr/share/tomcat8/lib/tomcat-jni.jar
+ mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-spdy debian/poms/tomcat-spdy.pom $(BLDLIB)/tomcat-spdy.jar usr/share/tomcat8/lib/tomcat-spdy.jar
+ mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-websocket debian/poms/tomcat-websocket.pom $(BLDLIB)/tomcat-websocket.jar usr/share/tomcat8/lib/tomcat-websocket.jar
+ mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-jdbc debian/poms/tomcat-jdbc.pom output/jdbc-pool/tomcat-jdbc.jar usr/share/tomcat8/lib/tomcat-jdbc.jar
- for i in $(T_JARS); do \
- mv $(BLDLIB)/$$i.jar $(BLDLIB)/$$i-$(T_VER).jar && \
- dh_install -plibtomcat8-java $(BLDLIB)/$$i-$(T_VER).jar usr/share/java && \
- dh_link -plibtomcat8-java usr/share/java/$$i-$(T_VER).jar usr/share/java/$$i.jar && \
- dh_link -ptomcat8-common usr/share/java/$$i-$(T_VER).jar usr/share/tomcat8/lib/$$i.jar; \
+ # Install the i18n jars
+ for i in i18n-fr i18n-es i18n-ja; \
+ do \
+ mv $(BLDLIB)/tomcat-$$i.jar $(BLDLIB)/tomcat8-$$i-$(T_VER).jar && \
+ dh_install -plibtomcat8-java $(BLDLIB)/tomcat8-$$i-$(T_VER).jar usr/share/java && \
+ dh_link -plibtomcat8-java usr/share/java/tomcat8-$$i-$(T_VER).jar usr/share/java/tomcat8-$$i.jar && \
+ dh_link -ptomcat8-common usr/share/java/tomcat8-$$i-$(T_VER).jar usr/share/tomcat8/lib/tomcat-$$i.jar; \
done
+ # Install catalina-ant.jar
+ mv $(BLDLIB)/catalina-ant.jar $(BLDLIB)/tomcat8-catalina-ant-$(T_VER).jar
+ dh_install -plibtomcat8-java $(BLDLIB)/tomcat8-catalina-ant-$(T_VER).jar usr/share/java
+ dh_link -plibtomcat8-java usr/share/java/tomcat8-catalina-ant-$(T_VER).jar usr/share/java/tomcat8-catalina-ant.jar
+ dh_link -ptomcat8-common usr/share/java/tomcat8-catalina-ant-$(T_VER).jar usr/share/tomcat8/lib/catalina-ant.jar
+
dh_install --exclude=.bat --exclude=Thumbs.db
dh_link
diff --git a/debian/tomcat8-common.links b/debian/tomcat8-common.links
index 8cac158..4358639 100644
--- a/debian/tomcat8-common.links
+++ b/debian/tomcat8-common.links
@@ -1,4 +1,4 @@
-/usr/share/java/tomcat-juli.jar /usr/share/tomcat8/bin/tomcat-juli.jar
+/usr/share/java/tomcat8-juli.jar /usr/share/tomcat8/bin/tomcat-juli.jar
/usr/share/java/commons-dbcp.jar /usr/share/tomcat8/lib/commons-dbcp.jar
/usr/share/java/commons-pool.jar /usr/share/tomcat8/lib/commons-pool.jar
/usr/share/java/tomcat-el-api-3.0.jar /usr/share/tomcat8/lib/el-api.jar
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git
More information about the pkg-java-commits
mailing list