Author: xhaakon-guest
Date: 2011-11-07 19:40:34 +0000 (Mon, 07 Nov 2011)
New Revision: 15360
Modified:
trunk/axis/debian/changelog
trunk/axis/debian/patches/add-osgi-metadata.patch
Log:
Add Require-Bundle OSGi attributes
Modified: trunk/axis/debian/changelog
===================================================================
--- trunk/axis/debian/changelog 2011-11-06 16:19:00 UTC (rev 15359)
+++ trunk/axis/debian/changelog 2011-11-07 19:40:34 UTC (rev 15360)
@@ -2,6 +2,7 @@
* Add missing dependency on libcommons-httpclient-java
* Update Export-Package OSGi attribute in manifest
+ * Add Require-Bundle OSGi attributes
-- Jakub Adam <jakub.a...@ktknet.cz> Mon, 31 Oct 2011 11:07:24 +0100
Modified: trunk/axis/debian/patches/add-osgi-metadata.patch
===================================================================
--- trunk/axis/debian/patches/add-osgi-metadata.patch 2011-11-06 16:19:00 UTC
(rev 15359)
+++ trunk/axis/debian/patches/add-osgi-metadata.patch 2011-11-07 19:40:34 UTC
(rev 15360)
@@ -3,14 +3,14 @@
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 @@
+ <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.components.uuid,org.apache.axis.configuration,org.apache.axis.constants,org.apache.axis.deployment.wsdd,org.apache.axis.deployment.wsdd.providers,org.apache.axis.description,org.apache.axis.encoding,org.apache.axis.encoding.ser,org.apache.axis.enum,org.apache.axis.handlers,org.apache.axis.handlers.http,org.apache.axis.handlers.soap,org.apache.axis.holders,org.apache.axis.i18n,org.apache.axis.management,org.apache.axis.management.jmx,org.apache.axis.message,org.apache.axis.monitor,org.apache.axis.providers,org.apache.axis.providers.java,org.apache.axis.schema,org.apache.axis.security,org.apache.axis.security.servlet,org.apache.axis.security.simple,org.apache.axis.server,org.apache.axis.session,org.apache.axis.soap,org.apache.axis.strategies,org.apache.axis.transport.http,org.apache.axis.transport.java,org.apache.axis.transport.local,org.apache.axis.types,org.apache.axis.utils,org.apache.axis.utils.bytecode,org.apache.axis.utils.cache,org.apache.axis.wsdl,org.apache.axis.wsdl.fromJava,org.apache.axis.wsdl.gen,org.apache.axis.wsdl.symbolTable,org.apache.axis.wsdl.toJava"/>
++ <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"/>
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
