[axis] 31/60: Add Require-Bundle OSGi attributes

[Emmanuel Bourg]

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

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

commit 8e51d174f6ba9ea7ffc1dafed6e1f188c18def6e
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Mon Nov 7 19:40:34 2011 +0000

    Add Require-Bundle OSGi attributes
---
 debian/changelog                       |  1 +
 debian/patches/add-osgi-metadata.patch | 23 +++++++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0ba5e6f..e1d86a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ axis (1.4-16) UNRELEASED; urgency=low
 
   * Add missing dependency on libcommons-httpclient-java
   * Update Export-Package OSGi attribute in manifest
+  * Add Require-Bundle OSGi attributes
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Mon, 31 Oct 2011 11:07:24 +0100
 
diff --git a/debian/patches/add-osgi-metadata.patch b/debian/patches/add-osgi-metadata.patch
index 8519ca6..79c0d35 100644
--- a/debian/patches/add-osgi-metadata.patch
+++ b/debian/patches/add-osgi-metadata.patch
@@ -3,14 +3,14 @@ Date: Sun, 9 Oct 2011 02:17:06 +0200
 Subject: add-osgi-metadata
 
 ---
- build.xml |   18 ++++++++++++++++++
- 1 files changed, 18 insertions(+), 0 deletions(-)
+ build.xml |   21 +++++++++++++++++++++
+ 1 files changed, 21 insertions(+), 0 deletions(-)
 
 diff --git a/build.xml b/build.xml
-index 738d245..5284aee 100644
+index 738d245..8b7b0fe 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -195,6 +195,12 @@ Copyright:
+@@ -195,6 +195,13 @@ Copyright:
        <include name="log4j.properties" unless="exclude.log4j.configuration"/>
        <include name="simplelog.properties"/>
        <manifest>
@@ -20,32 +20,35 @@ index 738d245..5284aee 100644
 +        <attribute name="Bundle-SymbolicName" value="org.apache.axis"/>
 +        <attribute name="Bundle-Version" value="${axis.version}"/>
 +        <attribute name="Export-Package" value="org.apache.axis,org.apache.axis.attachments,org.apache.axis.client,org.apache.axis.client.async,org.apache.axis.collections,org.apache.axis.components,org.apache.axis.components.compiler,org.apache.axis.components.encoding,org.apache.axis.components.image,org.apache.axis.components.jms,org.apache.axis.components.logger,org.apache.axis.components.net,org.apache.axis.components.script,org.apache.axis.components.threadpool,org.apache.axis.com [...]
++        <attribute name="Require-Bundle" value="javax.wsdl,javax.activation,javax.mail,javax.xml,javax.xml.rpc,javax.xml.soap,javax.servlet,org.apache.commons.discovery,org.apache.commons.httpclient,org.apache.commons.logging"/>
          <section name="org/apache/axis">
            <attribute name="Implementation-Title" value="Apache Axis"/>
            <attribute name="Implementation-Version" value="${axis.version} ${TSTAMP} ${TODAY}"/> 
-@@ -206,6 +212,12 @@ Copyright:
+@@ -206,6 +213,13 @@ Copyright:
        <include name="javax/**"/>
        <exclude name="javax/xml/soap/**"/>
        <manifest>
 +        <attribute name="Bundle-ManifestVersion" value="2"/>
-+      	<attribute name="Bundle-Name" value="JAX-RPC"/>
-+      	<attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
++        <attribute name="Bundle-Name" value="JAX-RPC"/>
++        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
 +        <attribute name="Bundle-SymbolicName" value="javax.xml.rpc"/>
 +        <attribute name="Bundle-Version" value="${axis.version}"/>
 +        <attribute name="Export-Package" value="javax.xml.rpc,javax.xml.rpc.encoding,javax.xml.rpc.handler,javax.xml.rpc.handler.soap,javax.xml.rpc.holders,javax.xml.rpc.server,javax.xml.rpc.soap"/>
++        <attribute name="Require-Bundle" value="javax.servlet,javax.xml,javax.xml.soap"/>
          <section name="javax/xml/rpc">
            <attribute name="Specification-Title" value="JAX-RPC"/>
            <attribute name="Specification-Version" value="1.1"/>
-@@ -216,6 +228,12 @@ Copyright:
+@@ -216,6 +230,13 @@ Copyright:
      <jar jarfile="${build.lib}/${saaj}.jar" basedir="${build.dest}" >
        <include name="javax/xml/soap/**"/>
        <manifest>
 +        <attribute name="Bundle-ManifestVersion" value="2"/>
-+      	<attribute name="Bundle-Name" value="SAAJ"/>
-+      	<attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
++        <attribute name="Bundle-Name" value="SAAJ"/>
++        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
 +        <attribute name="Bundle-SymbolicName" value="javax.xml.soap"/>
 +        <attribute name="Bundle-Version" value="${axis.version}"/>
 +        <attribute name="Export-Package" value="javax.xml.soap"/>
++        <attribute name="Require-Bundle" value="javax.activation,javax.xml"/>
          <section name="javax/xml/soap">
            <attribute name="Specification-Title" value="SAAJ"/>
            <attribute name="Specification-Version" value="1.2"/>

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