[axis/f17] Fix existing OSGI manifests, inject new manifest into axis-ant.jar
Marek Goldmann
goldmann at fedoraproject.org
Mon Jun 25 11:41:25 UTC 2012
commit 0b4286f1bdc57c514ca5a99595b97a171c9724b2
Author: Gerard Ryan <gerard at ryan.lt>
Date: Mon Jun 25 00:48:02 2012 +0100
Fix existing OSGI manifests, inject new manifest into axis-ant.jar
The axis-MANIFEST.MF file that gets added to axis.jar, was taken
from an eclipse plugin (org.apache.axis_*.jar), which bundles the
two jars axis.jar and axis-ant.jar into a lib/ directory. The manifest
therefore didn't work fully in this situation, when added as an orbit
dependency to an eclipse plugin that required classes from axis-ant:
it would expect to find them in axis.jar, then fail to compile.
The manifest for axis-ant is based on extractions from that previous
manifest.
The bundle version in xmlrpc-MANIFEST.MF and saaj-MANIFEST.MF were a
little problematic for reasons unknown to me. They appear to work
better without the .qualifier. The Bundle-Classpaths have also been
removed, for similar reaasons to axis-MANIFEST.MF.
axis-MANIFEST.MF | 9 +--------
axis-ant-MANIFEST.MF | 18 ++++++++++++++++++
axis.spec | 14 +++++++++++++-
saaj-MANIFEST.MF | 3 +--
xmlrpc-MANIFEST.MF | 3 +--
5 files changed, 34 insertions(+), 13 deletions(-)
---
diff --git a/axis-MANIFEST.MF b/axis-MANIFEST.MF
index 030f85a..5e57be3 100644
--- a/axis-MANIFEST.MF
+++ b/axis-MANIFEST.MF
@@ -2,13 +2,10 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.apache.axis
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
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,
@@ -51,9 +48,6 @@ Export-Package: org.apache.axis,
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,
@@ -72,7 +66,6 @@ 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,
diff --git a/axis-ant-MANIFEST.MF b/axis-ant-MANIFEST.MF
new file mode 100644
index 0000000..3d67ece
--- /dev/null
+++ b/axis-ant-MANIFEST.MF
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name.0
+Bundle-SymbolicName: org.apache.axis.tools
+Bundle-Version: 1.4.0
+Bundle-Vendor: %Bundle-Vendor.0
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Export-Package: org.apache.axis.tools
+ org.apache.axis.tools.ant.axis,
+ org.apache.axis.tools.ant.foreach,
+ org.apache.axis.tools.ant.wsdl
+Require-Bundle: org.apache.axis;bundle-version="1.4.0",
+ javax.xml.rpc;bundle-version="[1.1.0,2.0.0)",
+ javax.xml.soap;bundle-version="[1.2.0,2.0.0)",
+ org.apache.ant;resolution:=optional;bundle-version="[1.6.5,2.0.0)"
+Import-Package: javax.activation;resolution:=optional
+Eclipse-BuddyPolicy: registered
diff --git a/axis.spec b/axis.spec
index e3a75db..13355d6 100644
--- a/axis.spec
+++ b/axis.spec
@@ -1,6 +1,6 @@
Name: axis
Version: 1.4
-Release: 14%{?dist}
+Release: 15%{?dist}
Epoch: 0
Summary: SOAP implementation in Java
License: ASL 2.0
@@ -23,6 +23,7 @@ Source5: http://repo1.maven.org/maven2/axis/axis-ant/1.4/axis-ant-1.4.pom
Source6: http://repo1.maven.org/maven2/axis/axis-jaxrpc/1.4/axis-jaxrpc-1.4.pom
Source7: http://repo1.maven.org/maven2/axis/axis-saaj/1.4/axis-saaj-1.4.pom
Source8: axis-schema-1.4.pom
+Source9: axis-ant-MANIFEST.MF
Patch0: %{name}-java16.patch
Patch1: %{name}-manifest.patch
Patch2: axis-1.4-wsdl-pom.patch
@@ -53,6 +54,7 @@ BuildRequires: xerces-j2
BuildRequires: xml-commons-apis12
BuildRequires: xmlbeans
BuildRequires: xml-security
+BuildRequires: zip
# optional requires
#BuildRequires: jimi
BuildRequires: jetty
@@ -163,6 +165,13 @@ ant \
# -Djimi.jar=$(build-classpath jimi) \
+# inject axis-ant OSGi manifest
+mkdir -p META-INF
+cp -p %{SOURCE9} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u build/lib/%{name}-ant.jar META-INF/MANIFEST.MF
+
+
%install
### Jar files
@@ -210,6 +219,9 @@ install -m 644 %{S:8} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-axis-schema.pom
%doc docs/*
%changelog
+* Fri Jun 23 2012 Gerard Ryan <galileo at gedoraproject.org> 0:1.4-15
+- Fix existing OSGI manifests and add manifest to axis-ant.
+
* Fri May 11 2012 Marek Goldmann <mgoldman at redhat.com> 0:1.4-14
- Changed dependency from axis-wsdl4j to wsdl4j
diff --git a/saaj-MANIFEST.MF b/saaj-MANIFEST.MF
index 9ccecc7..8ad361b 100644
--- a/saaj-MANIFEST.MF
+++ b/saaj-MANIFEST.MF
@@ -4,10 +4,9 @@ Export-Package: javax.xml.soap;version="1.3.0";
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-Version: 1.3.0
Bundle-ManifestVersion: 2
Import-Package: javax.activation,
javax.xml.namespace,
diff --git a/xmlrpc-MANIFEST.MF b/xmlrpc-MANIFEST.MF
index d306574..cff07b8 100644
--- a/xmlrpc-MANIFEST.MF
+++ b/xmlrpc-MANIFEST.MF
@@ -7,11 +7,10 @@ Specification-Title: JAX-RPC
Specification-Version: 1.1
Specification-Vendor: JCP
Bundle-SymbolicName: javax.xml.rpc
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.0
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,
More information about the scm-commits
mailing list