From 9c978d4756b58506f7eb2207d3ef9ce0b2788a7c Mon Sep 17 00:00:00 2001 From: rfeng Date: Wed, 8 Dec 2010 23:45:57 +0000 Subject: More tweaks for the OSGi MF git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1043779 13f79535-47bb-0310-9956-ffa450edef68 --- .../distribution/all/manifests/axiom-api-1.2.10.MF | 58 ++++++++++++++++++++++ .../binding-comet-runtime/META-INF/MANIFEST.MF | 12 ++--- .../trunk/modules/binding-jsonrpc-runtime/pom.xml | 2 +- .../trunk/modules/binding-rest-runtime/pom.xml | 2 +- .../binding-ws-runtime-axis2/META-INF/MANIFEST.MF | 1 + .../trunk/modules/databinding-json/pom.xml | 13 +++++ .../modules/implementation-bpel-runtime/pom.xml | 4 ++ .../sca/node/equinox/launcher/axiom-api-1.2.10.MF | 58 ++++++++++++++++++++++ 8 files changed, 142 insertions(+), 8 deletions(-) create mode 100644 sca-java-2.x/trunk/distribution/all/manifests/axiom-api-1.2.10.MF create mode 100644 sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axiom-api-1.2.10.MF (limited to 'sca-java-2.x/trunk') diff --git a/sca-java-2.x/trunk/distribution/all/manifests/axiom-api-1.2.10.MF b/sca-java-2.x/trunk/distribution/all/manifests/axiom-api-1.2.10.MF new file mode 100644 index 0000000000..66eb85a28b --- /dev/null +++ b/sca-java-2.x/trunk/distribution/all/manifests/axiom-api-1.2.10.MF @@ -0,0 +1,58 @@ +Manifest-Version: 1.0 +Service-Component: OSGI-INF/serviceComponents.xml +Built-By: veithen +Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt +Import-Package: javax.activation,javax.mail,javax.mail.internet,javax. + mail.util,javax.xml.namespace,javax.xml.stream,javax.xml.stream.util, + javax.xml.transform,javax.xml.transform.sax,org.apache.commons.loggin + g,org.jaxen;resolution:=optional,org.jaxen.saxpath;resolution:=option + al,org.jaxen.util;resolution:=optional,org.w3c.dom,org.xml.sax,org.xm + l.sax.ext,org.xml.sax.helpers, org.apache.axiom.om.impl.dom.factory;r + esolution:=optional,org.apache.axiom.om.impl.llom.factory;resolution: + =optional,org.apache.axiom.soap.impl.dom.factory;resolution:=optional + ,org.apache.axiom.soap.impl.llom.soap11;resolution:=optional,org.apac + he.axiom.soap.impl.llom.soap12;resolution:=optional +Include-Resource: META-INF/DEPENDENCIES=target/maven-shared-archive-re + sources/META-INF/DEPENDENCIES,META-INF/LICENSE=target/maven-shared-ar + chive-resources/META-INF/LICENSE,META-INF/NOTICE=target/maven-shared- + archive-resources/META-INF/NOTICE,OSGI-INF/metatype/metatype.xml=targ + et/scr-plugin-generated/OSGI-INF/metatype/metatype.xml,OSGI-INF/scr-p + lugin/scrinfo.xml=target/scr-plugin-generated/OSGI-INF/scr-plugin/scr + info.xml,OSGI-INF/serviceComponents.xml=target/scr-plugin-generated/O + SGI-INF/serviceComponents.xml +Implementation-Vendor-Id: org.apache.ws.commons.axiom +Bnd-LastModified: 1288443040121 +Bundle-Version: 1.2.10 +Bundle-Name: Axiom API +Bundle-Description: The Axiom API +Build-Jdk: 1.5.0_24 +Bundle-ManifestVersion: 2 +Tool: Bnd-0.0.238 +Specification-Vendor: The Apache Software Foundation +Implementation-Version: 1.2.10 +Implementation-Vendor: The Apache Software Foundation +Specification-Title: Axiom API +Created-By: Apache Maven Bundle Plugin +Specification-Version: 1.2.10 +Export-Package: org.apache.axiom.util.stax,org.apache.axiom.om.impl,or + g.apache.axiom.om.impl.serialize,org.apache.axiom.util,org.apache.axi + om.soap.impl.builder,org.apache.axiom.util.base64,org.apache.axiom.ex + t.io,org.apache.axiom.ext.stax.datahandler,org.apache.axiom.om.impl.u + til,org.apache.axiom.om.impl.exception,org.apache.axiom.mime,org.apac + he.axiom.util.stax.xop,org.apache.axiom.util.blob,org.apache.axiom.os + gi,org.apache.axiom.util.stax.dialect,org.apache.axiom.om,org.apache. + axiom.util.stax.wrapper,org.apache.axiom.om.impl.jaxp,org.apache.axio + m.om.ds.custombuilder,org.apache.axiom.attachments.impl,org.apache.ax + iom.om.xpath,org.apache.axiom.util.activation,org.apache.axiom.om.uti + l,org.apache.axiom.attachments.lifecycle,org.apache.axiom.util.namesp + ace,org.apache.axiom.om.impl.traverse,org.apache.axiom.util.stax.debu + g,org.apache.axiom.attachments.utils,org.apache.axiom.soap,org.apache + .axiom.ext.activation,org.apache.axiom.attachments,org.apache.axiom.m + ime.impl.javamail,org.apache.axiom.ext.stax,org.apache.axiom.attachme + nts.lifecycle.impl,org.apache.axiom.om.ds,org.apache.axiom.om.impl.bu + ilder +Bundle-DocURL: http://www.apache.org/ +Bundle-Vendor: The Apache Software Foundation +Bundle-SymbolicName: org.apache.ws.commons.axiom.axiom-api +Implementation-Title: Axiom API + diff --git a/sca-java-2.x/trunk/modules/binding-comet-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/binding-comet-runtime/META-INF/MANIFEST.MF index 61933424f3..5f20b13b5c 100644 --- a/sca-java-2.x/trunk/modules/binding-comet-runtime/META-INF/MANIFEST.MF +++ b/sca-java-2.x/trunk/modules/binding-comet-runtime/META-INF/MANIFEST.MF @@ -10,12 +10,12 @@ Import-Package: javax.servlet;version="2.5.0", javax.servlet.http;version="2.5.0", org.apache.commons.codec, org.apache.commons.codec.net, - org.apache.http;version="4.0.1", - org.apache.http.client;version="4.0.0", - org.apache.http.client.methods;version="4.0.0", - org.apache.http.client.utils;version="4.0.0", - org.apache.http.conn;version="4.0.0", - org.apache.http.impl.client;version="4.0.0", + org.apache.http, + org.apache.http.client, + org.apache.http.client.methods, + org.apache.http.client.utils, + org.apache.http.conn, + org.apache.http.impl.client, org.apache.tuscany.sca.assembly;version="2.0.0", org.apache.tuscany.sca.binding.comet;version="2.0.0", org.apache.tuscany.sca.core;version="2.0.0", diff --git a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/pom.xml index 00c0e0d37b..3a5c43cccb 100644 --- a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/pom.xml +++ b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/pom.xml @@ -148,7 +148,7 @@ httpunit httpunit - 1.6.1 + 1.7 test diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml index 08d38bf4aa..5c8d4fb4ca 100644 --- a/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml +++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml @@ -188,7 +188,7 @@ httpunit httpunit - 1.6.1 + 1.7 test diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF index 98360d8566..843251bee0 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF +++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF @@ -93,6 +93,7 @@ Import-Package: javax.servlet, org.apache.axis2.engine, org.apache.axis2.handlers, org.apache.axis2.receivers, + org.apache.axis2.transport, org.apache.axis2.transport.http, org.apache.axis2.transport.jms, org.apache.axis2.transport.local, diff --git a/sca-java-2.x/trunk/modules/databinding-json/pom.xml b/sca-java-2.x/trunk/modules/databinding-json/pom.xml index 71c52e9632..b7197d516b 100644 --- a/sca-java-2.x/trunk/modules/databinding-json/pom.xml +++ b/sca-java-2.x/trunk/modules/databinding-json/pom.xml @@ -59,6 +59,19 @@ 1.3.1 + + org.slf4j + slf4j-api + 1.6.1 + runtime + + + org.slf4j + slf4j-jdk14 + 1.6.1 + runtime + + org.codehaus.jettison jettison diff --git a/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml b/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml index a68b866f09..b5a67a2a98 100644 --- a/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml +++ b/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml @@ -325,6 +325,10 @@ xml-apis xml-apis + + xerces + xercesImpl + diff --git a/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axiom-api-1.2.10.MF b/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axiom-api-1.2.10.MF new file mode 100644 index 0000000000..66eb85a28b --- /dev/null +++ b/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axiom-api-1.2.10.MF @@ -0,0 +1,58 @@ +Manifest-Version: 1.0 +Service-Component: OSGI-INF/serviceComponents.xml +Built-By: veithen +Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt +Import-Package: javax.activation,javax.mail,javax.mail.internet,javax. + mail.util,javax.xml.namespace,javax.xml.stream,javax.xml.stream.util, + javax.xml.transform,javax.xml.transform.sax,org.apache.commons.loggin + g,org.jaxen;resolution:=optional,org.jaxen.saxpath;resolution:=option + al,org.jaxen.util;resolution:=optional,org.w3c.dom,org.xml.sax,org.xm + l.sax.ext,org.xml.sax.helpers, org.apache.axiom.om.impl.dom.factory;r + esolution:=optional,org.apache.axiom.om.impl.llom.factory;resolution: + =optional,org.apache.axiom.soap.impl.dom.factory;resolution:=optional + ,org.apache.axiom.soap.impl.llom.soap11;resolution:=optional,org.apac + he.axiom.soap.impl.llom.soap12;resolution:=optional +Include-Resource: META-INF/DEPENDENCIES=target/maven-shared-archive-re + sources/META-INF/DEPENDENCIES,META-INF/LICENSE=target/maven-shared-ar + chive-resources/META-INF/LICENSE,META-INF/NOTICE=target/maven-shared- + archive-resources/META-INF/NOTICE,OSGI-INF/metatype/metatype.xml=targ + et/scr-plugin-generated/OSGI-INF/metatype/metatype.xml,OSGI-INF/scr-p + lugin/scrinfo.xml=target/scr-plugin-generated/OSGI-INF/scr-plugin/scr + info.xml,OSGI-INF/serviceComponents.xml=target/scr-plugin-generated/O + SGI-INF/serviceComponents.xml +Implementation-Vendor-Id: org.apache.ws.commons.axiom +Bnd-LastModified: 1288443040121 +Bundle-Version: 1.2.10 +Bundle-Name: Axiom API +Bundle-Description: The Axiom API +Build-Jdk: 1.5.0_24 +Bundle-ManifestVersion: 2 +Tool: Bnd-0.0.238 +Specification-Vendor: The Apache Software Foundation +Implementation-Version: 1.2.10 +Implementation-Vendor: The Apache Software Foundation +Specification-Title: Axiom API +Created-By: Apache Maven Bundle Plugin +Specification-Version: 1.2.10 +Export-Package: org.apache.axiom.util.stax,org.apache.axiom.om.impl,or + g.apache.axiom.om.impl.serialize,org.apache.axiom.util,org.apache.axi + om.soap.impl.builder,org.apache.axiom.util.base64,org.apache.axiom.ex + t.io,org.apache.axiom.ext.stax.datahandler,org.apache.axiom.om.impl.u + til,org.apache.axiom.om.impl.exception,org.apache.axiom.mime,org.apac + he.axiom.util.stax.xop,org.apache.axiom.util.blob,org.apache.axiom.os + gi,org.apache.axiom.util.stax.dialect,org.apache.axiom.om,org.apache. + axiom.util.stax.wrapper,org.apache.axiom.om.impl.jaxp,org.apache.axio + m.om.ds.custombuilder,org.apache.axiom.attachments.impl,org.apache.ax + iom.om.xpath,org.apache.axiom.util.activation,org.apache.axiom.om.uti + l,org.apache.axiom.attachments.lifecycle,org.apache.axiom.util.namesp + ace,org.apache.axiom.om.impl.traverse,org.apache.axiom.util.stax.debu + g,org.apache.axiom.attachments.utils,org.apache.axiom.soap,org.apache + .axiom.ext.activation,org.apache.axiom.attachments,org.apache.axiom.m + ime.impl.javamail,org.apache.axiom.ext.stax,org.apache.axiom.attachme + nts.lifecycle.impl,org.apache.axiom.om.ds,org.apache.axiom.om.impl.bu + ilder +Bundle-DocURL: http://www.apache.org/ +Bundle-Vendor: The Apache Software Foundation +Bundle-SymbolicName: org.apache.ws.commons.axiom.axiom-api +Implementation-Title: Axiom API + -- cgit v1.2.3