Author: kelvingoodson
Date: Wed Jun 2 17:52:37 2010
New Revision: 950691
URL: http://svn.apache.org/viewvc?rev=950691&view=rev
Log:
merge manifest updates from trunk for fixing dosgi samples (revision r950581)
Modified:
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/manifests/axiom-api-1.2.8.MF
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/manifests/axis2-kernel-1.5.1.MF
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/assembly-xml/META-INF/MANIFEST.MF
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/builder/META-INF/MANIFEST.MF
tuscany/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
tuscany/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
Modified:
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/manifests/axiom-api-1.2.8.MF
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/manifests/axiom-api-1.2.8.MF?rev=950691&r1=950690&r2=950691&view=diff
==============================================================================
---
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/manifests/axiom-api-1.2.8.MF
(original)
+++
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/manifests/axiom-api-1.2.8.MF
Wed Jun 2 17:52:37 2010
@@ -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,
Modified:
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/manifests/axis2-kernel-1.5.1.MF
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/manifests/axis2-kernel-1.5.1.MF?rev=950691&r1=950690&r2=950691&view=diff
==============================================================================
---
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/manifests/axis2-kernel-1.5.1.MF
(original)
+++
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/manifests/axis2-kernel-1.5.1.MF
Wed Jun 2 17:52:37 2010
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.apache.axis2.ke
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.dataret
;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
Modified:
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/assembly-xml/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/assembly-xml/META-INF/MANIFEST.MF?rev=950691&r1=950690&r2=950691&view=diff
==============================================================================
---
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/assembly-xml/META-INF/MANIFEST.MF
(original)
+++
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/assembly-xml/META-INF/MANIFEST.MF
Wed Jun 2 17:52:37 2010
@@ -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",
Modified:
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF?rev=950691&r1=950690&r2=950691&view=diff
==============================================================================
---
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF
(original)
+++
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF
Wed Jun 2 17:52:37 2010
@@ -83,6 +83,7 @@ Import-Package: javax.activation;resolut
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,
Modified:
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/builder/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/builder/META-INF/MANIFEST.MF?rev=950691&r1=950690&r2=950691&view=diff
==============================================================================
---
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/builder/META-INF/MANIFEST.MF
(original)
+++
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/builder/META-INF/MANIFEST.MF
Wed Jun 2 17:52:37 2010
@@ -8,6 +8,7 @@ Bundle-License: http://www.apache.org/li
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,
Modified:
tuscany/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
URL:
http://svn.apache.org/viewvc/tuscany/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?rev=950691&r1=950690&r2=950691&view=diff
==============================================================================
---
tuscany/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
(original)
+++
tuscany/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
Wed Jun 2 17:52:37 2010
@@ -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,
Modified:
tuscany/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
URL:
http://svn.apache.org/viewvc/tuscany/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?rev=950691&r1=950690&r2=950691&view=diff
==============================================================================
---
tuscany/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
(original)
+++
tuscany/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
Wed Jun 2 17:52:37 2010
@@ -35,4 +35,5 @@ Export-Package: org.apache.axis2.dataret
;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