Fix a couple of problems left over by the move to manifest version 2.0.0

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@736281 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 80 insertions, 39 deletions

diff --git a/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF b/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF
index e560e71668..0b335660ac 100644
--- a/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF
@@ -1,31 +1,65 @@
 Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.binding.ws.axis2;uses:="org.apa

- che.axis2.deployment.util,org.apache.tuscany.sca.definitions,org.apac

- he.tuscany.sca.policy.authentication.basic,org.apache.tuscany.sca.pol

- icy.security.ws,org.apache.ws.security.handler,javax.xml.namespace,or

- g.apache.axiom.om,org.xml.sax,org.apache.commons.httpclient,org.apach

- e.axiom.soap,org.apache.axis2.util,javax.servlet,javax.xml.stream,org

- .apache.tuscany.sca.core.assembly,org.apache.axis2.transport.http.ser

- ver,org.osoa.sca,org.apache.axis2.i18n,org.apache.axis2.transport,org

- .apache.axis2.transport.jms,org.apache.axis2.client,org.apache.axis2.

- context,org.apache.axiom.om.impl.builder,org.apache.tuscany.sca.inter

- facedef.java,org.w3c.dom,javax.wsdl,org.apache.tuscany.sca.xsd.xml,or

- g.apache.tuscany.sca.binding.ws,org.apache.axis2.engine,org.apache.ax

- is2.receivers,org.apache.commons.httpclient.params,org.apache.tuscany

- .sca.interfacedef.wsdl,org.apache.tuscany.sca.xsd,org.apache.tuscany.

- sca.databinding,org.apache.axis2.addressing,org.apache.axis2.deployme

- nt,org.apache.axis2.transport.http,org.apache.tuscany.sca.runtime,org

- .apache.commons.logging,org.apache.tuscany.sca.interfacedef.util,org.

- apache.tuscany.sca.provider,org.apache.tuscany.sca.core,javax.xml.tra

- nsform.dom,org.apache.tuscany.sca.policy,org.apache.axis2.description

- ,javax.wsdl.extensions,org.apache.tuscany.sca.host.http,org.apache.tu

- scany.sca.policy.util,org.apache.axis2.util.threadpool,org.apache.ws.

- security,org.apache.axis2,org.apache.ws.commons.schema,org.apache.tus

- cany.sca.assembly,org.apache.ws.commons.schema.resolver,javax.wsdl.ex

- tensions.soap,org.apache.tuscany.sca.interfacedef,org.apache.tuscany.

- sca.invocation,javax.xml.transform,javax.wsdl.extensions.soap12,org.a

- pache.tuscany.sca.contribution.processor,javax.servlet.http";version=

- "1.4"

+Export-Package: org.apache.tuscany.sca.binding.ws.axis2;version="2.0.0";

+  uses:="org.apache.axis2.deployment.util,

+   org.apache.tuscany.sca.definitions,

+   org.apache.tuscany.sca.policy.authentication.basic,

+   org.apache.tuscany.sca.policy.security.ws,

+   org.apache.ws.security.handler,

+   javax.xml.namespace,

+   org.apache.axiom.om,

+   org.xml.sax,

+   org.apache.commons.httpclient,

+   org.apache.axiom.soap,

+   org.apache.axis2.util,

+   javax.servlet,

+   javax.xml.stream,

+   org.apache.tuscany.sca.core.assembly,

+   org.apache.axis2.transport.http.server,

+   org.osoa.sca,

+   org.apache.axis2.i18n,

+   org.apache.axis2.transport,

+   org.apache.axis2.transport.jms,

+   org.apache.axis2.client,

+   org.apache.axis2.context,

+   org.apache.axiom.om.impl.builder,

+   org.apache.tuscany.sca.interfacedef.java,

+   org.w3c.dom,

+   javax.wsdl,

+   org.apache.tuscany.sca.xsd.xml,

+   org.apache.tuscany.sca.binding.ws,

+   org.apache.axis2.engine,

+   org.apache.axis2.receivers,

+   org.apache.commons.httpclient.params,

+   org.apache.tuscany.sca.interfacedef.wsdl,

+   org.apache.tuscany.sca.xsd,

+   org.apache.tuscany.sca.databinding,

+   org.apache.axis2.addressing,

+   org.apache.axis2.deployment,

+   org.apache.axis2.transport.http,

