A bunch more base + extension updates

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

16 files changed, 220 insertions, 62 deletions

diff --git a/sca-java-2.x/trunk/testing/itest/ws/authentication-basic/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/authentication-basic/pom.xml
index 211cf97ceb..ea79c1a91f 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/authentication-basic/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/authentication-basic/pom.xml
@@ -33,12 +33,22 @@
         
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-feature-webservice</artifactId>
+            <artifactId>tuscany-base-runtime</artifactId>
             <version>2.0-SNAPSHOT</version>
-            <type>pom</type>
-        </dependency>
-      
+       </dependency>
+
+       <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
+            <version>2.0-SNAPSHOT</version>
+       </dependency>
                 
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+            <version>6.1.19</version>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml
index ff868b9bd3..0c279ca1f4 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml
@@ -31,12 +31,23 @@
 

     <dependencies>

         

-        <dependency>

+       <dependency>

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

+            <artifactId>tuscany-base-runtime</artifactId>

+            <version>2.0-SNAPSHOT</version>

+       </dependency>

+

+       <dependency>

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

-            <artifactId>tuscany-feature-core</artifactId>

-            <type>pom</type>

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

             <version>2.0-SNAPSHOT</version>

-        </dependency>      

+       </dependency>

+                

+        <dependency>

+            <groupId>org.mortbay.jetty</groupId>

+            <artifactId>jetty</artifactId>

+            <version>6.1.19</version>

+        </dependency>

                 

     </dependencies>

 

diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml
index 68273c819b..f6badffbce 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml
@@ -31,12 +31,23 @@
 

     <dependencies>

         

-        <dependency>

+       <dependency>

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

+            <artifactId>tuscany-base-runtime</artifactId>

+            <version>2.0-SNAPSHOT</version>

+       </dependency>

+

+       <dependency>

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

-            <artifactId>tuscany-feature-core</artifactId>

-            <type>pom</type>

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

             <version>2.0-SNAPSHOT</version>

-        </dependency>      

+       </dependency>

+                

+        <dependency>

+            <groupId>org.mortbay.jetty</groupId>

+            <artifactId>jetty</artifactId>

+            <version>6.1.19</version>

+        </dependency>

                 

     </dependencies>

 

diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml
index dcada2d5ad..6b2549e95d 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml
@@ -31,12 +31,23 @@
 

     <dependencies>

         

-        <dependency>

+       <dependency>

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

+            <artifactId>tuscany-base-runtime</artifactId>

+            <version>2.0-SNAPSHOT</version>

+       </dependency>

+

+       <dependency>

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

-            <artifactId>tuscany-feature-core</artifactId>

-            <type>pom</type>

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

             <version>2.0-SNAPSHOT</version>

-        </dependency>      

+       </dependency>

+                

+        <dependency>

+            <groupId>org.mortbay.jetty</groupId>

+            <artifactId>jetty</artifactId>

+            <version>6.1.19</version>

+        </dependency>

                 

     </dependencies>

 

diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml
index efdd580b18..e716ab7a47 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml
@@ -31,12 +31,23 @@
 

     <dependencies>

         

-        <dependency>

+       <dependency>

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

+            <artifactId>tuscany-base-runtime</artifactId>

+            <version>2.0-SNAPSHOT</version>

+       </dependency>

+

+       <dependency>

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

-            <artifactId>tuscany-feature-core</artifactId>

-            <type>pom</type>

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

             <version>2.0-SNAPSHOT</version>

-        </dependency>      

+       </dependency>

+                

+        <dependency>

+            <groupId>org.mortbay.jetty</groupId>

+            <artifactId>jetty</artifactId>

+            <version>6.1.19</version>

+        </dependency>

                 

     </dependencies>

 

diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
index c14b5cda66..e4247dbeb4 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
@@ -31,12 +31,23 @@
 

     <dependencies>

         

-        <dependency>

+       <dependency>

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

