From 375fbad455e2c15df284671e9606ea055434af74 Mon Sep 17 00:00:00 2001 From: kelvingoodson Date: Wed, 2 Jun 2010 17:52:37 +0000 Subject: merge manifest updates from trunk for fixing dosgi samples (revision r950581) git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@950691 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca-java-2.0-M5/distribution/all/manifests/axiom-api-1.2.8.MF | 1 + .../sca-java-2.0-M5/distribution/all/manifests/axis2-kernel-1.5.1.MF | 3 ++- .../branches/sca-java-2.0-M5/modules/assembly-xml/META-INF/MANIFEST.MF | 1 + .../modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF | 1 + .../branches/sca-java-2.0-M5/modules/builder/META-INF/MANIFEST.MF | 1 + .../org/apache/tuscany/sca/node/equinox/launcher/axiom-api-1.2.8.MF | 1 + .../org/apache/tuscany/sca/node/equinox/launcher/axis2-kernel-1.5.1.MF | 1 + 7 files changed, 8 insertions(+), 1 deletion(-) (limited to 'sca-java-2.x') diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/manifests/axiom-api-1.2.8.MF b/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/manifests/axiom-api-1.2.8.MF index c5b975bf88..671a7bff34 100644 --- a/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/manifests/axiom-api-1.2.8.MF +++ b/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/manifests/axiom-api-1.2.8.MF @@ -34,6 +34,7 @@ Import-Package: javax.activation, javax.mail.internet, javax.xml.namespace, javax.xml.stream, + javax.xml.stream.util, org.apache.axiom.om.impl.dom.factory;resolution:=optional, org.apache.axiom.om.impl.llom.factory;resolution:=optional, org.apache.axiom.soap.impl.dom.factory;resolution:=optional, diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/manifests/axis2-kernel-1.5.1.MF b/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/manifests/axis2-kernel-1.5.1.MF index ef60ab51f1..686e53ae0b 100644 --- a/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/manifests/axis2-kernel-1.5.1.MF +++ b/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/manifests/axis2-kernel-1.5.1.MF @@ -4,7 +4,7 @@ Bundle-SymbolicName: org.apache.axis2.kernel Bundle-Name: org.apache.axis2.kernel Bundle-Version: 1.5.1 DynamicImport-Package: javax.transaction;version="1.1",javax.transacti - on.xa;version="1.1",* + on.xa;version="1.1",javax.xml.ws,* Bundle-ClassPath: axis2-kernel-1.5.1.jar Export-Package: org.apache.axis2.dataretrieval;version=1.5.1,org.apach e.axis2;version=1.5.1,org.apache.axis2.builder;version=1.5.1,org.apac @@ -35,4 +35,5 @@ Export-Package: org.apache.axis2.dataretrieval;version=1.5.1,org.apach ;version=1.5.1,org.apache.axis2.addressing.wsdl;version=1.5.1,org.apa che.axis2.classloader;version=1.5.1,org.apache.axis2.description;vers ion=1.5.1 +Import-Package: javax.xml.ws Eclipse-ExtensibleAPI: true diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/modules/assembly-xml/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M5/modules/assembly-xml/META-INF/MANIFEST.MF index 010d6f168c..57e693005b 100644 --- a/sca-java-2.x/branches/sca-java-2.0-M5/modules/assembly-xml/META-INF/MANIFEST.MF +++ b/sca-java-2.x/branches/sca-java-2.0-M5/modules/assembly-xml/META-INF/MANIFEST.MF @@ -41,6 +41,7 @@ Import-Package: javax.xml.namespace, javax.xml.stream, javax.xml.transform, javax.xml.transform.dom, + javax.xml.transform.stream, javax.xml.validation;resolution:=optional, javax.xml.xpath, org.apache.tuscany.sca.assembly;version="2.0.0", diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M5/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF index 7e5a6aa53d..2ad383d9f7 100644 --- a/sca-java-2.x/branches/sca-java-2.0-M5/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF +++ b/sca-java-2.x/branches/sca-java-2.0-M5/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF @@ -83,6 +83,7 @@ Import-Package: javax.activation;resolution:=optional, javax.xml.stream, javax.xml.transform, javax.xml.transform.dom, + javax.xml.ws, org.apache.axiom.om, org.apache.axiom.om.impl.builder, org.apache.axiom.om.util, diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/modules/builder/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M5/modules/builder/META-INF/MANIFEST.MF index 7786e2bd40..f2f59a8ab7 100644 --- a/sca-java-2.x/branches/sca-java-2.0-M5/modules/builder/META-INF/MANIFEST.MF +++ b/sca-java-2.x/branches/sca-java-2.0-M5/modules/builder/META-INF/MANIFEST.MF @@ -8,6 +8,7 @@ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Bundle-Description: Apache Tuscany SCA Assembly Model Import-Package: javax.xml.namespace, javax.xml.parsers, + javax.xml.stream, javax.xml.transform, javax.xml.transform.dom, javax.xml.transform.sax, diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axiom-api-1.2.8.MF b/sca-java-2.x/branches/sca-java-2.0-M5/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axiom-api-1.2.8.MF index c5b975bf88..671a7bff34 100644 --- a/sca-java-2.x/branches/sca-java-2.0-M5/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axiom-api-1.2.8.MF +++ b/sca-java-2.x/branches/sca-java-2.0-M5/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axiom-api-1.2.8.MF @@ -34,6 +34,7 @@ Import-Package: javax.activation, javax.mail.internet, javax.xml.namespace, javax.xml.stream, + javax.xml.stream.util, org.apache.axiom.om.impl.dom.factory;resolution:=optional, org.apache.axiom.om.impl.llom.factory;resolution:=optional, org.apache.axiom.soap.impl.dom.factory;resolution:=optional, diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-kernel-1.5.1.MF b/sca-java-2.x/branches/sca-java-2.0-M5/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-kernel-1.5.1.MF index ef60ab51f1..107916e4f7 100644 --- a/sca-java-2.x/branches/sca-java-2.0-M5/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-kernel-1.5.1.MF +++ b/sca-java-2.x/branches/sca-java-2.0-M5/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-kernel-1.5.1.MF @@ -35,4 +35,5 @@ Export-Package: org.apache.axis2.dataretrieval;version=1.5.1,org.apach ;version=1.5.1,org.apache.axis2.addressing.wsdl;version=1.5.1,org.apa che.axis2.classloader;version=1.5.1,org.apache.axis2.description;vers ion=1.5.1 +Import-Package: javax.xml.ws Eclipse-ExtensibleAPI: true -- cgit v1.2.3