10 files changed, 53 insertions, 177 deletions
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 a2c1fe03ea..98360d8566 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
@@ -68,27 +68,20 @@ Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA Axis2-based WS Binding Extension
 Eclipse-RegisterBuddy: org.apache.axis2.kernel
-Import-Package: javax.activation;resolution:=optional,
- javax.security.auth.callback;resolution:=optional,
- javax.servlet,
+Import-Package: javax.servlet,
  javax.servlet.http,
  javax.wsdl,
  javax.wsdl.extensions,
  javax.wsdl.extensions.soap,
  javax.wsdl.extensions.soap12,
- javax.wsdl.factory;resolution:=optional,
- javax.wsdl.xml;resolution:=optional,
  javax.xml.namespace,
  javax.xml.parsers,
  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,
- org.apache.axiom.util.base64,
  org.apache.axiom.soap,
+ org.apache.axiom.util.base64,
  org.apache.axis2,
  org.apache.axis2.addressing,
  org.apache.axis2.addressing.wsdl,
@@ -99,19 +92,14 @@ Import-Package: javax.activation;resolution:=optional,
  org.apache.axis2.description,
  org.apache.axis2.engine,
  org.apache.axis2.handlers,
- org.apache.axis2.i18n,
  org.apache.axis2.receivers,
- org.apache.axis2.transport,
  org.apache.axis2.transport.http,
- org.apache.axis2.transport.http.server,
  org.apache.axis2.transport.jms,
  org.apache.axis2.transport.local,
- org.apache.axis2.util,
  org.apache.axis2.util.threadpool,
  org.apache.commons.httpclient,
  org.apache.commons.httpclient.params,
  org.apache.commons.logging;resolution:=optional,
- org.apache.neethi,
  org.apache.tuscany.sca.assembly;version="2.0.0",
  org.apache.tuscany.sca.assembly.xml;version="2.0.0",
  org.apache.tuscany.sca.binding.ws;version="2.0.0",
@@ -121,7 +109,6 @@ Import-Package: javax.activation;resolution:=optional,
  org.apache.tuscany.sca.core;version="2.0.0",
  org.apache.tuscany.sca.core.assembly;version="2.0.0",
  org.apache.tuscany.sca.databinding;version="2.0.0",
- org.apache.tuscany.sca.definitions;version="2.0.0",
  org.apache.tuscany.sca.extensibility;version="2.0.0",
  org.apache.tuscany.sca.host.http;version="2.0.0",
  org.apache.tuscany.sca.interfacedef;version="2.0.0",
@@ -137,11 +124,8 @@ Import-Package: javax.activation;resolution:=optional,
  org.apache.tuscany.sca.provider;version="2.0.0",
  org.apache.tuscany.sca.runtime;version="2.0.0",
  org.apache.tuscany.sca.xsd;version="2.0.0",
- org.apache.tuscany.sca.xsd.xml;version="2.0.0",
  org.apache.ws.commons.schema,
  org.apache.ws.commons.schema.resolver,
- org.apache.ws.security,
- org.apache.ws.security.handler,
  org.oasisopen.sca;version="2.0.0",
  org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional,
  org.w3c.dom,
diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/pom.xml b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/pom.xml
index 25bbea3a77..09ce75a412 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/pom.xml
@@ -179,13 +179,13 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
-            <version>4.1</version>
+            <version>4.0.1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore-nio</artifactId>
-            <version>4.1</version>
+            <version>4.0.1</version>
         </dependency>
 
         <dependency>
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.7.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.7.MF
deleted file mode 100644
index 41dcb9390e..0000000000
--- a/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axiom-api-1.2.7.MF
+++ /dev/null
@@ -1,47 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Axiom API
-Bundle-SymbolicName: org.apache.ws.commons.axiom.axiom-api
-Bundle-Version: 1.2.7
-Bundle-ClassPath: axiom-api-1.2.7.jar
-Bundle-Vendor: Apache Software Foundation
-Export-Package: org.apache.axiom.attachments,
- org.apache.axiom.attachments.impl,
- org.apache.axiom.attachments.lifecycle,
- org.apache.axiom.attachments.lifecycle.impl,
- org.apache.axiom.attachments.utils,
- org.apache.axiom.om,
- org.apache.axiom.om.ds,
- org.apache.axiom.om.ds.custombuilder,
- org.apache.axiom.om.impl,
- org.apache.axiom.om.impl.builder,
- org.apache.axiom.om.impl.exception,
- org.apache.axiom.om.impl.serialize,
- org.apache.axiom.om.impl.traverse,
- org.apache.axiom.om.impl.util,
- org.apache.axiom.om.util,
- org.apache.axiom.om.xpath,
- org.apache.axiom.soap,
- org.apache.axiom.soap.impl.builder
-Archiver-Version: Plexus Archiver
-Build-Jdk: 1.5.0_15
-Bundle-DocURL: http://www.apache.org/
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Built-By: dims
-Import-Package: javax.activation,
- javax.mail,
- javax.mail.internet,
- javax.xml.namespace,
- javax.xml.stream,
- 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,
- org.apache.axiom.soap.impl.llom.soap11;resolution:=optional,
- org.apache.axiom.soap.impl.llom.soap12;resolution:=optional,
- org.apache.commons.logging,
- org.jaxen;resolution:=optional,
- org.jaxen.saxpath;resolution:=optional,
- org.jaxen.util;resolution:=optional,
- org.w3c.dom,
- org.xml.sax,
- org.xml.sax.helpers
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.8.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.8.MF
deleted file mode 100644
index 671a7bff34..0000000000
--- a/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axiom-api-1.2.8.MF
+++ /dev/null
@@ -1,49 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Axiom API
-Bundle-SymbolicName: org.apache.ws.commons.axiom.axiom-api
-Bundle-Version: 1.2.8
-Bundle-Vendor: Apache Software Foundation
-Bundle-DocURL: http://www.apache.org/
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-ClassPath: axiom-api-1.2.8.jar
-Export-Package: org.apache.axiom.attachments,
- org.apache.axiom.attachments.impl,
- org.apache.axiom.attachments.lifecycle,
- org.apache.axiom.attachments.lifecycle.impl,
- org.apache.axiom.attachments.utils,
- org.apache.axiom.om,
- org.apache.axiom.om.ds,
- org.apache.axiom.om.ds.custombuilder,
- org.apache.axiom.om.impl,
- org.apache.axiom.om.impl.builder,
- org.apache.axiom.om.impl.exception,
- org.apache.axiom.om.impl.serialize,
- org.apache.axiom.om.impl.traverse,
- org.apache.axiom.om.impl.util,
- org.apache.axiom.om.util,
- org.apache.axiom.om.xpath,
- org.apache.axiom.soap,
- org.apache.axiom.soap.impl.builder
-Archiver-Version: Plexus Archiver
-Build-Jdk: 1.5.0_15
-Created-By: Apache Maven
-Built-By: dims
-Import-Package: javax.activation,
- javax.mail,
- 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,
- org.apache.axiom.soap.impl.llom.soap11;resolution:=optional,
- org.apache.axiom.soap.impl.llom.soap12;resolution:=optional,
- org.apache.commons.logging,
- org.jaxen;resolution:=optional,
- org.jaxen.saxpath;resolution:=optional,
- org.jaxen.util;resolution:=optional,
- org.w3c.dom,
- org.xml.sax,
- org.xml.sax.helpers
diff --git a/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-kernel-1.4.1.MF b/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-kernel-1.4.1.MF
deleted file mode 100644
index 58630c02ef..0000000000
--- a/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-kernel-1.4.1.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/sca-java-2.x/trunk/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/trunk/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-kernel-1.5.1.MF
deleted file mode 100644
index 107916e4f7..0000000000
--- a/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-kernel-1.5.1.MF
+++ /dev/null
@@ -1,39 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-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",*
-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
- he.axis2.phaseresolver;version=1.5.1,org.apache.axis2.deployment.repo
- sitory.util;version=1.5.1,org.apache.axis2.deployment;version=1.5.1,o
- rg.apache.axis2.java.security;version=1.5.1,org.apache.axis2.engine;v
- ersion=1.5.1,org.apache.axis2.context;version=1.5.1,org.apache.axis2.
- addressing.i18n;version=1.5.1,org.apache.axis2.modules;version=1.5.1,
- org.apache.axis2.addressing.metadata;version=1.5.1,org.apache.axis2.d
- ataretrieval.client;version=1.5.1,org.apache.axis2.service;version=1.
- 5.1,org.apache.axis2.description.java2wsdl.bytecode;version=1.5.1,org
- .apache.axis2.i18n;version=1.5.1,org.apache.axis2.deployment.schedule
- r;version=1.5.1,org.apache.axis2.description.java2wsdl;version=1.5.1,
- org.apache.axis2.transport;version=1.5.1,org.apache.axis2.transport.h
- ttp;version=1.5.1,org.apache.axis2.client;version=1.5.1,org.apache.ax
- is2.wsdl;version=1.5.1,org.apache.axis2.util.threadpool;version=1.5.1
- ,org.apache.axis2.client.async;version=1.5.1,org.apache.axis2.receive
- rs;version=1.5.1,org.apache.axis2.util;version=1.5.1,org.apache.axis2
- .namespace;version=1.5.1,org.apache.axis2.transport.http.util;version
- =1.5.1,org.apache.axis2.context.externalize;version=1.5.1,org.apache.
- axis2.addressing;version=1.5.1,org.apache.axis2.deployment.util;versi
- on=1.5.1,org.apache.axis2.dispatchers;version=1.5.1,org.apache.axis2.
- deployment.resolver;version=1.5.1,org.apache.axis2.clustering.configu
- ration;version=1.5.1,org.apache.axis2.transaction;version=1.5.1,org.a
- pache.axis2.clustering;version=1.5.1,org.apache.axis2.wsdl.util;versi
- on=1.5.1,org.apache.axis2.clustering.context;version=1.5.1,org.apache
- .axis2.builder.unknowncontent;version=1.5.1,org.apache.axis2.handlers
- ;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/trunk/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-kernel-1.5.3.MF b/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-kernel-1.5.3.MF
new file mode 100644
index 0000000000..88a7f690a8
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-kernel-1.5.3.MF
@@ -0,0 +1,36 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.apache.axis2.axis2-kernel
+Bundle-Name: org.apache.axis2.axis2-kernel
+Bundle-Version: 1.5.3
+DynamicImport-Package: javax.transaction;version="1.1",javax.transacti
+ on.xa;version="1.1",*
+Bundle-ClassPath: axis2-kernel-1.5.3.jar
+Export-Package: org.apache.axis2.client;version=1.5.3,org.apache.axis2
+ .transaction;version=1.5.3,org.apache.axis2.classloader;version=1.5.3
+ ,org.apache.axis2.wsdl.util;version=1.5.3,org.apache.axis2.descriptio
+ n.java2wsdl.bytecode;version=1.5.3,org.apache.axis2.handlers;version=
+ 1.5.3,org.apache.axis2.dispatchers;version=1.5.3,org.apache.axis2.clu
+ stering.configuration;version=1.5.3,org.apache.axis2.java.security;ve
+ rsion=1.5.3,org.apache.axis2.phaseresolver;version=1.5.3,org.apache.a
+ xis2.transport.http.util;version=1.5.3,org.apache.axis2.addressing.ws
+ dl;version=1.5.3,org.apache.axis2.description;version=1.5.3,org.apach
+ e.axis2.description.java2wsdl;version=1.5.3,org.apache.axis2.addressi
+ ng.i18n;version=1.5.3,org.apache.axis2.deployment.repository.util;ver
+ sion=1.5.3,org.apache.axis2.modules;version=1.5.3,org.apache.axis2.de
+ ployment.resolver;version=1.5.3,org.apache.axis2.client.async;version
+ =1.5.3,org.apache.axis2.builder;version=1.5.3,org.apache.axis2.util;v
+ ersion=1.5.3,org.apache.axis2.clustering;version=1.5.3,org.apache.axi
+ s2.clustering.context;version=1.5.3,org.apache.axis2.builder.unknownc
+ ontent;version=1.5.3,org.apache.axis2.dataretrieval.client;version=1.
+ 5.3,org.apache.axis2.context.externalize;version=1.5.3,org.apache.axi
+ s2.dataretrieval;version=1.5.3,org.apache.axis2.addressing.metadata;v
+ ersion=1.5.3,org.apache.axis2.receivers;version=1.5.3,org.apache.axis
+ 2.deployment.scheduler;version=1.5.3,org.apache.axis2;version=1.5.3,o
+ rg.apache.axis2.deployment;version=1.5.3,org.apache.axis2.deployment.
+ util;version=1.5.3,org.apache.axis2.util.threadpool;version=1.5.3,org
+ .apache.axis2.i18n;version=1.5.3,org.apache.axis2.engine;version=1.5.
+ 3,org.apache.axis2.wsdl;version=1.5.3,org.apache.axis2.transport;vers
+ ion=1.5.3,org.apache.axis2.addressing;version=1.5.3,org.apache.axis2.
+ namespace;version=1.5.3,org.apache.axis2.context;version=1.5.3,org.ap
+ ache.axis2.service;version=1.5.3
diff --git a/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-transport-http-1.5.1.MF b/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-transport-http-1.5.1.MF
deleted file mode 100644
index efe4d924ce..0000000000
--- a/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-transport-http-1.5.1.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.apache.axis2.transport.http
-Bundle-Name: org.apache.axis2.transport.http
-Bundle-Version: 1.5.1
-DynamicImport-Package: javax.transaction;version="1.1",javax.transacti
- on.xa;version="1.1",*
-Bundle-ClassPath: axis2-transport-http-1.5.1.jar
-Export-Package: org.apache.axis2.transport.http.server;version=1.5.1,o
- rg.apache.axis2.transport.http;version=1.5.1,org.apache.axis2.transpo
- rt.http.util;version=1.5.1
-Fragment-Host: org.apache.axis2.kernel;bunlde-version=1.5.1
diff --git a/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-transport-http-1.5.3.MF b/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-transport-http-1.5.3.MF
new file mode 100644
index 0000000000..cffa6fc6e1
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-transport-http-1.5.3.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: axis2-transport-http
+Bundle-Name: axis2-transport-http
+Bundle-Version: 1.5.3
+DynamicImport-Package: javax.transaction;version="1.1",javax.transacti
+ on.xa;version="1.1",*
+Bundle-ClassPath: axis2-transport-http-1.5.3.jar
+Export-Package: org.apache.axis2.transport.http.server;version=1.5.3,o
+ rg.apache.axis2.transport.http;version=1.5.3,org.apache.axis2.transpo
+ rt.http.util;version=1.5.3
diff --git a/sca-java-2.x/trunk/modules/policy-wspolicy/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/policy-wspolicy/META-INF/MANIFEST.MF
index 5dcfbd5b14..7d0d0b62a1 100644
--- a/sca-java-2.x/trunk/modules/policy-wspolicy/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/policy-wspolicy/META-INF/MANIFEST.MF
@@ -12,21 +12,15 @@ Import-Package: javax.xml.namespace,
  org.apache.axiom.om.impl.builder,
  org.apache.neethi,
  org.apache.tuscany.sca.assembly;version="2.0.0",