+            <artifactId>tuscany-base-runtime</artifactId>

+            <version>2.0-SNAPSHOT</version>

+       </dependency>

+

+       <dependency>

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

-            <artifactId>tuscany-feature-core</artifactId>

-            <type>pom</type>

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

             <version>2.0-SNAPSHOT</version>

-        </dependency>      

+       </dependency>

+                

+        <dependency>

+            <groupId>org.mortbay.jetty</groupId>

+            <artifactId>jetty</artifactId>

+            <version>6.1.19</version>

+        </dependency>

                 

     </dependencies>

 

diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml
index 562fd47ab6..0e0ae606c6 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml
@@ -31,12 +31,23 @@
 

     <dependencies>

         

-        <dependency>

+       <dependency>

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

+            <artifactId>tuscany-base-runtime</artifactId>

+            <version>2.0-SNAPSHOT</version>

+       </dependency>

+

+       <dependency>

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

-            <artifactId>tuscany-feature-core</artifactId>

-            <type>pom</type>

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

             <version>2.0-SNAPSHOT</version>

-        </dependency>      

+       </dependency>

+                

+        <dependency>

+            <groupId>org.mortbay.jetty</groupId>

+            <artifactId>jetty</artifactId>

+            <version>6.1.19</version>

+        </dependency>

                 

     </dependencies>

 

diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml
index de8041888b..63dc9cde67 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml
@@ -31,12 +31,23 @@
 

     <dependencies>

         

-        <dependency>

+       <dependency>

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

+            <artifactId>tuscany-base-runtime</artifactId>

+            <version>2.0-SNAPSHOT</version>

+       </dependency>

+

+       <dependency>

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

-            <artifactId>tuscany-feature-core</artifactId>

-            <type>pom</type>

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

             <version>2.0-SNAPSHOT</version>

-        </dependency>      

+       </dependency>

+                

+        <dependency>

+            <groupId>org.mortbay.jetty</groupId>

+            <artifactId>jetty</artifactId>

+            <version>6.1.19</version>

+        </dependency>

                 

     </dependencies>

 

diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml
index 400b89ad7c..ca631b05ec 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml
@@ -31,12 +31,23 @@
 

     <dependencies>

         

-        <dependency>

+       <dependency>

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

+            <artifactId>tuscany-base-runtime</artifactId>

+            <version>2.0-SNAPSHOT</version>

+       </dependency>

+

+       <dependency>

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

-            <artifactId>tuscany-feature-core</artifactId>

-            <type>pom</type>

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

             <version>2.0-SNAPSHOT</version>

-        </dependency>      

+       </dependency>

+                

+        <dependency>

+            <groupId>org.mortbay.jetty</groupId>

+            <artifactId>jetty</artifactId>

+            <version>6.1.19</version>

+        </dependency>

                 

     </dependencies>

 

diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml
index 52945adcf8..5190f5d2fe 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml
@@ -31,12 +31,23 @@
 

     <dependencies>

         

-        <dependency>

+       <dependency>

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

+            <artifactId>tuscany-base-runtime</artifactId>

+            <version>2.0-SNAPSHOT</version>

+       </dependency>

+

+       <dependency>

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

-            <artifactId>tuscany-feature-core</artifactId>

-            <type>pom</type>

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

             <version>2.0-SNAPSHOT</version>

-        </dependency>       

+       </dependency>

+                

+        <dependency>

+            <groupId>org.mortbay.jetty</groupId>

+            <artifactId>jetty</artifactId>

+            <version>6.1.19</version>

+        </dependency>

                 

     </dependencies>

 

diff --git a/sca-java-2.x/trunk/testing/itest/ws/defaults/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/defaults/pom.xml
index 2107b1fc3e..f96fba29ee 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/defaults/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/defaults/pom.xml
@@ -33,11 +33,21 @@
         
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-feature-webservice</artifactId>
+            <artifactId>tuscany-base-runtime</artifactId>
             <version>2.0-SNAPSHOT</version>
