[TUSCANY-4071] upgrade binding.ws to Axis2 1.6.2

• Type: Improvement
• Status: Open
• Priority: Major
• Resolution: Unresolved
• Affects Version/s: Java-SCA-2.0-Beta3
• Component/s: Java SCA Axis Binding Extension
• Assignee: Unassigned
• Reporter: Tom Seelbach
• Created: 01/Oct/12 18:03
• Updated: 01/Oct/12 18:03

Description

To upgrade ws binding to axis2 1.6.2 (latest released version), i updated the pom.xml to change axis2 and related subproject levels. Subproject levels match the levels shipped with axis2 1.6.2.

I also had to change binding/ws/axis2/provider/Axis2EngineIntegration.java because of a method signature change
3 diffs provided:
1) pom.xml
2) pom.xml with context
3)Axis2EngineIntegration

========
tsee@IBM-L0O1MKIE1TN /c/apache/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2
$ diff -w pom.xml pom.xml.NEW
63c63
< <version>1.5.3</version>
—
> <version>1.6.2</version>
87c87
< <version>1.5.1</version>
—
> <version>1.6.2</version>
121,122c121,122
< <exclusion>
< <groupId>org.bouncycastle</groupId>
—
> <!-- <exclusion>
> <groupId>bouncycastle</groupId>
124a125,129
> -->
> <exclusion>
> <groupId>bouncycastle</groupId>
> <artifactId>bcprov-jdk15</artifactId>
> </exclusion>
328c333
< <version>1.2.10</version>
—
> <version>1.2.13</version>
354c359
< <version>1.2.10</version>
—
> <version>1.2.13</version>
378c383
< <version>2.0.4</version>
—
> <version>3.0.2</version>

$ diff -w -c pom.xml pom.xml.NEW

• • • pom.xml 2012-10-01 13:43:26.670591100 -0400
    • pom.xml.NEW 2012-10-01 13:40:44.534317400 -0400
      ***************
    • 60,66 ****
      <dependency>
      <groupId>org.apache.axis2</groupId>
      <artifactId>org.apache.axis2.osgi</artifactId>
      ! <version>1.5.3</version>
      <exclusions>
      <exclusion>
      <groupId>org.apache.axis2</groupId>
    • 60,66 ----
      <dependency>
      <groupId>org.apache.axis2</groupId>
      <artifactId>org.apache.axis2.osgi</artifactId>
      ! <version>1.6.2</version>
      <exclusions>
      <exclusion>
      <groupId>org.apache.axis2</groupId>
      ***************
    • 84,90 ****
      <dependency>
      <groupId>org.apache.rampart</groupId>
      <artifactId>rampart-core</artifactId>
      ! <version>1.5.1</version>
      <exclusions>
      <!--
      We can live without most of the Rampart dependencies. The following
    • 84,90 ----
      <dependency>
      <groupId>org.apache.rampart</groupId>
      <artifactId>rampart-core</artifactId>
      ! <version>1.6.2</version>
      <exclusions>
      <!--
      We can live without most of the Rampart dependencies. The following
      ***************
    • 118,127 ****
      <groupId>bouncycastle</groupId>
      <artifactId>bcprov-jdk14</artifactId>
      </exclusion>
      ! <exclusion>
      ! <groupId>org.bouncycastle</groupId>
      <artifactId>bcprov-ext-jdk15</artifactId>
      </exclusion>
      <exclusion>
      <groupId>org.slf4j</groupId>
      <artifactId>slf4j-jdk14</artifactId>
    • 118,132 ----
      <groupId>bouncycastle</groupId>
      <artifactId>bcprov-jdk14</artifactId>
      </exclusion>
      ! <!-- <exclusion>
      ! <groupId>bouncycastle</groupId>
      <artifactId>bcprov-ext-jdk15</artifactId>
      </exclusion>
      + -->
      + <exclusion>
      + <groupId>bouncycastle</groupId>
      + <artifactId>bcprov-jdk15</artifactId>
      + </exclusion>
      <exclusion>
      <groupId>org.slf4j</groupId>
      <artifactId>slf4j-jdk14</artifactId>
      ***************
    • 325,331 ****
      <dependency>
      <groupId>org.apache.ws.commons.axiom</groupId>
      <artifactId>axiom-api</artifactId>
      ! <version>1.2.10</version>
      <exclusions>
      <exclusion>
      <groupId>org.apache.geronimo.specs</groupId>
    • 330,336 ----
      <dependency>
      <groupId>org.apache.ws.commons.axiom</groupId>
      <artifactId>axiom-api</artifactId>
      ! <version>1.2.13</version>
      <exclusions>
      <exclusion>
      <groupId>org.apache.geronimo.specs</groupId>
      ***************
    • 351,357 ****
      <dependency>
      <groupId>org.apache.ws.commons.axiom</groupId>
      <artifactId>axiom-impl</artifactId>
      ! <version>1.2.10</version>
      <exclusions>
      <exclusion>
      <groupId>org.apache.geronimo.specs</groupId>
    • 356,362 ----
      <dependency>
      <groupId>org.apache.ws.commons.axiom</groupId>
      <artifactId>axiom-impl</artifactId>
      ! <version>1.2.13</version>
      <exclusions>
      <exclusion>
      <groupId>org.apache.geronimo.specs</groupId>
      ***************
    • 375,381 ****
      <dependency>
      <groupId>org.apache.neethi</groupId>
      <artifactId>neethi</artifactId>
      ! <version>2.0.4</version>
      <exclusions>
      <exclusion>
      <groupId>org.codehaus.woodstox</groupId>
    • 380,386 ----
      <dependency>
      <groupId>org.apache.neethi</groupId>
      <artifactId>neethi</artifactId>
      ! <version>3.0.2</version>
      <exclusions>
      <exclusion>
      <groupId>org.codehaus.woodstox</groupId>

==================

tsee@IBM-L0O1MKIE1TN /c/apache/repos/asf/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider
$ diff -w Axis2EngineIntegration.java Axis2EngineIntegration.java.NEW
215c215,216
< (File) axisConfiguration.getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR));
—
> (File) axisConfiguration.getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR),
> false); //TODO isChildFirstClassLoading set to false. No idea if its correct