+   org.apache.tuscany.sca.runtime,

+   org.apache.commons.logging,

+   org.apache.tuscany.sca.interfacedef.util,

+   org.apache.tuscany.sca.provider,

+   org.apache.tuscany.sca.core,

+   javax.xml.transform.dom,

+   org.apache.tuscany.sca.policy,

+   org.apache.axis2.description,

+   javax.wsdl.extensions,

+   org.apache.tuscany.sca.host.http,

+   org.apache.tuscany.sca.policy.util,

+   org.apache.axis2.util.threadpool,

+   org.apache.ws.security,

+   org.apache.axis2,

+   org.apache.ws.commons.schema,

+   org.apache.tuscany.sca.assembly,

+   org.apache.ws.commons.schema.resolver,

+   javax.wsdl.extensions.soap,

+   org.apache.tuscany.sca.interfacedef,

+   org.apache.tuscany.sca.invocation,

+   javax.xml.transform,

+   javax.wsdl.extensions.soap12,

+   org.apache.tuscany.sca.contribution.processor,

+   javax.servlet.http"

 Private-Package: org.apache.tuscany.sca.binding.ws.axis2.engine.config

  ;version="2.0.0",org.apache.tuscany.sca.binding.ws.axis2.engine.config.

  modules;version="2.0.0",org.apache.tuscany.sca.binding.ws.axis2.engine.

diff --git a/java/sca/modules/binding-ws/META-INF/MANIFEST.MF b/java/sca/modules/binding-ws/META-INF/MANIFEST.MF
index a4ce5eb337..789734ec98 100644
--- a/java/sca/modules/binding-ws/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-ws/META-INF/MANIFEST.MF
@@ -1,10 +1,13 @@
 Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.binding.ws;uses:="org.apache.tu

- scany.sca.assembly,org.apache.tuscany.sca.interfacedef.wsdl,org.apach

- e.tuscany.sca.assembly.builder,org.apache.tuscany.sca.interfacedef,or

- g.w3c.dom,javax.wsdl,javax.xml.namespace";version="2.0.0",org.apache.tu

- scany.sca.binding.ws.addressing;uses:="javax.xml.namespace";version="

- 1.4"

+Export-Package: org.apache.tuscany.sca.binding.ws;version="2.0.0";

+  uses:="org.apache.tuscany.sca.assembly,

+   org.apache.tuscany.sca.interfacedef.wsdl,

+   org.apache.tuscany.sca.assembly.builder,

+   org.apache.tuscany.sca.interfacedef,

+   org.w3c.dom,

+   javax.wsdl,

+   javax.xml.namespace",

+ org.apache.tuscany.sca.binding.ws.addressing;version="2.0.0";uses:="javax.xml.namespace"

 Private-Package: org.apache.tuscany.sca.binding.ws.impl;version="2.0.0"

 Tool: Bnd-0.0.255

 Bundle-Name: Apache Tuscany SCA WS Binding Model

@@ -15,12 +18,16 @@ Bnd-LastModified: 1225397286828
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA WS Binding Model

-Import-Package: javax.wsdl,javax.xml.namespace,org.apache.tuscany.sca.

- assembly;version="2.0.0",org.apache.tuscany.sca.assembly.builder;versio

- n="1.4",org.apache.tuscany.sca.binding.ws;version="2.0.0",org.apache.tu

- scany.sca.binding.ws.addressing;version="2.0.0",org.apache.tuscany.sca.

- interfacedef;version="2.0.0",org.apache.tuscany.sca.interfacedef.wsdl;v

- ersion="1.4",org.apache.tuscany.sca.policy;version="2.0.0",org.w3c.dom

+Import-Package: javax.wsdl,

+ javax.xml.namespace,

+ org.apache.tuscany.sca.assembly;version="2.0.0",

+ org.apache.tuscany.sca.assembly.builder;version="2.0.0",

+ org.apache.tuscany.sca.binding.ws;version="2.0.0",

+ org.apache.tuscany.sca.binding.ws.addressing;version="2.0.0",

+ org.apache.tuscany.sca.interfacedef;version="2.0.0",

+ org.apache.tuscany.sca.interfacedef.wsdl;version="2.0.0",

+ org.apache.tuscany.sca.policy;version="2.0.0",

+ org.w3c.dom

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.ws

 Bundle-DocURL: http://www.apache.org/