Move the runtime over to use Axis2 1.5.1. Three main parts to this 1) replace binding-ws-axis2 and binding binding-ws-axis2-policy with binding-ws-runtime-axis which is still very much a work in progress 2) correct the axis/axiom version references across the project and make the various OSGi environments work 3) start fixing policy provides to allow the ws binding to exploit the binding wire.

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

15 files changed, 21 insertions, 15 deletions

diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/pom.xml b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/pom.xml
index be818711c4..75856a4c74 100644
--- a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/pom.xml
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/pom.xml
@@ -51,7 +51,7 @@
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
             <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld-ws/pom.xml b/sca-java-2.x/trunk/itest/bpel/helloworld-ws/pom.xml
index fcd7bda656..dffbb4f9a9 100644
--- a/sca-java-2.x/trunk/itest/bpel/helloworld-ws/pom.xml
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld-ws/pom.xml
@@ -56,7 +56,7 @@
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-ws-axis2</artifactId>
+			<artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
 			<version>2.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
diff --git a/sca-java-2.x/trunk/itest/builder/pom.xml b/sca-java-2.x/trunk/itest/builder/pom.xml
index 532a0a9f88..390716452d 100644
--- a/sca-java-2.x/trunk/itest/builder/pom.xml
+++ b/sca-java-2.x/trunk/itest/builder/pom.xml
@@ -51,7 +51,7 @@
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
             <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
diff --git a/sca-java-2.x/trunk/itest/callback-basic-ws/pom.xml b/sca-java-2.x/trunk/itest/callback-basic-ws/pom.xml
index 16a92b0245..3321a05a85 100644
--- a/sca-java-2.x/trunk/itest/callback-basic-ws/pom.xml
+++ b/sca-java-2.x/trunk/itest/callback-basic-ws/pom.xml
@@ -51,7 +51,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
             <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/pom.xml
index 6e1f180999..842a7ca47a 100644
--- a/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/pom.xml
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/pom.xml
@@ -44,7 +44,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
             <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/export-java/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/export-java/pom.xml
index 331f7bc195..a863a7843f 100644
--- a/sca-java-2.x/trunk/itest/contribution-import-export/export-java/pom.xml
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/export-java/pom.xml
@@ -44,7 +44,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
             <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/pom.xml
index 1d04a7e6cb..7fdc6b68e4 100644
--- a/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/pom.xml
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/pom.xml
@@ -50,7 +50,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
             <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-java/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/import-java/pom.xml
index 37530cb833..a0fac8b806 100644
--- a/sca-java-2.x/trunk/itest/contribution-import-export/import-java/pom.xml
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-java/pom.xml
@@ -50,7 +50,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
             <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/pom.xml
index 6d8ed9c3b8..a0d1b7d215 100644
--- a/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/pom.xml
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/pom.xml
@@ -50,7 +50,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
             <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml
index 1e3eb4f7dd..669c85ca19 100644
--- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml
+++ b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml
@@ -69,7 +69,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
             <version>${pom.version}</version>
             <scope>runtime</scope>
         </dependency>
diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/pom.xml b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/pom.xml
index 1f74290cb8..be9d12f1e2 100644
--- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/pom.xml
+++ b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/pom.xml
@@ -70,7 +70,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
             <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
diff --git a/sca-java-2.x/trunk/itest/endpoints/pom.xml b/sca-java-2.x/trunk/itest/endpoints/pom.xml
index 6a1930c627..4a962cfdf2 100644
--- a/sca-java-2.x/trunk/itest/endpoints/pom.xml
+++ b/sca-java-2.x/trunk/itest/endpoints/pom.xml
@@ -42,7 +42,7 @@
         </dependency>

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency>

 

diff --git a/sca-java-2.x/trunk/itest/implementation-spring/pom.xml b/sca-java-2.x/trunk/itest/implementation-spring/pom.xml
index 1ce02ed1ee..548b3e955e 100644
--- a/sca-java-2.x/trunk/itest/implementation-spring/pom.xml
+++ b/sca-java-2.x/trunk/itest/implementation-spring/pom.xml
@@ -54,9 +54,15 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy-security</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>        
 
         <!-- Spring dependencies... -->
         <dependency>
diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-test/pom.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-test/pom.xml
index f0df20c597..18708f0523 100644
--- a/sca-java-2.x/trunk/itest/nodes/two-nodes-test/pom.xml
+++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-test/pom.xml
@@ -51,7 +51,7 @@
         </dependency>    
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>             
     </dependencies>
diff --git a/sca-java-2.x/trunk/itest/service-reference/pom.xml b/sca-java-2.x/trunk/itest/service-reference/pom.xml
index 0fdd1cb994..ffd8d14fe6 100644
--- a/sca-java-2.x/trunk/itest/service-reference/pom.xml
+++ b/sca-java-2.x/trunk/itest/service-reference/pom.xml
@@ -51,7 +51,7 @@
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
             <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>