- org.apache.tuscany.sca.assembly.builder;version="2.0.0", 
- org.apache.tuscany.sca.common.xml.stax;version="2.0.0",
+ org.apache.tuscany.sca.assembly.builder;version="2.0.0",
  org.apache.tuscany.sca.common.xml.stax.reader;version="2.0.0",
  org.apache.tuscany.sca.contribution.processor;version="2.0.0",
  org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
  org.apache.tuscany.sca.core;version="2.0.0",
  org.apache.tuscany.sca.definitions;version="2.0.0",
- org.apache.tuscany.sca.interfacedef;version="2.0.0",
- org.apache.tuscany.sca.invocation;version="2.0.0",
  org.apache.tuscany.sca.monitor;version="2.0.0",
  org.apache.tuscany.sca.policy;version="2.0.0";resolution:=optional,
- org.apache.tuscany.sca.policy.xml;version="2.0.0";resolution:=optional,
- org.apache.tuscany.sca.provider;version="2.0.0",
- org.apache.tuscany.sca.runtime;version="2.0.0",
- org.oasisopen.sca.annotation
+ org.apache.tuscany.sca.policy.xml;version="2.0.0";resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.policy.wspolicy
 Bundle-DocURL: http://www.apache.org/
 Export-Package: org.apache.tuscany.sca.policy.wspolicy.xml;version="2.0.0";