Upgrade to Axis2 1.5.3, Axiom 1.2.10 and Abdera 1.1.1

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

8 files changed, 86 insertions, 182 deletions

diff --git a/sca-java-2.x/trunk/distribution/all/manifests/axiom-api-1.2.7.MF b/sca-java-2.x/trunk/distribution/all/manifests/axiom-api-1.2.7.MF
deleted file mode 100644
index 3a692b6c06..0000000000
--- a/sca-java-2.x/trunk/distribution/all/manifests/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-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

-Created-By: Apache Maven

-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/distribution/all/manifests/axiom-api-1.2.8.MF b/sca-java-2.x/trunk/distribution/all/manifests/axiom-api-1.2.8.MF
deleted file mode 100644
index 671a7bff34..0000000000
--- a/sca-java-2.x/trunk/distribution/all/manifests/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/distribution/all/manifests/axis2-kernel-1.5.1.MF b/sca-java-2.x/trunk/distribution/all/manifests/axis2-kernel-1.5.1.MF
deleted file mode 100644
index 686e53ae0b..0000000000
--- a/sca-java-2.x/trunk/distribution/all/manifests/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",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

- 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/distribution/all/manifests/axis2-kernel-1.5.3.MF b/sca-java-2.x/trunk/distribution/all/manifests/axis2-kernel-1.5.3.MF
new file mode 100644
index 0000000000..88a7f690a8
--- /dev/null
+++ b/sca-java-2.x/trunk/distribution/all/manifests/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/distribution/all/manifests/axis2-transport-http-1.5.1.MF b/sca-java-2.x/trunk/distribution/all/manifests/axis2-transport-http-1.5.1.MF
deleted file mode 100644
index ae6448acf5..0000000000
--- a/sca-java-2.x/trunk/distribution/all/manifests/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;bundle-version=1.5.1

diff --git a/sca-java-2.x/trunk/distribution/all/manifests/axis2-transport-http-1.5.3.MF b/sca-java-2.x/trunk/distribution/all/manifests/axis2-transport-http-1.5.3.MF
new file mode 100644
index 0000000000..cffa6fc6e1
--- /dev/null
+++ b/sca-java-2.x/trunk/distribution/all/manifests/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/distribution/all/pom.xml b/sca-java-2.x/trunk/distribution/all/pom.xml
index e621bc5bdb..97a0e8fed9 100644
--- a/sca-java-2.x/trunk/distribution/all/pom.xml
+++ b/sca-java-2.x/trunk/distribution/all/pom.xml
@@ -179,11 +179,12 @@
                                  <groupId>org.apache.tuscany.sca.aggregation</groupId>
                              </excludeGroupIds>
                              <artifactManifests>
+                             <!--
                                  <artifactManifest>
                                      <groupId>org.apache.ws.commons.axiom</groupId>
                                      <artifactId>axiom-api</artifactId>
-                                     <version>1.2.8</version>
-                                     <manifestFile>${basedir}/manifests/axiom-api-1.2.8.MF</manifestFile>
+                                     <version>1.2.10</version>
+                                     <manifestFile>${basedir}/manifests/axiom-api-1.2.10.MF</manifestFile>
                                  </artifactManifest>
                                  <artifactManifest>
                                      <groupId>org.apache.woden</groupId>
@@ -191,20 +192,21 @@
                                      <version>1.0M8</version>
                                      <manifestFile>${basedir}/manifests/woden-impl-dom-1.0M8.MF</manifestFile>
                                  </artifactManifest>
+                              -->
                                  <!-- artifactAggregations (below) is the right approach to solving the split 
                                       package between axis-kernel and axis2-transport-http however the Tuscany 
                                       runtime doesn't take any notice of it so using a fragment at the moment -->
                                  <artifactManifest>
                                      <groupId>org.apache.axis2</groupId>
                                      <artifactId>axis2-kernel</artifactId>
-                                     <version>1.5.1</version>
-                                     <manifestFile>${basedir}/manifests/axis2-kernel-1.5.1.MF</manifestFile>
+                                     <version>1.5.3</version>
+                                     <manifestFile>${basedir}/manifests/axis2-kernel-1.5.3.MF</manifestFile>
                                  </artifactManifest>
                                  <artifactManifest>
                                      <groupId>org.apache.axis2</groupId>
                                      <artifactId>axis2-transport-http</artifactId>
-                                     <version>1.5.1</version>
-                                     <manifestFile>${basedir}/manifests/axis2-transport-http-1.5.1.MF</manifestFile>
+                                     <version>1.5.3</version>
+                                     <manifestFile>${basedir}/manifests/axis2-transport-http-1.5.3.MF</manifestFile>
                                  </artifactManifest>
                                  <artifactManifest>
                                      <groupId>org.apache.axis2</groupId>
@@ -215,17 +217,17 @@
                              <!--artifactAggregations>
                                   <artifactAggregation>
                                       <symbolicName>org.apache.tuscany.sca.axis2-kernel</symbolicName>
-                                      <version>1.5.1</version>
+                                      <version>1.5.3</version>
                                       <artifactMembers>
                                           <artifactMember>
                                               <groupId>org.apache.axis2</groupId>
                                               <artifactId>axis2-kernel</artifactId>
