From ec3fddb946c2839943188bc03fddc117f6a2769f Mon Sep 17 00:00:00 2001
From: Andrew Robinson <arobinso@redhat.com>
Date: Dec 01 2011 16:23:13 +0000
Subject: Add OSGi-compatible manifests.


---

diff --git a/axis-MANIFEST.MF b/axis-MANIFEST.MF
new file mode 100644
index 0000000..030f85a
--- /dev/null
+++ b/axis-MANIFEST.MF
@@ -0,0 +1,83 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name.0
+Bundle-SymbolicName: org.apache.axis
+Bundle-Version: 1.4.0.qualifier
+Bundle-Vendor: %Bundle-Vendor.0
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Bundle-ClassPath: lib/axis.jar,
+ lib/axis-ant.jar,
+ lib/
+Export-Package: org.apache.axis,
+ org.apache.axis.attachments,
+ org.apache.axis.client,
+ org.apache.axis.client.async,
+ org.apache.axis.collections,
+ 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.encoding.ser.castor,
+ 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.tools.ant.axis,
+ org.apache.axis.tools.ant.foreach,
+ org.apache.axis.tools.ant.wsdl,
+ org.apache.axis.transport.http,
+ org.apache.axis.transport.java,
+ org.apache.axis.transport.jms,
+ org.apache.axis.transport.local,
+ org.apache.axis.transport.mail,
+ 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
+Require-Bundle: javax.xml.rpc;bundle-version="[1.1.0,2.0.0)",
+ javax.xml.soap;bundle-version="[1.2.0,2.0.0)",
+ javax.wsdl;bundle-version="[1.5.1,2.0.0)",
+ org.apache.commons.discovery;bundle-version="[0.2.0,1.0.0)",
+ org.apache.ant;resolution:=optional;bundle-version="[1.6.5,2.0.0)"
+Import-Package: org.apache.commons.logging;version="[1.0.4,2.0.0)";resolution:=optional,
+ org.apache.commons.logging.impl;version="[1.0.4,2.0.0)";resolution:=optional,
+ javax.servlet;version="[2.4.0,3.0.0)";resolution:=optional,
+ javax.servlet.http;version="[2.4.0,3.0.0)";resolution:=optional,
+ javax.activation;resolution:=optional,
+ javax.mail;resolution:=optional,
+ javax.mail.internet;resolution:=optional
+Eclipse-BuddyPolicy: registered
diff --git a/axis-manifest.patch b/axis-manifest.patch
new file mode 100644
index 0000000..1ac7d83
--- /dev/null
+++ b/axis-manifest.patch
@@ -0,0 +1,44 @@
+--- build.xml	2011-11-30 16:55:39.668021907 -0500
++++ build.xml	2011-12-01 11:06:16.379181123 -0500
+@@ -190,38 +190,17 @@ Copyright:
+     </replace> 
+ 
+     <tstamp/>
+-    <jar jarfile="${build.lib}/${name}.jar" basedir="${build.dest}" >
++    <jar jarfile="${build.lib}/${name}.jar" basedir="${build.dest}" manifest="axis-MANIFEST.MF" >
+       <include name="org/**" />
+       <include name="log4j.properties" unless="exclude.log4j.configuration"/>
+       <include name="simplelog.properties"/>
+-      <manifest>
+-        <section name="org/apache/axis">
+-          <attribute name="Implementation-Title" value="Apache Axis"/>
+-          <attribute name="Implementation-Version" value="${axis.version} ${TSTAMP} ${TODAY}"/> 
+-          <attribute name="Implementation-Vendor" value="Apache Web Services"/>
+-        </section>
+-      </manifest>
+     </jar>
+-    <jar jarfile="${build.lib}/${jaxrpc}.jar" basedir="${build.dest}" >
++    <jar jarfile="${build.lib}/${jaxrpc}.jar" basedir="${build.dest}" manifest="xmlrpc-MANIFEST.MF">
+       <include name="javax/**"/>
+       <exclude name="javax/xml/soap/**"/>
+-      <manifest>
+-        <section name="javax/xml/rpc">
+-          <attribute name="Specification-Title" value="JAX-RPC"/>
+-          <attribute name="Specification-Version" value="1.1"/>
+-          <attribute name="Specification-Vendor" value="JCP"/>
+-        </section>
+-      </manifest>
+     </jar>
+-    <jar jarfile="${build.lib}/${saaj}.jar" basedir="${build.dest}" >
++    <jar jarfile="${build.lib}/${saaj}.jar" basedir="${build.dest}" manifest="saaj-MANIFEST.MF" >
+       <include name="javax/xml/soap/**"/>
+-      <manifest>
+-        <section name="javax/xml/soap">
+-          <attribute name="Specification-Title" value="SAAJ"/>
+-          <attribute name="Specification-Version" value="1.2"/>
+-          <attribute name="Specification-Vendor" value="JCP"/>
+-        </section>
+-      </manifest>
+     </jar>
+     <copy file="${wsdl4j.jar}" toDir="${build.lib}"/>
+     <copy file="${commons-logging.jar}" toDir="${build.lib}"/>
diff --git a/axis.spec b/axis.spec
index 03e7f92..fd52acd 100644
--- a/axis.spec
+++ b/axis.spec
@@ -1,6 +1,6 @@
 Name:          axis
 Version:       1.4