-            <type>pom</type>
+       </dependency>
+
+       <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
+            <version>2.0-SNAPSHOT</version>
+       </dependency>
+                
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+            <version>6.1.19</version>
         </dependency>
-      
                 
     </dependencies>
 
diff --git a/sca-java-2.x/trunk/testing/itest/ws/endpoint-references/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/endpoint-references/pom.xml
index 99aabcbec0..f69c303a50 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/endpoint-references/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/endpoint-references/pom.xml
@@ -33,11 +33,21 @@
         
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-feature-webservice</artifactId>
+            <artifactId>tuscany-base-runtime</artifactId>
             <version>2.0-SNAPSHOT</version>
-            <type>pom</type>
+       </dependency>
+
+       <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
+            <version>2.0-SNAPSHOT</version>
+       </dependency>
+                
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+            <version>6.1.19</version>
         </dependency>
-      
                 
     </dependencies>
 
diff --git a/sca-java-2.x/trunk/testing/itest/ws/endpoints/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/endpoints/pom.xml
index 84da8f9ab6..9bf6b21f50 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/endpoints/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/endpoints/pom.xml
@@ -33,11 +33,21 @@
         
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-feature-webservice</artifactId>
+            <artifactId>tuscany-base-runtime</artifactId>
             <version>2.0-SNAPSHOT</version>
-            <type>pom</type>
+       </dependency>
+
+       <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
+            <version>2.0-SNAPSHOT</version>
+       </dependency>
+                
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+            <version>6.1.19</version>
         </dependency>
-      
                 
     </dependencies>
 
diff --git a/sca-java-2.x/trunk/testing/itest/ws/http-ssl/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/http-ssl/pom.xml
index 05f96f4a25..e9599a38af 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/http-ssl/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/http-ssl/pom.xml
@@ -33,16 +33,21 @@
         
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-feature-webservice</artifactId>
+            <artifactId>tuscany-base-runtime</artifactId>
             <version>2.0-SNAPSHOT</version>
-            <type>pom</type>
        </dependency>
-      
+
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security</artifactId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
             <version>2.0-SNAPSHOT</version>
        </dependency>
+                
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+            <version>6.1.19</version>
+        </dependency>
                       
     </dependencies>
 
diff --git a/sca-java-2.x/trunk/testing/itest/ws/launcher-axis2/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/launcher-axis2/pom.xml
index cb917ea9d6..bca9cf004f 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/launcher-axis2/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/launcher-axis2/pom.xml
@@ -32,16 +32,20 @@
     <dependencies>

        <dependency>

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

-            <artifactId>tuscany-feature-webservice</artifactId>

+            <artifactId>tuscany-base-runtime</artifactId>

             <version>2.0-SNAPSHOT</version>

-            <type>pom</type>

-        </dependency>

+       </dependency>

 

-        <!-- Hosts -->

-        <dependency>

+       <dependency>

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

-            <artifactId>tuscany-host-jetty</artifactId>

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

             <version>2.0-SNAPSHOT</version>

+       </dependency>

+                

+        <dependency>

+            <groupId>org.mortbay.jetty</groupId>

+            <artifactId>jetty</artifactId>

+            <version>6.1.19</version>

         </dependency>

         

         <!-- Test resources -->

diff --git a/sca-java-2.x/trunk/testing/itest/ws/wsdl/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/wsdl/pom.xml
index cac59f85b4..c42a0def7e 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/wsdl/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/wsdl/pom.xml
@@ -33,11 +33,21 @@
         
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-feature-webservice</artifactId>
+            <artifactId>tuscany-base-runtime</artifactId>
             <version>2.0-SNAPSHOT</version>
-            <type>pom</type>
+       </dependency>
+
+       <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
+            <version>2.0-SNAPSHOT</version>
+       </dependency>
+                
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+            <version>6.1.19</version>
         </dependency>
-      
                 
     </dependencies>