-                                              <version>1.5.1</version>
+                                              <version>1.5.3</version>
                                           </artifactMember>
                                           <artifactMember>
                                               <groupId>org.apache.axis2</groupId>
                                               <artifactId>axis2-transport-http</artifactId>
-                                              <version>1.5.1</version>
+                                              <version>1.5.3</version>
                                           </artifactMember>
                                       </artifactMembers>
                                   </artifactAggregation>
@@ -369,12 +371,14 @@
                                  </extension>
                              </extensions>
                             <artifactManifests>
+                            <!--
                                  <artifactManifest>
                                      <groupId>org.apache.ws.commons.axiom</groupId>
                                      <artifactId>axiom-api</artifactId>
-                                     <version>1.2.8</version>
-                                     <manifestFile>${basedir}/manifests/axiom-api-1.2.8.MF</manifestFile>
+                                     <version>1.2.10</version>
+                                     <manifestFile>${basedir}/manifests/axiom-api-1.2.10.MF</manifestFile>
                                  </artifactManifest>
+                                 -->
                                  <artifactManifest>
                                      <groupId>org.apache.woden</groupId>
                                      <artifactId>woden-impl-dom</artifactId>
@@ -384,14 +388,14 @@
                                  <artifactManifest>
                                      <groupId>org.apache.axis2</groupId>
                                      <artifactId>axis2-kernel</artifactId>
-                                     <version>1.5.1</version>
-                                     <manifestFile>${basedir}/manifests/axis2-kernel-1.5.1.MF</manifestFile>
+                                     <version>1.5.3</version>
+                                     <manifestFile>${basedir}/manifests/axis2-kernel-1.5.3.MF</manifestFile>
                                  </artifactManifest>
                                  <artifactManifest>
                                      <groupId>org.apache.axis2</groupId>
                                      <artifactId>axis2-transport-http</artifactId>
-                                     <version>1.5.1</version>
-                                     <manifestFile>${basedir}/manifests/axis2-transport-http-1.5.1.MF</manifestFile>
+                                     <version>1.5.3</version>
+                                     <manifestFile>${basedir}/manifests/axis2-transport-http-1.5.3.MF</manifestFile>
                                  </artifactManifest>
                                  <artifactManifest>
                                      <groupId>org.apache.axis2</groupId>
diff --git a/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE b/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
index bbab062516..6e814119f0 100644
--- a/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
+++ b/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
@@ -215,30 +215,30 @@ conditions of the following licenses.
 

 The following components come under Apache Software License 2.0

 

- abdera-client-1.0.jar

- abdera-core-1.0.jar

- abdera-extensions-html-1.0.jar

- abdera-extensions-json-1.0.jar

- abdera-extensions-main-1.0.jar

- abdera-i18n-1.0.jar

- abdera-parser-1.0.jar

- abdera-server-1.0.jar

+ abdera-client-1.1.jar

+ abdera-core-1.1.jar

+ abdera-extensions-html-1.1.jar

+ abdera-extensions-json-1.1.jar

+ abdera-extensions-main-1.1.jar

+ abdera-i18n-1.1.jar

+ abdera-parser-1.1.jar

+ abdera-server-1.1.jar

  addressing-1.3.mar

  aopalliance-1.0.jar

  annogen-0.1.0.jar

  aspectjrt-1.6.8.jar

  aspectjweaver-1.6.8.jar

- axiom-api-1.2.8.jar

- axiom-dom-1.2.8.jar

- axiom-impl-1.2.8.jar

- axis2-codegen-1.5.1.jar

- axis2-kernel-1.5.1.jar

- axis2-java2wsdl-1.5.1.jar

- axis2-mtompolicy-1.5.1.jar

+ axiom-api-1.2.10.jar

+ axiom-dom-1.2.10.jar

+ axiom-impl-1.2.10.jar

+ axis2-codegen-1.5.3.jar

+ axis2-kernel-1.5.3.jar

+ axis2-java2wsdl-1.5.3.jar

+ axis2-mtompolicy-1.5.3.jar

  axis2-transport-base-1.0.0.jar

  axis2-transport-jms-1.0.0.jar

- axis2-transport-local-1.5.1.jar

- axis2-transport-http-1.5.1.jar

+ axis2-transport-local-1.5.3.jar

+ axis2-transport-http-1.5.3.jar

  axis-ant-1.4.jar

  bsf-utils-3.1.jar

  cglib-2.2.jar

@@ -274,9 +274,9 @@ The following components come under Apache Software License 2.0
  gson-1.4.jar

  hazelcast-1.8.3.jar

  hazelcast-client-1.8.3.jar

- httpclient-4.0.jar

- httpcore-4.0.1.jar

- httpcore-nio-4.0.1.jar

+ httpclient-4.0.3.jar

+ httpcore-4.1.jar

+ httpcore-nio-4.1.jar

  jabsorb-1.3.1.jar

  jackson-core-asl-1.6.2.jar

  jackson-mapper-asl-1.6.2.jar