-Release:       8%{?dist}
+Release:       9%{?dist}
 Epoch:         0
 Summary:       SOAP implementation in Java
 License:       ASL 2.0
@@ -9,7 +9,17 @@ URL:           http://ws.apache.org/axis/
 Source0:       axis-1.4-src.tar.gz
 # svn export http://svn.apache.org/repos/asf/webservices/axis/branches/AXIS_1_4_FINAL/
 # Build only
+# cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/tools export -r v1_1_0 org.eclipse.orbit/javax.xml.rpc/META-INF/MANIFEST.MF
+# mv org.eclipse.orbit/javax.xml.rpc/META-INF/MANIFEST.MF xmlrpc-MANIFEST.MF
+Source1: xmlrpc-MANIFEST.MF
+# cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/tools export -r v1_4_0 org.eclipse.orbit/org.apache.axis/META-INF/MANIFEST.MF
+# mv org.eclipse.orbit/org.apache.axis/META-INF/MANIFEST.MF axis-MANIFEST.MF
+Source2: axis-MANIFEST.MF
+# cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/tools export -r v1_3_0 org.eclipse.orbit/javax.xml.soap/META-INF/MANIFEST.MF
+# mv org.eclipse.orbit/javax.xml.soap/META-INF/MANIFEST.MF saaj-MANIFEST.MF
+Source3: saaj-MANIFEST.MF
 Patch0:        %{name}-java16.patch
+Patch1:        %{name}-manifest.patch
 BuildRequires: jpackage-utils >= 0:1.6
 BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: ant >= 0:1.6
@@ -95,6 +105,9 @@ for f in $(find . -name "*.zip"); do mv $f $f.no; done
 for f in $(find . -name "*.class"); do mv $f $f.no; done
 
 %patch0 -b .orig
+%patch1 -b .orig
+
+cp %{SOURCE1} %{SOURCE2} %{SOURCE3} .
 
 %build
 pushd lib
@@ -179,6 +192,9 @@ install -m 644 build/axis.war \
 %doc docs/*
 
 %changelog
+* Thu Dec 01 2011 Andrew Robinson <arobinso@redhat.com> 0:1.4-9
+- Inject orbit manifests to jars.
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/saaj-MANIFEST.MF b/saaj-MANIFEST.MF
new file mode 100644
index 0000000..9ccecc7
--- /dev/null
+++ b/saaj-MANIFEST.MF
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Export-Package: javax.xml.soap;version="1.3.0";
+  uses:="javax.activation,
+   javax.xml.namespace,
+   javax.xml.transform,
+   org.w3c.dom"
+Bundle-Classpath: .
+Bundle-Localization: plugin
+Bundle-Name: %Bundle-Name.0
+Bundle-Version: 1.3.0.qualifier
+Bundle-ManifestVersion: 2
+Import-Package: javax.activation,
+ javax.xml.namespace,
+ javax.xml.transform,
+ javax.xml.transform.dom,
+ org.w3c.dom
+Bundle-SymbolicName: javax.xml.soap
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: system.bundle
+Bundle-Vendor: %Bundle-Vendor.0
diff --git a/xmlrpc-MANIFEST.MF b/xmlrpc-MANIFEST.MF
new file mode 100644
index 0000000..d306574
--- /dev/null
+++ b/xmlrpc-MANIFEST.MF
@@ -0,0 +1,26 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name.0
+Created-By: 1.4.2_08-b03 (Sun Microsystems Inc.)
+ Name: javax/xml/rpc
+Specification-Title: JAX-RPC
+Specification-Version: 1.1
+Specification-Vendor: JCP
+Bundle-SymbolicName: javax.xml.rpc
+Bundle-Version: 1.1.0.qualifier
+Bundle-Vendor: %Bundle-Vendor.0
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Bundle-ClassPath: lib/jaxrpc.jar
+Export-Package: javax.xml.messaging,
+ 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
+Require-Bundle: org.apache.xerces;bundle-version="[2.8.0,3.0.0)";resolution:=optional
+Import-Package: javax.servlet,
+ javax.servlet.http,
+ javax.xml.soap