[SCM] tomcat7: Servlet and JSP engine branch, master, updated. debian/7.0.26-1-3-g74e4d7b

Jakub Adam jakub.adam at ktknet.cz
Mon Apr 2 21:24:32 UTC 2012 

The following commit has been merged in the master branch:
commit 74e4d7bc9dea0cc1e1d3fb55f10ca239859f325c
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Tue Mar 13 22:47:24 2012 +0100

    Update OSGi metadata, use jh_manifest for modifying MANIFEST.MF

diff --git a/debian/changelog b/debian/changelog
index 8cade8c..d09f783 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 tomcat7 (7.0.26-2) UNRELEASED; urgency=low
 
+  [ tony mancill ]
   * Add Turkish debconf translation.  (Closes: #664683)
     - Thanks to Atila KOÇ
 
+  [ Jakub Adam ]
+  * Update OSGi metadata, use jh_manifest for modifying MANIFEST.MF.
+
  -- tony mancill <tmancill at debian.org>  Wed, 21 Mar 2012 22:37:39 -0700
 
 tomcat7 (7.0.26-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index bf43873..15b0ca3 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: James Page <james.page at ubuntu.com>,
  Miguel Landaeta <miguel at miguel.cc>, tony mancill <tmancill at debian.org>,
  Jakub Adam <jakub.adam at ktknet.cz>
 Build-Depends: default-jdk, ant-optional, debhelper (>= 7), po-debconf
-Build-Depends-Indep: maven-repo-helper (>> 1.0.1), libecj-java
+Build-Depends-Indep: maven-repo-helper (>> 1.0.1), libecj-java, javahelper
 Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-java/tomcat7.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/tomcat7.git
diff --git a/debian/libservlet3.0-java.manifest b/debian/libservlet3.0-java.manifest
new file mode 100644
index 0000000..8ccd9a2
--- /dev/null
+++ b/debian/libservlet3.0-java.manifest
@@ -0,0 +1,31 @@
+usr/share/java/tomcat-el-api-2.2.jar:
+ Bundle-ManifestVersion: 2 
+ Bundle-Vendor: Apache Software Foundation
+ Bundle-Version: 2.2.0
+ Bundle-Localization: plugin
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Bundle-Name: Javax Expression Language Bundle
+ Bundle-SymbolicName: javax.el
+ Export-Package: javax.el;version="2.2.0"
+ Import-Package: javax.servlet;version="2.6.0",javax.servlet.http;version="2.6.0"
+
+usr/share/java/tomcat-jsp-api-2.2.jar:
+ Import-Package: javax.servlet;version="2.6.0",javax.servlet.http;version="2.6.0",javax.servlet.resources;version="2.6.0",javax.el;version="2.2.0"
+ Bundle-ManifestVersion: 2
+ Export-Package: javax.servlet.jsp; version=2.2,javax.servlet.jsp.el; version=2.2,javax.servlet.jsp.resources; version=2.2,javax.servlet.jsp.tagext; version=2.2
+ Bundle-Version: 2.2.0.v201103241327
+ Bundle-SymbolicName: javax.servlet.jsp
+ Bundle-Name: Java Server Pages API Bundle
+ Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,JavaSE-1.6
+ Bundle-Localization: plugin
+ Bundle-Vendor: Apache Software Foundation
+
+usr/share/java/tomcat-servlet-api-3.0.jar:
+ Bundle-ManifestVersion: 2
+ Export-Package: javax.servlet;version="2.6.0",javax.servlet.annotation;version="2.6.0",javax.servlet.descriptor;version="2.6.0",javax.servlet.http;version="2.6.0",javax.servlet.resources;version="2.6.0"
+ Bundle-Version: 3.0.0.v201103241327
+ Bundle-SymbolicName: javax.servlet
+ Bundle-Name: Servlet API Bundle
+ Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,JavaSE-1.6
+ Bundle-Localization: plugin
+ Bundle-Vendor: Apache Software Foundation
diff --git a/debian/libtomcat7-java.manifest b/debian/libtomcat7-java.manifest
new file mode 100644
index 0000000..d6c397f
--- /dev/null
+++ b/debian/libtomcat7-java.manifest
@@ -0,0 +1,49 @@
+usr/share/java/tomcat-api.jar:
+ Bundle-Vendor: Apache Software Foundation
+ Bundle-Localization: plugin
+ Bundle-Name: Apache Tomcat API
+ Bundle-SymbolicName: org.apache.tomcat.api
+ Export-Package: org.apache.tomcat;version="7.0.26";uses:="javax.naming,javax.servlet"
+ Bundle-Version: 7.0.26
+ Bundle-ManifestVersion: 2
+ 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:
+ Bundle-ManifestVersion: 2
+ Bundle-SymbolicName: org.apache.jasper
+ Bundle-Version: 7.0.26
+ Bundle-Name: Apache Jasper JSP Support
+ Bundle-Vendor: Apache Software Foundation
+ Bundle-Localization: plugin
+ Export-Package: org.apache.jasper;version="7.0.26";uses:="javax.servlet,javax.servlet.jsp.tagext,org.apache.jasper.compiler,org.apache.jasper.servlet,org.apache.tools.ant",org.apache.jasper.compiler;version="7.0.26";uses:="javax.el,javax.servlet,javax.servlet.jsp.tagext,javax.xml.parsers,org.apache.jasper,org.apache.jasper.compiler.tagplugin,org.apache.jasper.servlet,org.apache.jasper.util,org.apache.jasper.xmlparser,org.apache.juli.logging,org.apache.tomcat,org.apache.tools.ant,org.eclipse.jdt.internal.compiler,org.eclipse.jdt.internal.compiler.env,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers",org.apache.jasper.compiler.tagplugin;version="7.0.26",org.apache.jasper.el;version="7.0.26";uses:="javax.el,javax.servlet.jsp.el",org.apache.jasper.resources;version="7.0.26",org.apache.jasper.runtime;version="7.0.26";uses:="javax.el,javax.servlet,javax.servlet.http,javax.servlet.jsp,javax.servlet.jsp.el,javax.servlet.jsp.tagext,org.apache.jasper,org.apache.jasper.el,org.apache.tomcat",org.apache.jasper.security;version="7.0.26",org.apache.jasper.servlet;version="7.0.26";uses:="javax.servlet,javax.servlet.descriptor,javax.servlet.http,javax.servlet.jsp.tagext,org.apache.jasper,org.apache.jasper.compiler,org.apache.jasper.util,org.apache.tomcat",org.apache.jasper.tagplugins.jstl;version="7.0.26";uses:="javax.servlet,javax.servlet.http,javax.servlet.jsp",org.apache.jasper.tagplugins.jstl.core;version="7.0.26";uses:="org.apache.jasper.compiler.tagplugin",org.apache.jasper.util;version="7.0.26";uses:="org.xml.sax,org.xml.sax.helpers",org.apache.jasper.xmlparser;version="7.0.26";uses:="org.apache.jasper,org.apache.jasper.compiler,org.w3c.dom,org.xml.sax"
+ 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.26]",org.apache.el.lang;version="[7.0.26, 7.0.26]",org.apache.juli.logging;version="[7.0.26, 7.0.26]",org.apache.tomcat;version="[7.0.26, 7.0.26]",org.apache.tomcat.util.scan;version="[7.0.26, 7.0.26]",org.apache.tools.ant;version="[1.7.0, 2.0.0)";resolution:="optional",org.apache.tools.ant.taskdefs;version="[1.7.0, 2.0.0)";resolution:="optional",org.apache.tools.ant.types;version="[1.7.0, 2.0.0)";resolution:="optional",org.apache.tools.ant.util;version="[1.7.0, 2.0.0)";resolution:="optional",org.eclipse.jdt.core.compiler;version="0",org.eclipse.jdt.internal.compiler;version="0",org.eclipse.jdt.internal.compiler.classfmt;version="0",org.eclipse.jdt.internal.compiler.env;version="0",org.eclipse.jdt.internal.compiler.impl;version="0",org.eclipse.jdt.internal.compiler.problem;version="0",org.w3c.dom;version="0",org.xml.sax;version="0",org.xml.sax.ext;version="0",org.xml.sax.helpers;version="0"
+ Unversioned-Imports: javax.xml.parsers.*,org.w3c.dom.*,org.xml.sax.*
+
+usr/share/java/tomcat-juli.jar:
+ Bundle-ManifestVersion: 2
+ Bundle-SymbolicName: org.apache.juli
+ Bundle-Version: 7.0.26
+ Bundle-Name: Apache Juli
+ 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:
+ Bundle-ManifestVersion: 2
+ Bundle-Vendor: Apache Software Foundation
+ Bundle-Localization: plugin
+ Bundle-Name: Apache EL
+ Bundle-SymbolicName: org.apache.el
+ Export-Package: org.apache.el;version="7.0.26";uses:="javax.el,org.apache.el.parser",org.apache.el.lang;version="7.0.26";uses:="javax.el,org.apache.el.parser",org.apache.el.parser;version="7.0.26";uses:="javax.el,org.apache.el.lang",org.apache.el.util;version="7.0.26";uses:="javax.el"
+ Bundle-Version: 7.0.26
+ Import-Package: javax.el;version="[1.0.0, 3.0.0)"
+
+usr/share/java/tomcat-util.jar:
+ Bundle-ManifestVersion: 2
+ Bundle-Vendor: Apache Software Foundation
+ Bundle-Localization: plugin
+ Bundle-Name: Apache Tomcat Util
+ Bundle-SymbolicName: org.apache.tomcat.util
+ Export-Package: org.apache.tomcat.util.file;version="7.0.26",org.apache.tomcat.util.res;version="7.0.26",org.apache.tomcat.util.scan;version="7.0.26";uses:="javax.servlet,org.apache.tomcat"
+ Bundle-Version: 7.0.26
+ Import-Package: javax.servlet;version="[2.6.0, 4.0.0)",org.apache.juli.logging;version="[7.0.26, 7.0.26]",org.apache.tomcat;version="[7.0.26, 7.0.26]"
diff --git a/debian/patches/0007-add-OSGi-headers-to-servlet-api.patch b/debian/patches/0007-add-OSGi-headers-to-servlet-api.patch
deleted file mode 100644
index 4cd8e4d..0000000
--- a/debian/patches/0007-add-OSGi-headers-to-servlet-api.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Niels Thykier <niels at thykier.net>
-Date: Mon, 28 Jun 2010 21:33:03 +0200
-Subject: [PATCH] add OSGi headers to servlet-api
-
----
- res/META-INF/servlet-api.jar.manifest |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/res/META-INF/servlet-api.jar.manifest b/res/META-INF/servlet-api.jar.manifest
-index 4dbb748..a85f9ed 100644
---- a/res/META-INF/servlet-api.jar.manifest
-+++ b/res/META-INF/servlet-api.jar.manifest
-@@ -1,6 +1,15 @@
- Manifest-version: 1.0
- X-Compile-Source-JDK: @source.jdk@
- X-Compile-Target-JDK: @target.jdk@
-+Bundle-ManifestVersion: 2
-+Export-Package: javax.servlet;version="3.0",javax.servlet.http;version
-+ ="3.0",javax.servlet.resources;version="3.0"
-+Bundle-Version: 3.0.0.v201103241327
-+Bundle-SymbolicName: javax.servlet
-+Bundle-Name: Servlet API Bundle
-+Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.6
-+Bundle-Localization: plugin
-+Bundle-Vendor: Apache Software Foundation
- 
- Name: javax/servlet/
- Specification-Title: Java API for Servlets
--- 
diff --git a/debian/patches/0008-add-OSGI-headers-to-jsp-api.patch b/debian/patches/0008-add-OSGI-headers-to-jsp-api.patch
deleted file mode 100644
index e9e0f80..0000000
--- a/debian/patches/0008-add-OSGI-headers-to-jsp-api.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Niels Thykier <niels at thykier.net>
-Date: Mon, 28 Jun 2010 21:18:30 +0200
-Subject: [PATCH] add OSGI headers to jsp-api
-
----
- res/META-INF/jsp-api.jar.manifest |   12 ++++++++++++
- 1 files changed, 12 insertions(+), 0 deletions(-)
-
-diff --git a/res/META-INF/jsp-api.jar.manifest b/res/META-INF/jsp-api.jar.manifest
-index fb050ea..e44409d 100644
---- a/res/META-INF/jsp-api.jar.manifest
-+++ b/res/META-INF/jsp-api.jar.manifest
-@@ -1,6 +1,18 @@
- Manifest-version: 1.0
- X-Compile-Source-JDK: @source.jdk@
- X-Compile-Target-JDK: @target.jdk@
-+Import-Package: javax.servlet; version=3.0,javax.servlet.http; version
-+ =3.0,javax.servlet.resources; version=3.0
-+Bundle-ManifestVersion: 2
-+Export-Package: javax.servlet.jsp; version=2.2,javax.servlet.jsp.el; v
-+ ersion=2.2,javax.servlet.jsp.resources; version=2.2,javax.servlet.jsp
-+ .tagext; version=2.2
-+Bundle-Version: 2.2.v201103241327
-+Bundle-SymbolicName: javax.servlet.jsp
-+Bundle-Name: Java Server Pages API Bundle
-+Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.6
-+Bundle-Localization: plugin
-+Bundle-Vendor: Apache Software Foundation
- 
- Name: javax/servlet/jsp/
- Specification-Title: Java API for JavaServer Pages
--- 
diff --git a/debian/patches/series b/debian/patches/series
index aff76af..afbc008 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,8 +4,6 @@
 0004-split-deploy-webapps-target-from-deploy-target.patch
 0005-change-default-DBCP-factory-class.patch
 0006-add-JARs-below-var-to-class-loader.patch
-0007-add-OSGi-headers-to-servlet-api.patch
-0008-add-OSGI-headers-to-jsp-api.patch
 0009-Use-java.security.policy-file-in-catalina.sh.patch
 0010-debianize-build-xml.patch
 0011-fix-classpath-lintian-warnings.patch
diff --git a/debian/rules b/debian/rules
index 5caddcd..321bdf3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -148,6 +148,7 @@ binary-indep: build install
 	chmod a+x debian/tomcat7-common/usr/share/tomcat7/bin/*.sh
 	chmod a+x debian/tomcat7-user/usr/bin/tomcat7-instance-create
 	chmod a+x debian/tomcat7-user/usr/share/tomcat7/skel/bin/*.sh
+	jh_manifest
 	dh_compress
 	dh_fixperms
 	dh_installdeb

-- 
tomcat7: Servlet and JSP engine

More information about the pkg-java-commits mailing list