Update 1.x trunk version to 1.7-SNAPSHOT

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

98 files changed, 912 insertions, 912 deletions

diff --git a/sca-java-1.x/trunk/samples/binding-echo-extension/pom.xml b/sca-java-1.x/trunk/samples/binding-echo-extension/pom.xml
index 75e36e4b1a..05d9fc8756 100644
--- a/sca-java-1.x/trunk/samples/binding-echo-extension/pom.xml
+++ b/sca-java-1.x/trunk/samples/binding-echo-extension/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-binding-echo-extension</artifactId>
@@ -39,26 +39,26 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-1.x/trunk/samples/binding-echo/pom.xml b/sca-java-1.x/trunk/samples/binding-echo/pom.xml
index 4fd96aa40b..df28edc1b0 100644
--- a/sca-java-1.x/trunk/samples/binding-echo/pom.xml
+++ b/sca-java-1.x/trunk/samples/binding-echo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-binding-echo</artifactId>
@@ -39,19 +39,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>sample-binding-echo-extension</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
diff --git a/sca-java-1.x/trunk/samples/binding-notification-broker/pom.xml b/sca-java-1.x/trunk/samples/binding-notification-broker/pom.xml
index 0bd593fea1..b7658e0874 100644
--- a/sca-java-1.x/trunk/samples/binding-notification-broker/pom.xml
+++ b/sca-java-1.x/trunk/samples/binding-notification-broker/pom.xml
@@ -22,54 +22,54 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-binding-notification-broker</artifactId>

     <name>Apache Tuscany SCA Sample Notification Binding Broker</name>

-    <version>1.6-SNAPSHOT</version>

+    <version>1.7-SNAPSHOT</version>

     <description>A sample illustrating use of binding.notification</description>

 

     <dependencies>

         <dependency>

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

             <artifactId>tuscany-implementation-notification</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-binding-notification</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-databinding</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <!-- test dependencies -->

         <dependency>

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

             <artifactId>tuscany-interface-wsdl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>  

         <dependency>

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

             <artifactId>tuscany-interface-wsdl-xml</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>     

         <!-- test dependencies -->

diff --git a/sca-java-1.x/trunk/samples/binding-notification-consumer/pom.xml b/sca-java-1.x/trunk/samples/binding-notification-consumer/pom.xml
index dae190f23b..b1886c15e6 100644
--- a/sca-java-1.x/trunk/samples/binding-notification-consumer/pom.xml
+++ b/sca-java-1.x/trunk/samples/binding-notification-consumer/pom.xml
@@ -22,60 +22,60 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-binding-notification-consumer</artifactId>

     <name>Apache Tuscany SCA Sample Notification Binding Consumer</name>

-    <version>1.6-SNAPSHOT</version>

+    <version>1.7-SNAPSHOT</version>

     <description>A sample illustrating use of binding.notification</description>

 

     <dependencies>

         <dependency>

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

             <artifactId>tuscany-implementation-notification</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-notification</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-interface-java-xml</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-interface-wsdl-xml</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>        

 

diff --git a/sca-java-1.x/trunk/samples/binding-notification-producer/pom.xml b/sca-java-1.x/trunk/samples/binding-notification-producer/pom.xml
index a9d93a5b38..dc02752b2b 100644
--- a/sca-java-1.x/trunk/samples/binding-notification-producer/pom.xml
+++ b/sca-java-1.x/trunk/samples/binding-notification-producer/pom.xml
@@ -22,46 +22,46 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-binding-notification-producer</artifactId>

     <name>Apache Tuscany SCA Sample Notification Binding Producer</name>

-    <version>1.6-SNAPSHOT</version>

+    <version>1.7-SNAPSHOT</version>

     <description>A sample illustrating use of binding.notification</description>

 

     <dependencies>

         <dependency>

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

             <artifactId>tuscany-implementation-notification</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-notification</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-interface-wsdl-xml</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

@@ -75,7 +75,7 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>        

 

diff --git a/sca-java-1.x/trunk/samples/calculator-corba-reference/pom.xml b/sca-java-1.x/trunk/samples/calculator-corba-reference/pom.xml
index 309c6594e2..e37bd896a4 100644
--- a/sca-java-1.x/trunk/samples/calculator-corba-reference/pom.xml
+++ b/sca-java-1.x/trunk/samples/calculator-corba-reference/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-calculator-corba-reference</artifactId>

@@ -39,24 +39,24 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-binding-corba-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 	<dependency>

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

             <artifactId>tuscany-host-corba-jse</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

diff --git a/sca-java-1.x/trunk/samples/calculator-corba-service/pom.xml b/sca-java-1.x/trunk/samples/calculator-corba-service/pom.xml
index 466a8004a5..225cbb7eb2 100644
--- a/sca-java-1.x/trunk/samples/calculator-corba-service/pom.xml
+++ b/sca-java-1.x/trunk/samples/calculator-corba-service/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-calculator-corba-service</artifactId>

@@ -39,24 +39,24 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-binding-corba-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 	<dependency>

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

             <artifactId>tuscany-host-corba-jse-tns</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

diff --git a/sca-java-1.x/trunk/samples/calculator-distributed/pom.xml b/sca-java-1.x/trunk/samples/calculator-distributed/pom.xml
index c0536fb3ae..258ce8371d 100644
--- a/sca-java-1.x/trunk/samples/calculator-distributed/pom.xml
+++ b/sca-java-1.x/trunk/samples/calculator-distributed/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-calculator-distributed</artifactId>
@@ -40,53 +40,53 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>                                        
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>         
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
         
@@ -100,7 +100,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>   
         
diff --git a/sca-java-1.x/trunk/samples/calculator-implementation-policies/pom.xml b/sca-java-1.x/trunk/samples/calculator-implementation-policies/pom.xml
index 863acc6c3d..00a11e1eca 100644
--- a/sca-java-1.x/trunk/samples/calculator-implementation-policies/pom.xml
+++ b/sca-java-1.x/trunk/samples/calculator-implementation-policies/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-calculator-impl-policies</artifactId>

@@ -39,13 +39,13 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

@@ -59,14 +59,14 @@
         <dependency>

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

             <artifactId>tuscany-policy-logging</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-policy-security</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/sca-java-1.x/trunk/samples/calculator-lean/pom.xml b/sca-java-1.x/trunk/samples/calculator-lean/pom.xml
index 9e8dcf34ac..e5420a7a9e 100644
--- a/sca-java-1.x/trunk/samples/calculator-lean/pom.xml
+++ b/sca-java-1.x/trunk/samples/calculator-lean/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-calculator-lean</artifactId>

@@ -39,20 +39,20 @@
         <dependency>

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

             <artifactId>tuscany-node-api</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/sca-java-1.x/trunk/samples/calculator-osgi/pom.xml b/sca-java-1.x/trunk/samples/calculator-osgi/pom.xml
index 5730bb5b0a..882550fbf1 100644
--- a/sca-java-1.x/trunk/samples/calculator-osgi/pom.xml
+++ b/sca-java-1.x/trunk/samples/calculator-osgi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-calculator-osgi</artifactId>
@@ -39,41 +39,41 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>   
         
diff --git a/sca-java-1.x/trunk/samples/calculator-rcp/pom.xml b/sca-java-1.x/trunk/samples/calculator-rcp/pom.xml
index 98a857d1af..54fe9cc2f4 100644
--- a/sca-java-1.x/trunk/samples/calculator-rcp/pom.xml
+++ b/sca-java-1.x/trunk/samples/calculator-rcp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample.calculator.rcp</artifactId>
@@ -38,36 +38,36 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <!-- 
diff --git a/sca-java-1.x/trunk/samples/calculator-rmi-reference/pom.xml b/sca-java-1.x/trunk/samples/calculator-rmi-reference/pom.xml
index 9ea2463937..1b0fc76081 100644
--- a/sca-java-1.x/trunk/samples/calculator-rmi-reference/pom.xml
+++ b/sca-java-1.x/trunk/samples/calculator-rmi-reference/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-calculator-rmi-reference</artifactId>

@@ -39,18 +39,18 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-binding-rmi-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

diff --git a/sca-java-1.x/trunk/samples/calculator-rmi-service/pom.xml b/sca-java-1.x/trunk/samples/calculator-rmi-service/pom.xml
index 56cd05e92c..9661ae3246 100644
--- a/sca-java-1.x/trunk/samples/calculator-rmi-service/pom.xml
+++ b/sca-java-1.x/trunk/samples/calculator-rmi-service/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-calculator-rmi-service</artifactId>

@@ -39,18 +39,18 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-binding-rmi-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         <dependency>

diff --git a/sca-java-1.x/trunk/samples/calculator-script/pom.xml b/sca-java-1.x/trunk/samples/calculator-script/pom.xml
index ab40071b10..fe38a24655 100644
--- a/sca-java-1.x/trunk/samples/calculator-script/pom.xml
+++ b/sca-java-1.x/trunk/samples/calculator-script/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-calculator-script</artifactId>
@@ -39,27 +39,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-script</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/trunk/samples/calculator-webapp/pom.xml b/sca-java-1.x/trunk/samples/calculator-webapp/pom.xml
index 54de1f0735..e752abda2b 100644
--- a/sca-java-1.x/trunk/samples/calculator-webapp/pom.xml
+++ b/sca-java-1.x/trunk/samples/calculator-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-calculator-webapp</artifactId>

@@ -40,13 +40,13 @@
         <dependency>

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

             <artifactId>tuscany-host-webapp</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

@@ -81,7 +81,7 @@
             <plugin>

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

                 <artifactId>tuscany-maven-ant-generator</artifactId>

-                <version>1.6-SNAPSHOT</version>

+                <version>1.7-SNAPSHOT</version>

                 <executions>

                     <execution>

                         <goals>

diff --git a/sca-java-1.x/trunk/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/trunk/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 48478ecd93..6d6c9a7c04 100644
--- a/sca-java-1.x/trunk/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/trunk/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -25,7 +25,7 @@
         <d:moduleId>
             <d:groupId>org.apache.tuscany.sca</d:groupId>
             <d:artifactId>sample-calculator-webapp</d:artifactId>
-            <d:version>1.6-SNAPSHOT</d:version>
+            <d:version>1.7-SNAPSHOT</d:version>
             <d:type>war</d:type>
         </d:moduleId>
     </d:environment>
diff --git a/sca-java-1.x/trunk/samples/calculator-ws-secure-webapp/pom.xml b/sca-java-1.x/trunk/samples/calculator-ws-secure-webapp/pom.xml
index 2d89b28320..d51c14c865 100644
--- a/sca-java-1.x/trunk/samples/calculator-ws-secure-webapp/pom.xml
+++ b/sca-java-1.x/trunk/samples/calculator-ws-secure-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-calculator-ws-secure-webapp</artifactId>

@@ -41,19 +41,19 @@
         <dependency>

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

             <artifactId>tuscany-host-webapp</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

     

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>   

 

         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

@@ -87,7 +87,7 @@
             <plugin>

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

                 <artifactId>tuscany-maven-ant-generator</artifactId>

-                <version>1.6-SNAPSHOT</version>

+                <version>1.7-SNAPSHOT</version>

                 <executions>

                     <execution>

                         <goals>

diff --git a/sca-java-1.x/trunk/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/trunk/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 7b2dc6b73a..d2471019d8 100644
--- a/sca-java-1.x/trunk/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/trunk/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -24,7 +24,7 @@
         <d:moduleId>

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

             <d:artifactId>sample-calculator-ws-webapp</d:artifactId>

-            <d:version>1.6-SNAPSHOT</d:version>

+            <d:version>1.7-SNAPSHOT</d:version>

             <d:type>war</d:type>

         </d:moduleId>

 

diff --git a/sca-java-1.x/trunk/samples/calculator-ws-webapp/pom.xml b/sca-java-1.x/trunk/samples/calculator-ws-webapp/pom.xml
index 71725be8d0..db36dc3ed4 100644
--- a/sca-java-1.x/trunk/samples/calculator-ws-webapp/pom.xml
+++ b/sca-java-1.x/trunk/samples/calculator-ws-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-calculator-ws-webapp</artifactId>

@@ -41,19 +41,19 @@
         <dependency>

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

             <artifactId>tuscany-host-webapp</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

     

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>   

 

         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

@@ -88,7 +88,7 @@
             <plugin>

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

                 <artifactId>tuscany-maven-ant-generator</artifactId>

-                <version>1.6-SNAPSHOT</version>

+                <version>1.7-SNAPSHOT</version>

                 <executions>

                     <execution>

                         <goals>

diff --git a/sca-java-1.x/trunk/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/trunk/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 344baeb738..55642dd245 100644
--- a/sca-java-1.x/trunk/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/trunk/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -24,7 +24,7 @@
         <d:moduleId>
             <d:groupId>org.apache.tuscany.sca</d:groupId>
             <d:artifactId>sample-calculator-ws-webapp</d:artifactId>
-            <d:version>1.6-SNAPSHOT</d:version>
+            <d:version>1.7-SNAPSHOT</d:version>
             <d:type>war</d:type>
         </d:moduleId>
 
diff --git a/sca-java-1.x/trunk/samples/calculator/pom.xml b/sca-java-1.x/trunk/samples/calculator/pom.xml
index 025d677929..8acac41750 100644
--- a/sca-java-1.x/trunk/samples/calculator/pom.xml
+++ b/sca-java-1.x/trunk/samples/calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-calculator</artifactId>
@@ -39,20 +39,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/trunk/samples/calculator2/pom.xml b/sca-java-1.x/trunk/samples/calculator2/pom.xml
index 9089178ac9..be4085416d 100644
--- a/sca-java-1.x/trunk/samples/calculator2/pom.xml
+++ b/sca-java-1.x/trunk/samples/calculator2/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-calculator2</artifactId>
@@ -33,20 +33,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-scdl4j</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-runtime2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/trunk/samples/callback-ws-client/pom.xml b/sca-java-1.x/trunk/samples/callback-ws-client/pom.xml
index 76f960f005..3d33beff0d 100644
--- a/sca-java-1.x/trunk/samples/callback-ws-client/pom.xml
+++ b/sca-java-1.x/trunk/samples/callback-ws-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-callback-ws-client</artifactId>

@@ -39,27 +39,27 @@
         <dependency>

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

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>       

 

@@ -73,7 +73,7 @@
         <dependency>

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

             <artifactId>sample-callback-ws-service</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>        

 

diff --git a/sca-java-1.x/trunk/samples/callback-ws-service/pom.xml b/sca-java-1.x/trunk/samples/callback-ws-service/pom.xml
index 99671a27fb..68f796d37b 100644
--- a/sca-java-1.x/trunk/samples/callback-ws-service/pom.xml
+++ b/sca-java-1.x/trunk/samples/callback-ws-service/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-callback-ws-service</artifactId>

@@ -39,27 +39,27 @@
         <dependency>

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

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>      

 

diff --git a/sca-java-1.x/trunk/samples/callbacks-jms/pom.xml b/sca-java-1.x/trunk/samples/callbacks-jms/pom.xml
index 6fc529c898..bd81d9473a 100644
--- a/sca-java-1.x/trunk/samples/callbacks-jms/pom.xml
+++ b/sca-java-1.x/trunk/samples/callbacks-jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-callbacks-jms</artifactId>

@@ -39,27 +39,27 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-jms-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-jms-asf</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

 

         <dependency>

@@ -84,14 +84,14 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 -->

diff --git a/sca-java-1.x/trunk/samples/chat-webapp/pom.xml b/sca-java-1.x/trunk/samples/chat-webapp/pom.xml
index bd82523d81..44196ceec0 100644
--- a/sca-java-1.x/trunk/samples/chat-webapp/pom.xml
+++ b/sca-java-1.x/trunk/samples/chat-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-chat-webapp</artifactId>

@@ -41,20 +41,20 @@
         <dependency>

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

             <artifactId>tuscany-host-webapp</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-dwr</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

@@ -82,7 +82,7 @@
             <plugin>

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

                 <artifactId>tuscany-maven-ant-generator</artifactId>

-                <version>1.6-SNAPSHOT</version>

+                <version>1.7-SNAPSHOT</version>

                 <executions>

                     <execution>

                         <goals>

diff --git a/sca-java-1.x/trunk/samples/chat2-webapp/build.xml b/sca-java-1.x/trunk/samples/chat2-webapp/build.xml
index b7b8cc70e7..b4ddb973e0 100644
--- a/sca-java-1.x/trunk/samples/chat2-webapp/build.xml
+++ b/sca-java-1.x/trunk/samples/chat2-webapp/build.xml
@@ -49,45 +49,45 @@
     </target>
 
     <fileset id="tuscany.jars" dir="../../modules">
-        <include name="tuscany-assembly-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-assembly-xml-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-assembly-xsd-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-dwr-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-xml-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-impl-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-java-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-namespace-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-resource-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-xml-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-core-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-core-databinding-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-core-spi-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-jaxb-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-xml-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-domain-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-domain-api-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-extensibility-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-extension-helper-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-host-embedded-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-host-http-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-host-webapp-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-java-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-java-runtime-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-java-xml-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-web-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-jaxws-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-xml-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-node-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-node-api-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-xml-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-sca-api-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xml-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xsd-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-dwr-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-xml-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-impl-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-java-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-namespace-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-resource-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-xml-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-core-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-core-databinding-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-core-spi-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-jaxb-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-xml-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-domain-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-domain-api-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-extensibility-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-extension-helper-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-host-embedded-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-host-http-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-host-webapp-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-runtime-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-xml-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-web-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-jaxws-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-xml-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-node-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-node-api-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-xml-1.7-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-1.7-SNAPSHOT.jar"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../lib">
         <include name="activation-1.1.jar"/>
diff --git a/sca-java-1.x/trunk/samples/chat2-webapp/pom.xml b/sca-java-1.x/trunk/samples/chat2-webapp/pom.xml
index 817d7e37eb..9e90486fa9 100644
--- a/sca-java-1.x/trunk/samples/chat2-webapp/pom.xml
+++ b/sca-java-1.x/trunk/samples/chat2-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-chat2-webapp</artifactId>
@@ -41,27 +41,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-dwr</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -89,7 +89,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.7-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/sca-java-1.x/trunk/samples/customer-dojo-webapp/pom.xml b/sca-java-1.x/trunk/samples/customer-dojo-webapp/pom.xml
index ab3b9458fe..658e19e384 100644
--- a/sca-java-1.x/trunk/samples/customer-dojo-webapp/pom.xml
+++ b/sca-java-1.x/trunk/samples/customer-dojo-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-customer-dojo-webapp</artifactId>
@@ -40,26 +40,26 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
          </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
          </dependency>
 		         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
                         
@@ -153,7 +153,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.7-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/trunk/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/trunk/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 544e4b96c9..f0caa07383 100644
--- a/sca-java-1.x/trunk/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/trunk/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -24,7 +24,7 @@
         <d:moduleId>
             <d:groupId>org.apache.tuscany.sca</d:groupId>
             <d:artifactId>sample-customer-dojo-webapp</d:artifactId>
-            <d:version>1.6-SNAPSHOT</d:version>
+            <d:version>1.7-SNAPSHOT</d:version>
             <d:type>war</d:type>
         </d:moduleId>
 
diff --git a/sca-java-1.x/trunk/samples/customer-dojo/pom.xml b/sca-java-1.x/trunk/samples/customer-dojo/pom.xml
index ebd268b20e..d0b76a2813 100644
--- a/sca-java-1.x/trunk/samples/customer-dojo/pom.xml
+++ b/sca-java-1.x/trunk/samples/customer-dojo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-customer-dojo</artifactId>
@@ -39,47 +39,47 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
          </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
          </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
                 
 		<dependency>
@@ -172,7 +172,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.7-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/trunk/samples/databinding-echo/pom.xml b/sca-java-1.x/trunk/samples/databinding-echo/pom.xml
index 6c7099e3f2..ec0eae0480 100644
--- a/sca-java-1.x/trunk/samples/databinding-echo/pom.xml
+++ b/sca-java-1.x/trunk/samples/databinding-echo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -40,31 +40,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>sample-binding-echo</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>      
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>          
 
         <dependency>
diff --git a/sca-java-1.x/trunk/samples/domain-management/pom.xml b/sca-java-1.x/trunk/samples/domain-management/pom.xml
index 7bdd5f70f9..bf5055ad87 100644
--- a/sca-java-1.x/trunk/samples/domain-management/pom.xml
+++ b/sca-java-1.x/trunk/samples/domain-management/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-domain-management</artifactId>
@@ -39,73 +39,73 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -117,48 +117,48 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-resource</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
@@ -177,7 +177,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.7-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/sca-java-1.x/trunk/samples/domain-webapp/build.xml b/sca-java-1.x/trunk/samples/domain-webapp/build.xml
index 77689cddb7..311e700949 100644
--- a/sca-java-1.x/trunk/samples/domain-webapp/build.xml
+++ b/sca-java-1.x/trunk/samples/domain-webapp/build.xml
@@ -135,41 +135,41 @@
         <pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-jms_1.1_spec\1.1\geronimo-jms_1.1_spec-1.1.jar"/>

         <pathelement location="${m2.repo}\org\apache\httpcomponents\jakarta-httpcore\4.0-alpha4\jakarta-httpcore-4.0-alpha4.jar"/>

         <pathelement location="${m2.repo}\org\apache\neethi\neethi\2.0.1\neethi-2.0.1.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\sca-api\1.6-SNAPSHOT\sca-api-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.6-SNAPSHOT\tuscany-assembly-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.6-SNAPSHOT\tuscany-assembly-xml-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.6-SNAPSHOT\tuscany-binding-sca-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-axis2\1.6-SNAPSHOT\tuscany-binding-sca-axis2-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.6-SNAPSHOT\tuscany-binding-sca-xml-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.6-SNAPSHOT\tuscany-binding-ws-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.6-SNAPSHOT\tuscany-binding-ws-axis2-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\1.6-SNAPSHOT\tuscany-binding-ws-xml-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\1.6-SNAPSHOT\tuscany-contribution-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.6-SNAPSHOT\tuscany-contribution-impl-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\1.6-SNAPSHOT\tuscany-contribution-java-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\1.6-SNAPSHOT\tuscany-contribution-namespace-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\1.6-SNAPSHOT\tuscany-core-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\1.6-SNAPSHOT\tuscany-core-databinding-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\1.6-SNAPSHOT\tuscany-core-spi-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\1.6-SNAPSHOT\tuscany-databinding-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\1.6-SNAPSHOT\tuscany-databinding-axiom-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed\1.6-SNAPSHOT\tuscany-distributed-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed-impl\1.6-SNAPSHOT\tuscany-distributed-impl-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\1.6-SNAPSHOT\tuscany-host-embedded-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.6-SNAPSHOT\tuscany-host-http-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-tomcat\1.6-SNAPSHOT\tuscany-host-jetty-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java\1.6-SNAPSHOT\tuscany-implementation-java-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-runtime\1.6-SNAPSHOT\tuscany-implementation-java-runtime-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-xml\1.6-SNAPSHOT\tuscany-implementation-java-xml-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\1.6-SNAPSHOT\tuscany-interface-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\1.6-SNAPSHOT\tuscany-interface-java-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\1.6-SNAPSHOT\tuscany-interface-java-xml-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\1.6-SNAPSHOT\tuscany-interface-wsdl-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.6-SNAPSHOT\tuscany-interface-wsdl-xml-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.6-SNAPSHOT\tuscany-policy-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\1.6-SNAPSHOT\tuscany-policy-xml-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology\1.6-SNAPSHOT\tuscany-topology-1.6-SNAPSHOT.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology-xml\1.6-SNAPSHOT\tuscany-topology-xml-1.6-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\sca-api\1.7-SNAPSHOT\sca-api-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.7-SNAPSHOT\tuscany-assembly-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.7-SNAPSHOT\tuscany-assembly-xml-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.7-SNAPSHOT\tuscany-binding-sca-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-axis2\1.7-SNAPSHOT\tuscany-binding-sca-axis2-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.7-SNAPSHOT\tuscany-binding-sca-xml-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.7-SNAPSHOT\tuscany-binding-ws-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.7-SNAPSHOT\tuscany-binding-ws-axis2-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\1.7-SNAPSHOT\tuscany-binding-ws-xml-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\1.7-SNAPSHOT\tuscany-contribution-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.7-SNAPSHOT\tuscany-contribution-impl-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\1.7-SNAPSHOT\tuscany-contribution-java-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\1.7-SNAPSHOT\tuscany-contribution-namespace-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\1.7-SNAPSHOT\tuscany-core-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\1.7-SNAPSHOT\tuscany-core-databinding-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\1.7-SNAPSHOT\tuscany-core-spi-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\1.7-SNAPSHOT\tuscany-databinding-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\1.7-SNAPSHOT\tuscany-databinding-axiom-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed\1.7-SNAPSHOT\tuscany-distributed-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed-impl\1.7-SNAPSHOT\tuscany-distributed-impl-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\1.7-SNAPSHOT\tuscany-host-embedded-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.7-SNAPSHOT\tuscany-host-http-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-tomcat\1.7-SNAPSHOT\tuscany-host-jetty-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java\1.7-SNAPSHOT\tuscany-implementation-java-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-runtime\1.7-SNAPSHOT\tuscany-implementation-java-runtime-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-xml\1.7-SNAPSHOT\tuscany-implementation-java-xml-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\1.7-SNAPSHOT\tuscany-interface-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\1.7-SNAPSHOT\tuscany-interface-java-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\1.7-SNAPSHOT\tuscany-interface-java-xml-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\1.7-SNAPSHOT\tuscany-interface-wsdl-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.7-SNAPSHOT\tuscany-interface-wsdl-xml-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.7-SNAPSHOT\tuscany-policy-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\1.7-SNAPSHOT\tuscany-policy-xml-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology\1.7-SNAPSHOT\tuscany-topology-1.7-SNAPSHOT.jar"/>

+        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology-xml\1.7-SNAPSHOT\tuscany-topology-xml-1.7-SNAPSHOT.jar"/>

         <pathelement location="${m2.repo}\org\apache\woden\woden\1.0-incubating-M7a\woden-1.0-incubating-M7a.jar"/>

         <pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-api\1.2.4\axiom-api-1.2.4.jar"/>

         <pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-dom\1.2.4\axiom-dom-1.2.4.jar"/>

@@ -205,40 +205,40 @@
     	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-jms_1.1_spec\1.1\geronimo-jms_1.1_spec-1.1.jar"/>

     	<pathelement location="${m2.repo}\org\apache\httpcomponents\jakarta-httpcore\4.0-alpha4\jakarta-httpcore-4.0-alpha4.jar"/>

     	<pathelement location="${m2.repo}\org\apache\neethi\neethi\2.0.1\neethi-2.0.1.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\sca-api\1.6-SNAPSHOT\sca-api-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.6-SNAPSHOT\tuscany-assembly-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.6-SNAPSHOT\tuscany-assembly-xml-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-http\1.6-SNAPSHOT\tuscany-binding-http-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-jsonrpc\1.6-SNAPSHOT\tuscany-binding-jsonrpc-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.6-SNAPSHOT\tuscany-binding-sca-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-axis2\1.6-SNAPSHOT\tuscany-binding-sca-axis2-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.6-SNAPSHOT\tuscany-binding-sca-xml-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.6-SNAPSHOT\tuscany-binding-ws-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.6-SNAPSHOT\tuscany-binding-ws-axis2-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\1.6-SNAPSHOT\tuscany-binding-ws-xml-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\1.6-SNAPSHOT\tuscany-contribution-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.6-SNAPSHOT\tuscany-contribution-impl-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\1.6-SNAPSHOT\tuscany-contribution-java-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\1.6-SNAPSHOT\tuscany-contribution-namespace-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\1.6-SNAPSHOT\tuscany-core-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\1.6-SNAPSHOT\tuscany-core-databinding-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\1.6-SNAPSHOT\tuscany-core-spi-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\1.6-SNAPSHOT\tuscany-databinding-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\1.6-SNAPSHOT\tuscany-databinding-axiom-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed\1.6-SNAPSHOT\tuscany-distributed-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed-impl\1.6-SNAPSHOT\tuscany-distributed-impl-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-extension-helper\1.6-SNAPSHOT\tuscany-extension-helper-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\1.6-SNAPSHOT\tuscany-host-embedded-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.6-SNAPSHOT\tuscany-host-http-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\1.6-SNAPSHOT\tuscany-interface-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\1.6-SNAPSHOT\tuscany-interface-java-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\1.6-SNAPSHOT\tuscany-interface-java-xml-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\1.6-SNAPSHOT\tuscany-interface-wsdl-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.6-SNAPSHOT\tuscany-interface-wsdl-xml-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.6-SNAPSHOT\tuscany-policy-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\1.6-SNAPSHOT\tuscany-policy-xml-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology\1.6-SNAPSHOT\tuscany-topology-1.6-SNAPSHOT.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology-xml\1.6-SNAPSHOT\tuscany-topology-xml-1.6-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\sca-api\1.7-SNAPSHOT\sca-api-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.7-SNAPSHOT\tuscany-assembly-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.7-SNAPSHOT\tuscany-assembly-xml-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-http\1.7-SNAPSHOT\tuscany-binding-http-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-jsonrpc\1.7-SNAPSHOT\tuscany-binding-jsonrpc-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.7-SNAPSHOT\tuscany-binding-sca-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-axis2\1.7-SNAPSHOT\tuscany-binding-sca-axis2-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.7-SNAPSHOT\tuscany-binding-sca-xml-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.7-SNAPSHOT\tuscany-binding-ws-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.7-SNAPSHOT\tuscany-binding-ws-axis2-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\1.7-SNAPSHOT\tuscany-binding-ws-xml-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\1.7-SNAPSHOT\tuscany-contribution-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.7-SNAPSHOT\tuscany-contribution-impl-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\1.7-SNAPSHOT\tuscany-contribution-java-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\1.7-SNAPSHOT\tuscany-contribution-namespace-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\1.7-SNAPSHOT\tuscany-core-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\1.7-SNAPSHOT\tuscany-core-databinding-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\1.7-SNAPSHOT\tuscany-core-spi-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\1.7-SNAPSHOT\tuscany-databinding-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\1.7-SNAPSHOT\tuscany-databinding-axiom-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed\1.7-SNAPSHOT\tuscany-distributed-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed-impl\1.7-SNAPSHOT\tuscany-distributed-impl-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-extension-helper\1.7-SNAPSHOT\tuscany-extension-helper-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\1.7-SNAPSHOT\tuscany-host-embedded-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.7-SNAPSHOT\tuscany-host-http-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\1.7-SNAPSHOT\tuscany-interface-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\1.7-SNAPSHOT\tuscany-interface-java-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\1.7-SNAPSHOT\tuscany-interface-java-xml-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\1.7-SNAPSHOT\tuscany-interface-wsdl-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.7-SNAPSHOT\tuscany-interface-wsdl-xml-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.7-SNAPSHOT\tuscany-policy-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\1.7-SNAPSHOT\tuscany-policy-xml-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology\1.7-SNAPSHOT\tuscany-topology-1.7-SNAPSHOT.jar"/>

+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology-xml\1.7-SNAPSHOT\tuscany-topology-xml-1.7-SNAPSHOT.jar"/>

     	<pathelement location="${m2.repo}\org\apache\woden\woden\1.0-incubating-M7a\woden-1.0-incubating-M7a.jar"/>

     	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-api\1.2.4\axiom-api-1.2.4.jar"/>

     	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-dom\1.2.4\axiom-dom-1.2.4.jar"/>

diff --git a/sca-java-1.x/trunk/samples/domain-webapp/pom.xml b/sca-java-1.x/trunk/samples/domain-webapp/pom.xml
index f8e6dc6741..cfc4d09b68 100644
--- a/sca-java-1.x/trunk/samples/domain-webapp/pom.xml
+++ b/sca-java-1.x/trunk/samples/domain-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-samples</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../pom.xml</relativePath>

     </parent>

     <artifactId>sample-domain-webapp</artifactId>

@@ -39,50 +39,50 @@
         <dependency>

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

             <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

             

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

  

         <dependency>

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

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>      

         

          <dependency>

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

             <artifactId>tuscany-domain-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

                                       

         <dependency>

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

             <artifactId>tuscany-binding-jsonrpc</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>   

         

          <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency> 

         

         <dependency>

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

             <artifactId>tuscany-binding-http</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>        

         

         <dependency>

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

             <artifactId>tuscany-implementation-resource</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>                 

         

diff --git a/sca-java-1.x/trunk/samples/feed-aggregator-webapp/pom.xml b/sca-java-1.x/trunk/samples/feed-aggregator-webapp/pom.xml
index 64e3b5c7a6..eb196bace4 100644
--- a/sca-java-1.x/trunk/samples/feed-aggregator-webapp/pom.xml
+++ b/sca-java-1.x/trunk/samples/feed-aggregator-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-feed-aggregator-webapp</artifactId>
@@ -40,25 +40,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -93,7 +93,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.7-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/sca-java-1.x/trunk/samples/feed-aggregator/pom.xml b/sca-java-1.x/trunk/samples/feed-aggregator/pom.xml
index 2f40606a96..e3a93f9da0 100644
--- a/sca-java-1.x/trunk/samples/feed-aggregator/pom.xml
+++ b/sca-java-1.x/trunk/samples/feed-aggregator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-feed-aggregator</artifactId>
@@ -39,32 +39,32 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/trunk/samples/helloworld-bpel-ws/pom.xml b/sca-java-1.x/trunk/samples/helloworld-bpel-ws/pom.xml
index 310cc97f82..5941bcc478 100644
--- a/sca-java-1.x/trunk/samples/helloworld-bpel-ws/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-bpel-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-helloworld-bpel-ws</artifactId>

@@ -39,34 +39,34 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-bpel-ode</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         

@@ -92,7 +92,7 @@
         <dependency>

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

             <artifactId>tuscany-wsdl2java</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

 

         <dependency>

@@ -187,7 +187,7 @@
             <plugin>

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

                 <artifactId>tuscany-maven-wsdl2java</artifactId>

-                <version>1.6-SNAPSHOT</version>

+                <version>1.7-SNAPSHOT</version>

                 <executions>

                     <execution>

                         <configuration>

diff --git a/sca-java-1.x/trunk/samples/helloworld-bpel/pom.xml b/sca-java-1.x/trunk/samples/helloworld-bpel/pom.xml
index 27fbeb6749..6556e5662c 100644
--- a/sca-java-1.x/trunk/samples/helloworld-bpel/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-bpel/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-helloworld-bpel</artifactId>
@@ -39,20 +39,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -89,7 +89,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-wsdl2java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency> 
                 
         <dependency>
@@ -191,7 +191,7 @@
 			<plugin>
 				<groupId>org.apache.tuscany.sca</groupId>
 				<artifactId>tuscany-maven-wsdl2java</artifactId>
-				<version>1.6-SNAPSHOT</version>
+				<version>1.7-SNAPSHOT</version>
 				<executions>
 					<execution>
 						<configuration>
diff --git a/sca-java-1.x/trunk/samples/helloworld-distributed/helloworld-node/pom.xml b/sca-java-1.x/trunk/samples/helloworld-distributed/helloworld-node/pom.xml
index 8de3f5101f..dfddcb980e 100644
--- a/sca-java-1.x/trunk/samples/helloworld-distributed/helloworld-node/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-distributed/helloworld-node/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-helloworld-node</artifactId>

@@ -32,13 +32,13 @@
         <dependency>

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

             <artifactId>tuscany-sca-api</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-node-dynamic</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

 

diff --git a/sca-java-1.x/trunk/samples/helloworld-distributed/helloworld-webapp/build.xml b/sca-java-1.x/trunk/samples/helloworld-distributed/helloworld-webapp/build.xml
index 0a0fd5ed9e..982aa2c3b7 100644
--- a/sca-java-1.x/trunk/samples/helloworld-distributed/helloworld-webapp/build.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-distributed/helloworld-webapp/build.xml
@@ -48,49 +48,49 @@
     </target>

 

     <fileset id="tuscany.jars" dir="../../modules">

-        <include name="tuscany-assembly-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-assembly-xml-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-assembly-xsd-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-binding-jms-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-binding-jms-runtime-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-binding-sca-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-binding-sca-jms-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-binding-sca-xml-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-contribution-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-contribution-impl-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-contribution-java-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-contribution-namespace-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-contribution-xml-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-core-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-core-databinding-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-core-spi-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-databinding-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-databinding-axiom-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-databinding-jaxb-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-definitions-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-definitions-xml-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-endpoint-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-extensibility-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-host-embedded-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-host-http-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-host-webapp-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-implementation-java-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-implementation-java-runtime-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-implementation-java-xml-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-implementation-node-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-implementation-web-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-implementation-web-runtime-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-interface-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-interface-java-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-interface-java-jaxws-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-interface-java-xml-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-monitor-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-node-api-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-node-impl-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-policy-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-policy-xml-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-sca-api-1.6-SNAPSHOT.jar"/>

-        <include name="tuscany-xsd-1.6-SNAPSHOT.jar"/>

+        <include name="tuscany-assembly-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-assembly-xml-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-assembly-xsd-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-binding-jms-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-binding-jms-runtime-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-binding-sca-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-binding-sca-jms-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-binding-sca-xml-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-contribution-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-contribution-impl-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-contribution-java-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-contribution-namespace-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-contribution-xml-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-core-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-core-databinding-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-core-spi-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-databinding-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-databinding-axiom-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-databinding-jaxb-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-definitions-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-definitions-xml-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-endpoint-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-extensibility-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-host-embedded-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-host-http-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-host-webapp-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-implementation-java-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-implementation-java-runtime-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-implementation-java-xml-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-implementation-node-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-implementation-web-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-implementation-web-runtime-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-interface-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-interface-java-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-interface-java-jaxws-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-interface-java-xml-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-monitor-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-node-api-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-node-impl-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-policy-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-policy-xml-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-sca-api-1.7-SNAPSHOT.jar"/>

+        <include name="tuscany-xsd-1.7-SNAPSHOT.jar"/>

     </fileset>

     <fileset id="3rdparty.jars" dir="../../lib">

         <include name="XmlSchema-1.3.2.jar"/>

diff --git a/sca-java-1.x/trunk/samples/helloworld-distributed/helloworld-webapp/pom.xml b/sca-java-1.x/trunk/samples/helloworld-distributed/helloworld-webapp/pom.xml
index ad1ffeb607..5f16831863 100644
--- a/sca-java-1.x/trunk/samples/helloworld-distributed/helloworld-webapp/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-distributed/helloworld-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-helloworld-webapp</artifactId>

@@ -33,26 +33,26 @@
         <dependency>

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

             <artifactId>tuscany-host-webapp</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-sca-api</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-web-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-sca-jms</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

@@ -64,7 +64,7 @@
             <plugin>

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

                 <artifactId>tuscany-maven-ant-generator</artifactId>

-                <version>1.6-SNAPSHOT</version>

+                <version>1.7-SNAPSHOT</version>

                 <executions>

                     <execution>

                         <goals>

diff --git a/sca-java-1.x/trunk/samples/helloworld-dojo-webapp/pom.xml b/sca-java-1.x/trunk/samples/helloworld-dojo-webapp/pom.xml
index c9b10dcad2..310d76647f 100644
--- a/sca-java-1.x/trunk/samples/helloworld-dojo-webapp/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-dojo-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-helloworld-dojo-webapp</artifactId>
@@ -40,20 +40,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -139,7 +139,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.7-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/trunk/samples/helloworld-jms-webapp/pom.xml b/sca-java-1.x/trunk/samples/helloworld-jms-webapp/pom.xml
index b175d0b8ea..cac386c6c5 100644
--- a/sca-java-1.x/trunk/samples/helloworld-jms-webapp/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-jms-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-helloworld-jms-webapp</artifactId>
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jms-asf</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/trunk/samples/helloworld-jsonrpc-webapp/pom.xml b/sca-java-1.x/trunk/samples/helloworld-jsonrpc-webapp/pom.xml
index d2cfeebae5..7187602dfc 100644
--- a/sca-java-1.x/trunk/samples/helloworld-jsonrpc-webapp/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-jsonrpc-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-helloworld-jsonrpc-webapp</artifactId>
@@ -40,20 +40,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -88,7 +88,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.7-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/sca-java-1.x/trunk/samples/helloworld-jsp/pom.xml b/sca-java-1.x/trunk/samples/helloworld-jsp/pom.xml
index 820d8e3732..d62b85e6af 100644
--- a/sca-java-1.x/trunk/samples/helloworld-jsp/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-jsp/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-helloworld-jsp</artifactId>

@@ -34,21 +34,21 @@
         <dependency>

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

             <artifactId>tuscany-sca-api</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>compile</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-web-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-webapp</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/pom.xml b/sca-java-1.x/trunk/samples/helloworld-reference-erlang/pom.xml
index c0a7704aa7..0b820690b3 100644
--- a/sca-java-1.x/trunk/samples/helloworld-reference-erlang/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-reference-erlang/pom.xml
@@ -1,89 +1,89 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-helloworld-reference-erlang</artifactId>
-    <name>Apache Tuscany SCA Sample HelloWorld Reference Erlang</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-erlang-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-all</artifactId>
-            <version>5.2.0</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.activemq</groupId>
-                    <artifactId>activemq-web-demo</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>backport-util-concurrent</groupId>
-            <artifactId>backport-util-concurrent</artifactId>
-            <version>3.1</version>
-        </dependency>  
-        
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+    * KIND, either express or implied.  See the License for the

+    * specific language governing permissions and limitations

+    * under the License.    

+-->

+<project>

+    <modelVersion>4.0.0</modelVersion>

+    <parent>

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

+        <artifactId>tuscany-sca</artifactId>

+        <version>1.7-SNAPSHOT</version>

+        <relativePath>../../pom.xml</relativePath>

+    </parent>

+    <artifactId>sample-helloworld-reference-erlang</artifactId>

+    <name>Apache Tuscany SCA Sample HelloWorld Reference Erlang</name>

+

+    <repositories>

+       <repository>

+          <id>apache.incubator</id>

+          <url>http://people.apache.org/repo/m2-incubating-repository</url>

+       </repository>

+    </repositories>

+

+    <dependencies>

+        <dependency>

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

+            <artifactId>tuscany-host-embedded</artifactId>

+            <version>1.7-SNAPSHOT</version>

+        </dependency>

+        

+        <dependency>

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

+            <artifactId>tuscany-implementation-java-runtime</artifactId>

+            <version>1.7-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-binding-erlang-runtime</artifactId>

+            <version>1.7-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

+            <groupId>junit</groupId>

+            <artifactId>junit</artifactId>

+            <version>4.5</version>

+            <scope>test</scope>

+        </dependency>

+        

+        <dependency>

+            <groupId>org.apache.activemq</groupId>

+            <artifactId>activemq-all</artifactId>

+            <version>5.2.0</version>

+            <scope>test</scope>

+            <exclusions>

+                <exclusion>

+                    <groupId>org.apache.activemq</groupId>

+                    <artifactId>activemq-web-demo</artifactId>

+                </exclusion>

+            </exclusions>

+        </dependency>

+        <dependency>

+            <groupId>backport-util-concurrent</groupId>

+            <artifactId>backport-util-concurrent</artifactId>

+            <version>3.1</version>

+        </dependency>  

+        

+    </dependencies>

+    

+    <build>

+       <finalName>${artifactId}</finalName>

+    </build>

+

+</project>

diff --git a/sca-java-1.x/trunk/samples/helloworld-reference-jms/pom.xml b/sca-java-1.x/trunk/samples/helloworld-reference-jms/pom.xml
index 0fb6810baf..5b5bd492e4 100644
--- a/sca-java-1.x/trunk/samples/helloworld-reference-jms/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-reference-jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-helloworld-reference-jms</artifactId>

@@ -39,33 +39,33 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-jms-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-jms-asf</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency> 

 

         <dependency>

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

             <artifactId>sample-helloworld-service-jms</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

         

diff --git a/sca-java-1.x/trunk/samples/helloworld-script/pom.xml b/sca-java-1.x/trunk/samples/helloworld-script/pom.xml
index 35449556c4..154ac6e714 100644
--- a/sca-java-1.x/trunk/samples/helloworld-script/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-script/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-helloworld-spring</artifactId>

@@ -32,7 +32,7 @@
         <dependency>

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

             <artifactId>tuscany-base</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

 

         <dependency>

diff --git a/sca-java-1.x/trunk/samples/helloworld-service-erlang/pom.xml b/sca-java-1.x/trunk/samples/helloworld-service-erlang/pom.xml
index c2fb2a867d..ae85faf0d9 100644
--- a/sca-java-1.x/trunk/samples/helloworld-service-erlang/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-service-erlang/pom.xml
@@ -1,72 +1,72 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-helloworld-service-erlang</artifactId>
-    <name>Apache Tuscany SCA Sample HelloWorld Service Erlang</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>           
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>compile</scope>            
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-erlang-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency> 
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+    * KIND, either express or implied.  See the License for the

+    * specific language governing permissions and limitations

+    * under the License.    

+-->

+<project>

+    <modelVersion>4.0.0</modelVersion>

+    <parent>

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

+        <artifactId>tuscany-sca</artifactId>

+        <version>1.7-SNAPSHOT</version>

+        <relativePath>../../pom.xml</relativePath>

+    </parent>

+    <artifactId>sample-helloworld-service-erlang</artifactId>

+    <name>Apache Tuscany SCA Sample HelloWorld Service Erlang</name>

+

+    <repositories>

+       <repository>

+          <id>apache.incubator</id>

+          <url>http://people.apache.org/repo/m2-incubating-repository</url>

+       </repository>

+    </repositories>

+

+    <dependencies>           

+        <dependency>

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

+            <artifactId>tuscany-host-embedded</artifactId>

+            <version>1.7-SNAPSHOT</version>

+            <scope>compile</scope>            

+        </dependency>

+        

+        <dependency>

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

+            <artifactId>tuscany-implementation-java-runtime</artifactId>

+            <version>1.7-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-binding-erlang-runtime</artifactId>

+            <version>1.7-SNAPSHOT</version>

+            <scope>runtime</scope>

+        </dependency> 

+

+        <dependency>

+            <groupId>junit</groupId>

+            <artifactId>junit</artifactId>

+            <version>4.5</version>

+            <scope>test</scope>

+        </dependency>

+    </dependencies>

+    

+    <build>

+       <finalName>${artifactId}</finalName>

+    </build>

+

+</project>

diff --git a/sca-java-1.x/trunk/samples/helloworld-service-jms/pom.xml b/sca-java-1.x/trunk/samples/helloworld-service-jms/pom.xml
index c6de7a2bec..6f85e83a3b 100644
--- a/sca-java-1.x/trunk/samples/helloworld-service-jms/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-service-jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-helloworld-service-jms</artifactId>

@@ -39,28 +39,28 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>compile</scope>            

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-jms-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency> 

 

         <dependency>

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

             <artifactId>tuscany-host-jms-asf</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>   

 

         <dependency>

diff --git a/sca-java-1.x/trunk/samples/helloworld-servlet/pom.xml b/sca-java-1.x/trunk/samples/helloworld-servlet/pom.xml
index 8d2d6bc214..a992bc98b8 100644
--- a/sca-java-1.x/trunk/samples/helloworld-servlet/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-servlet/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-helloworld-servlet</artifactId>

@@ -34,21 +34,21 @@
         <dependency>

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

             <artifactId>tuscany-sca-api</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>compile</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-web-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-webapp</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/sca-java-1.x/trunk/samples/helloworld-spring/pom.xml b/sca-java-1.x/trunk/samples/helloworld-spring/pom.xml
index f0f7c1a937..af7f6b804c 100644
--- a/sca-java-1.x/trunk/samples/helloworld-spring/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-spring/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-helloworld-spring</artifactId>

@@ -32,13 +32,13 @@
         <dependency>

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

             <artifactId>tuscany-base</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-spring</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

 

         <dependency>

diff --git a/sca-java-1.x/trunk/samples/helloworld-web-callback/pom.xml b/sca-java-1.x/trunk/samples/helloworld-web-callback/pom.xml
index 7aaa046fcb..e56a72ea66 100644
--- a/sca-java-1.x/trunk/samples/helloworld-web-callback/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-web-callback/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-helloworld-web-callback</artifactId>

@@ -34,28 +34,28 @@
         <dependency>

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

             <artifactId>tuscany-sca-api</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>compile</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-web-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-webapp</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-dwr</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/sca-java-1.x/trunk/samples/helloworld-web/pom.xml b/sca-java-1.x/trunk/samples/helloworld-web/pom.xml
index 7a7d03edc6..8cb2090c00 100644
--- a/sca-java-1.x/trunk/samples/helloworld-web/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-web/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-helloworld-web</artifactId>

@@ -34,28 +34,28 @@
         <dependency>

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

             <artifactId>tuscany-sca-api</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>compile</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-web-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-webapp</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-deep-webapp/build.xml b/sca-java-1.x/trunk/samples/helloworld-ws-deep-webapp/build.xml
index cf19eec5cd..66a6d281ea 100644
--- a/sca-java-1.x/trunk/samples/helloworld-ws-deep-webapp/build.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-deep-webapp/build.xml
@@ -56,43 +56,43 @@
              webxml="src/main/webapp/WEB-INF/web.xml">

             <fileset dir="src/main/webapp"/>       	

             <zipfileset dir="${tuscany.sca.modules.location}" prefix="WEB-INF/lib">

-            	<include name="sca-api-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-assembly-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-assembly-xml-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-feed-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-jsonrpc-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-sca-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-sca-xml-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-ws-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-ws-axis2-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-ws-xml-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-contribution-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-contribution-impl-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-contribution-java-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-contribution-namespace-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-core-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-core-databinding-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-core-spi-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-databinding-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-databinding-axiom-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-databinding-jaxb-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-databinding-sdo-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-distributed-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-extension-helper-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-host-embedded-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-host-http-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-host-webapp-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-implementation-java-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-implementation-java-runtime-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-implementation-java-xml-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-java-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-java-xml-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-wsdl-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-wsdl-runtime-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-wsdl-xml-1.6-SNAPSHOT.jar"/>         	

-            	<include name="tuscany-policy-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-policy-xml-1.6-SNAPSHOT.jar"/>

+            	<include name="sca-api-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-assembly-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-assembly-xml-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-feed-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-jsonrpc-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-sca-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-sca-xml-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-ws-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-ws-axis2-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-ws-xml-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-contribution-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-contribution-impl-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-contribution-java-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-contribution-namespace-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-core-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-core-databinding-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-core-spi-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-databinding-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-databinding-axiom-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-databinding-jaxb-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-databinding-sdo-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-distributed-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-extension-helper-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-host-embedded-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-host-http-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-host-webapp-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-implementation-java-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-implementation-java-runtime-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-implementation-java-xml-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-interface-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-interface-java-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-interface-java-xml-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-interface-wsdl-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-interface-wsdl-runtime-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-interface-wsdl-xml-1.7-SNAPSHOT.jar"/>         	

+            	<include name="tuscany-policy-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-policy-xml-1.7-SNAPSHOT.jar"/>

             </zipfileset>

             <lib dir="${tuscany.sca.lib.location}">

             	<include name="XmlSchema-1.3.1.jar"/>

@@ -132,7 +132,7 @@
             	<include name="neethi-2.0.1.jar"/>

             	<include name="rome-0.9.jar"/>

             	<include name="saaj-api-1.3.jar"/>

-            	<include name="sca-api-1.6-SNAPSHOT.jar"/>

+            	<include name="sca-api-1.7-SNAPSHOT.jar"/>

             	<include name="stax-api-1.0-2.jar"/>

             	<include name="stax-api-1.0.1.jar"/>

             	<include name="woden-1.0-incubating-M7a.jar"/>

@@ -141,9 +141,9 @@
             	<include name="xercesImpl-2.8.1.jar"/>

             	<include name="xml-apis-1.3.03.jar"/>

             	<include name="xsd-2.2.3.jar"/>

-            	<include name="tuscany-sdo-api-r2.1-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-sdo-impl-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-sdo-lib-1.6-SNAPSHOT.jar"/>

+            	<include name="tuscany-sdo-api-r2.1-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-sdo-impl-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-sdo-lib-1.7-SNAPSHOT.jar"/>

             </lib>        	

             <classes dir="target/classes"/>

             <classes dir="target/sdo-source"/>

diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-deep-webapp/pom.xml b/sca-java-1.x/trunk/samples/helloworld-ws-deep-webapp/pom.xml
index 0281b6f9a0..751582a0fd 100644
--- a/sca-java-1.x/trunk/samples/helloworld-ws-deep-webapp/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-deep-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
     </parent>
 
     <artifactId>sample-helloworld-ws-service-webapp</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-reference-jms/pom.xml b/sca-java-1.x/trunk/samples/helloworld-ws-reference-jms/pom.xml
index 320d28aa5d..e657aefdc0 100644
--- a/sca-java-1.x/trunk/samples/helloworld-ws-reference-jms/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-reference-jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-helloworld-ws-reference-jms</artifactId>
@@ -39,27 +39,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>sample-helloworld-ws-service-jms</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-reference-lean/pom.xml b/sca-java-1.x/trunk/samples/helloworld-ws-reference-lean/pom.xml
index 32494cc508..5bc8742f63 100644
--- a/sca-java-1.x/trunk/samples/helloworld-ws-reference-lean/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-reference-lean/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-helloworld-ws-reference-lean</artifactId>

@@ -39,27 +39,27 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>sample-helloworld-ws-service</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

         

diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-reference-secure/pom.xml b/sca-java-1.x/trunk/samples/helloworld-ws-reference-secure/pom.xml
index 52e3ef376d..6d4673c086 100644
--- a/sca-java-1.x/trunk/samples/helloworld-ws-reference-secure/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-reference-secure/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-helloworld-ws-reference-secure</artifactId>

@@ -39,7 +39,7 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

         

         <dependency>

@@ -51,21 +51,21 @@
         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>sample-helloworld-ws-service-secure</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

         

diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-reference/pom.xml b/sca-java-1.x/trunk/samples/helloworld-ws-reference/pom.xml
index 8d910eae68..1ccad3d725 100644
--- a/sca-java-1.x/trunk/samples/helloworld-ws-reference/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-reference/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-helloworld-ws-reference</artifactId>
@@ -39,27 +39,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>sample-helloworld-ws-service</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-sdo-webapp/pom.xml b/sca-java-1.x/trunk/samples/helloworld-ws-sdo-webapp/pom.xml
index 624665d864..b8b9e29232 100644
--- a/sca-java-1.x/trunk/samples/helloworld-ws-sdo-webapp/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-sdo-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-helloworld-ws-sdo-webapp</artifactId>
@@ -40,27 +40,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
     
         <dependency>
@@ -92,7 +92,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
@@ -101,7 +101,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 -->        
@@ -193,7 +193,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.7-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/trunk/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 08570705b0..8890128aef 100644
--- a/sca-java-1.x/trunk/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -24,7 +24,7 @@
         <d:moduleId>
             <d:groupId>org.apache.tuscany.sca</d:groupId>
             <d:artifactId>sample-helloworld-ws-sdo-webapp</d:artifactId>
-            <d:version>1.6-SNAPSHOT</d:version>
+            <d:version>1.7-SNAPSHOT</d:version>
             <d:type>war</d:type>
         </d:moduleId>
         
diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-sdo/pom.xml b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/pom.xml
index e9f4a60d8c..272c04666e 100644
--- a/sca-java-1.x/trunk/samples/helloworld-ws-sdo/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-helloworld-ws-sdo</artifactId>
@@ -39,20 +39,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -80,14 +80,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-service-jms/pom.xml b/sca-java-1.x/trunk/samples/helloworld-ws-service-jms/pom.xml
index a241d69006..f9bc9372af 100644
--- a/sca-java-1.x/trunk/samples/helloworld-ws-service-jms/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-service-jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-helloworld-ws-service-jms</artifactId>

@@ -39,14 +39,14 @@
         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>compile</scope>            

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>compile</scope>            

         </dependency>

 

@@ -65,14 +65,14 @@
         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>    

 

diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-service-secure/pom.xml b/sca-java-1.x/trunk/samples/helloworld-ws-service-secure/pom.xml
index e04aaa9bd0..7ff434ef28 100644
--- a/sca-java-1.x/trunk/samples/helloworld-ws-service-secure/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-service-secure/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-helloworld-ws-service-secure</artifactId>

@@ -39,7 +39,7 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

         

         <dependency>

@@ -51,21 +51,21 @@
         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-service-webapp/build.xml b/sca-java-1.x/trunk/samples/helloworld-ws-service-webapp/build.xml
index 0a4be34c47..dd70927df7 100644
--- a/sca-java-1.x/trunk/samples/helloworld-ws-service-webapp/build.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-service-webapp/build.xml
@@ -53,43 +53,43 @@
              webxml="src/main/webapp/WEB-INF/web.xml">

             <fileset dir="src/main/webapp"/>       	

             <zipfileset dir="${tuscany.sca.modules.location}" prefix="WEB-INF/lib">

-            	<include name="sca-api-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-assembly-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-assembly-xml-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-feed-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-jsonrpc-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-sca-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-sca-xml-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-ws-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-ws-axis2-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-binding-ws-xml-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-contribution-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-contribution-impl-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-contribution-java-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-contribution-namespace-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-core-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-core-databinding-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-core-spi-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-databinding-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-databinding-axiom-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-databinding-jaxb-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-databinding-sdo-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-distributed-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-extension-helper-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-host-embedded-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-host-http-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-host-webapp-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-implementation-java-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-implementation-java-runtime-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-implementation-java-xml-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-java-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-java-xml-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-wsdl-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-wsdl-runtime-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-interface-wsdl-xml-1.6-SNAPSHOT.jar"/>         	

-            	<include name="tuscany-policy-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-policy-xml-1.6-SNAPSHOT.jar"/>

+            	<include name="sca-api-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-assembly-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-assembly-xml-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-feed-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-jsonrpc-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-sca-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-sca-xml-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-ws-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-ws-axis2-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-binding-ws-xml-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-contribution-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-contribution-impl-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-contribution-java-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-contribution-namespace-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-core-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-core-databinding-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-core-spi-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-databinding-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-databinding-axiom-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-databinding-jaxb-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-databinding-sdo-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-distributed-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-extension-helper-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-host-embedded-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-host-http-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-host-webapp-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-implementation-java-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-implementation-java-runtime-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-implementation-java-xml-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-interface-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-interface-java-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-interface-java-xml-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-interface-wsdl-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-interface-wsdl-runtime-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-interface-wsdl-xml-1.7-SNAPSHOT.jar"/>         	

+            	<include name="tuscany-policy-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-policy-xml-1.7-SNAPSHOT.jar"/>

             </zipfileset>

             <lib dir="${tuscany.sca.lib.location}">

             	<include name="XmlSchema-1.3.1.jar"/>

@@ -129,7 +129,7 @@
             	<include name="neethi-2.0.1.jar"/>

             	<include name="rome-0.9.jar"/>

             	<include name="saaj-api-1.3.jar"/>

-            	<include name="sca-api-1.6-SNAPSHOT.jar"/>

+            	<include name="sca-api-1.7-SNAPSHOT.jar"/>

             	<include name="stax-api-1.0-2.jar"/>

             	<include name="stax-api-1.0.1.jar"/>

             	<include name="woden-1.0-incubating-M7a.jar"/>

@@ -138,9 +138,9 @@
             	<include name="xercesImpl-2.8.1.jar"/>

             	<include name="xml-apis-1.3.03.jar"/>

             	<include name="xsd-2.2.3.jar"/>

-            	<include name="tuscany-sdo-api-r2.1-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-sdo-impl-1.6-SNAPSHOT.jar"/>

-            	<include name="tuscany-sdo-lib-1.6-SNAPSHOT.jar"/>

+            	<include name="tuscany-sdo-api-r2.1-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-sdo-impl-1.7-SNAPSHOT.jar"/>

+            	<include name="tuscany-sdo-lib-1.7-SNAPSHOT.jar"/>

             </lib>        	

             <classes dir="target/classes"/>

             <classes dir="target/sdo-source"/>

diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-service-webapp/pom.xml b/sca-java-1.x/trunk/samples/helloworld-ws-service-webapp/pom.xml
index 2399c4f29c..87049d02eb 100644
--- a/sca-java-1.x/trunk/samples/helloworld-ws-service-webapp/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-service-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
     </parent>
     <artifactId>sample-helloworld-ws-service-webapp</artifactId>
     <name>Apache Tuscany SCA HelloWorld Web Service Sample Webapp</name>
@@ -39,20 +39,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/trunk/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index dea8c1cb23..4924042d5e 100644
--- a/sca-java-1.x/trunk/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -24,7 +24,7 @@
         <d:moduleId>
             <d:groupId>org.apache.tuscany.sca</d:groupId>
             <d:artifactId>sample-helloworld-ws-service-webapp</d:artifactId>
-            <d:version>1.6-SNAPSHOT</d:version>
+            <d:version>1.7-SNAPSHOT</d:version>
             <d:type>war</d:type>
         </d:moduleId>
         <!-- TUSCANY-1986 -->
diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-service/pom.xml b/sca-java-1.x/trunk/samples/helloworld-ws-service/pom.xml
index 97b8ff27ab..70d35d382b 100644
--- a/sca-java-1.x/trunk/samples/helloworld-ws-service/pom.xml
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-service/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-helloworld-ws-service</artifactId>
@@ -39,28 +39,28 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>compile</scope>            
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>    
 
diff --git a/sca-java-1.x/trunk/samples/holder-ws-service/pom.xml b/sca-java-1.x/trunk/samples/holder-ws-service/pom.xml
index 09ccdc413b..681478fc2c 100644
--- a/sca-java-1.x/trunk/samples/holder-ws-service/pom.xml
+++ b/sca-java-1.x/trunk/samples/holder-ws-service/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-holder-ws-service</artifactId>
@@ -39,28 +39,28 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>compile</scope>            
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>    
 
diff --git a/sca-java-1.x/trunk/samples/implementation-composite/pom.xml b/sca-java-1.x/trunk/samples/implementation-composite/pom.xml
index b7bae958c8..c8c5c7a6db 100644
--- a/sca-java-1.x/trunk/samples/implementation-composite/pom.xml
+++ b/sca-java-1.x/trunk/samples/implementation-composite/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-implementation-composite</artifactId>
@@ -40,20 +40,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
diff --git a/sca-java-1.x/trunk/samples/implementation-crud-extension/pom.xml b/sca-java-1.x/trunk/samples/implementation-crud-extension/pom.xml
index ab2a3ff149..3b9ea0723f 100644
--- a/sca-java-1.x/trunk/samples/implementation-crud-extension/pom.xml
+++ b/sca-java-1.x/trunk/samples/implementation-crud-extension/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-implementation-crud-extension</artifactId>
@@ -39,25 +39,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-1.x/trunk/samples/implementation-crud/pom.xml b/sca-java-1.x/trunk/samples/implementation-crud/pom.xml
index c552472f21..6dc4e101fc 100644
--- a/sca-java-1.x/trunk/samples/implementation-crud/pom.xml
+++ b/sca-java-1.x/trunk/samples/implementation-crud/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-implementation-crud</artifactId>
@@ -39,13 +39,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>sample-implementation-crud-extension</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
diff --git a/sca-java-1.x/trunk/samples/implementation-notification/pom.xml b/sca-java-1.x/trunk/samples/implementation-notification/pom.xml
index 3cfc11707b..e0cd2dc53c 100644
--- a/sca-java-1.x/trunk/samples/implementation-notification/pom.xml
+++ b/sca-java-1.x/trunk/samples/implementation-notification/pom.xml
@@ -22,30 +22,30 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-implementation-notification</artifactId>

     <name>Apache Tuscany SCA Sample Notification Implementation</name>

-    <version>1.6-SNAPSHOT</version>

+    <version>1.7-SNAPSHOT</version>

     <description>A sample illustrating use of implementation.notification</description>

 

     <dependencies>

         <dependency>

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

             <artifactId>tuscany-implementation-notification</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

         <!-- if this is not in, BuilderRegistryImpl throws NPE (line 96) -->

         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

         <!-- end -->

diff --git a/sca-java-1.x/trunk/samples/implementation-pojo-extension/pom.xml b/sca-java-1.x/trunk/samples/implementation-pojo-extension/pom.xml
index 3d5a47c4ff..f17e891374 100644
--- a/sca-java-1.x/trunk/samples/implementation-pojo-extension/pom.xml
+++ b/sca-java-1.x/trunk/samples/implementation-pojo-extension/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-implementation-pojo-extension</artifactId>
@@ -39,25 +39,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sca-java-1.x/trunk/samples/loanapplication/pom.xml b/sca-java-1.x/trunk/samples/loanapplication/pom.xml
index 59ce010291..80a4904a0d 100644
--- a/sca-java-1.x/trunk/samples/loanapplication/pom.xml
+++ b/sca-java-1.x/trunk/samples/loanapplication/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-loanapplication</artifactId>

@@ -39,13 +39,13 @@
         <dependency>

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

             <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/sca-java-1.x/trunk/samples/osgi-supplychain/pom.xml b/sca-java-1.x/trunk/samples/osgi-supplychain/pom.xml
index 9893e92cc1..56d92c6e9c 100644
--- a/sca-java-1.x/trunk/samples/osgi-supplychain/pom.xml
+++ b/sca-java-1.x/trunk/samples/osgi-supplychain/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-osgi-supplychain</artifactId>
@@ -39,20 +39,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/trunk/samples/photo-gallery/pom.xml b/sca-java-1.x/trunk/samples/photo-gallery/pom.xml
index ebcc7cc035..af75a5b7de 100644
--- a/sca-java-1.x/trunk/samples/photo-gallery/pom.xml
+++ b/sca-java-1.x/trunk/samples/photo-gallery/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-photo-gallery</artifactId>
@@ -39,68 +39,68 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime-tuscany</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-js</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-js</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/trunk/samples/pom.xml b/sca-java-1.x/trunk/samples/pom.xml
index 9a9ac26731..8e62ab0f5f 100644
--- a/sca-java-1.x/trunk/samples/pom.xml
+++ b/sca-java-1.x/trunk/samples/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-samples</artifactId>
diff --git a/sca-java-1.x/trunk/samples/quote-xquery/pom.xml b/sca-java-1.x/trunk/samples/quote-xquery/pom.xml
index 6d5aca6bcd..f0477705ed 100644
--- a/sca-java-1.x/trunk/samples/quote-xquery/pom.xml
+++ b/sca-java-1.x/trunk/samples/quote-xquery/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-quote-xquery</artifactId>
@@ -39,27 +39,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -101,13 +101,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/trunk/samples/simple-bigbank-spring/pom.xml b/sca-java-1.x/trunk/samples/simple-bigbank-spring/pom.xml
index 21e2728b4c..bd4570a45b 100644
--- a/sca-java-1.x/trunk/samples/simple-bigbank-spring/pom.xml
+++ b/sca-java-1.x/trunk/samples/simple-bigbank-spring/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-simple-bigbank-spring</artifactId>
@@ -39,26 +39,26 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
         
         <dependency>
@@ -88,110 +88,110 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
 	  <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jms-asf</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>sample-spring-bigbank-checkaccount</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sca-java-1.x/trunk/samples/simple-bigbank/pom.xml b/sca-java-1.x/trunk/samples/simple-bigbank/pom.xml
index 5b798039ba..d61a1be5dc 100644
--- a/sca-java-1.x/trunk/samples/simple-bigbank/pom.xml
+++ b/sca-java-1.x/trunk/samples/simple-bigbank/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-simple-bigbank</artifactId>
@@ -39,13 +39,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/trunk/samples/simple-callback-ws/pom.xml b/sca-java-1.x/trunk/samples/simple-callback-ws/pom.xml
index 46896f4afd..f3ae2df1a9 100644
--- a/sca-java-1.x/trunk/samples/simple-callback-ws/pom.xml
+++ b/sca-java-1.x/trunk/samples/simple-callback-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-simple-callback-ws</artifactId>
@@ -39,27 +39,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/trunk/samples/simple-callback/pom.xml b/sca-java-1.x/trunk/samples/simple-callback/pom.xml
index cfca4c2b21..bdcf19af8a 100644
--- a/sca-java-1.x/trunk/samples/simple-callback/pom.xml
+++ b/sca-java-1.x/trunk/samples/simple-callback/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-simple-callback</artifactId>
@@ -39,13 +39,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/trunk/samples/spi-implementation-pojo/pom.xml b/sca-java-1.x/trunk/samples/spi-implementation-pojo/pom.xml
index 4be056cea2..42fdd47222 100644
--- a/sca-java-1.x/trunk/samples/spi-implementation-pojo/pom.xml
+++ b/sca-java-1.x/trunk/samples/spi-implementation-pojo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-spi-implementation-java</artifactId>
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extension-helper</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-1.x/trunk/samples/spring-bigbank-calculator/pom.xml b/sca-java-1.x/trunk/samples/spring-bigbank-calculator/pom.xml
index 7d2356113d..64d1679b52 100644
--- a/sca-java-1.x/trunk/samples/spring-bigbank-calculator/pom.xml
+++ b/sca-java-1.x/trunk/samples/spring-bigbank-calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-spring-bigbank-calculator</artifactId>

@@ -39,48 +39,48 @@
         <dependency>

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

             <artifactId>tuscany-node-api</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-script</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-spring</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

 	  <dependency>

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

             <artifactId>tuscany-implementation-spring-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-binding-rmi-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/sca-java-1.x/trunk/samples/spring-bigbank-checkaccount/pom.xml b/sca-java-1.x/trunk/samples/spring-bigbank-checkaccount/pom.xml
index 1e290535f9..b4f30076d6 100644
--- a/sca-java-1.x/trunk/samples/spring-bigbank-checkaccount/pom.xml
+++ b/sca-java-1.x/trunk/samples/spring-bigbank-checkaccount/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-spring-bigbank-checkaccount</artifactId>

@@ -40,60 +40,60 @@
         <dependency>

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

             <artifactId>tuscany-node-api</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-policy-security</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-core-spi</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

 	  <dependency>

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

             <artifactId>tuscany-implementation-spring</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

 	  <dependency>

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

             <artifactId>tuscany-implementation-spring-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-binding-jms-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-host-jms-asf</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

 

         <dependency>

diff --git a/sca-java-1.x/trunk/samples/spring-bigbank-stockquote/pom.xml b/sca-java-1.x/trunk/samples/spring-bigbank-stockquote/pom.xml
index 1f57e4990d..0a2fe215ce 100644
--- a/sca-java-1.x/trunk/samples/spring-bigbank-stockquote/pom.xml
+++ b/sca-java-1.x/trunk/samples/spring-bigbank-stockquote/pom.xml
@@ -22,7 +22,7 @@
     <parent>

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

         <artifactId>tuscany-sca</artifactId>

-        <version>1.6-SNAPSHOT</version>

+        <version>1.7-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

     </parent>

     <artifactId>sample-spring-bigbank-stockquote</artifactId>

@@ -39,48 +39,48 @@
         <dependency>

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

             <artifactId>tuscany-node-api</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-node-impl</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

             <artifactId>tuscany-implementation-spring</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

 	  <dependency>

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

             <artifactId>tuscany-implementation-spring-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

         <dependency>

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

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

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

         

         <dependency>

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

             <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.6-SNAPSHOT</version>

+            <version>1.7-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

 

diff --git a/sca-java-1.x/trunk/samples/store-distributed/pom.xml b/sca-java-1.x/trunk/samples/store-distributed/pom.xml
index 53786cfd25..4413289a4f 100644
--- a/sca-java-1.x/trunk/samples/store-distributed/pom.xml
+++ b/sca-java-1.x/trunk/samples/store-distributed/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-store-distributed</artifactId>
@@ -40,66 +40,66 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime-tuscany</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/trunk/samples/store-dojo/pom.xml b/sca-java-1.x/trunk/samples/store-dojo/pom.xml
index 9dde6a5533..f2d4760434 100644
--- a/sca-java-1.x/trunk/samples/store-dojo/pom.xml
+++ b/sca-java-1.x/trunk/samples/store-dojo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-store-dojo</artifactId>
@@ -39,75 +39,75 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-web-javascript-dojo</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime-dojo</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-js-dojo</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-js-dojo</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/trunk/samples/store-secure/pom.xml b/sca-java-1.x/trunk/samples/store-secure/pom.xml
index 4b6f5c5ec5..47d868fbc9 100644
--- a/sca-java-1.x/trunk/samples/store-secure/pom.xml
+++ b/sca-java-1.x/trunk/samples/store-secure/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-store-secure</artifactId>
@@ -39,74 +39,74 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security-http</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime-tuscany</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-js</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-js</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/trunk/samples/store-webapp/pom.xml b/sca-java-1.x/trunk/samples/store-webapp/pom.xml
index 8b6f0412f1..8b5df805b1 100644
--- a/sca-java-1.x/trunk/samples/store-webapp/pom.xml
+++ b/sca-java-1.x/trunk/samples/store-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-store-webapp</artifactId>
@@ -40,47 +40,47 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime-tuscany</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-js</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-js</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
@@ -107,7 +107,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.7-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/trunk/samples/store/pom.xml b/sca-java-1.x/trunk/samples/store/pom.xml
index baa666dabd..641a3325de 100644
--- a/sca-java-1.x/trunk/samples/store/pom.xml
+++ b/sca-java-1.x/trunk/samples/store/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-store</artifactId>
@@ -39,54 +39,54 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime-tuscany</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-js</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-js</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -94,14 +94,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/trunk/samples/supplychain/pom.xml b/sca-java-1.x/trunk/samples/supplychain/pom.xml
index 034940f3b3..f33c29cdf9 100644
--- a/sca-java-1.x/trunk/samples/supplychain/pom.xml
+++ b/sca-java-1.x/trunk/samples/supplychain/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-supplychain</artifactId>
@@ -39,13 +39,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/trunk/samples/web-resource/pom.xml b/sca-java-1.x/trunk/samples/web-resource/pom.xml
index 5164c1f219..8f9cbe1629 100644
--- a/sca-java-1.x/trunk/samples/web-resource/pom.xml
+++ b/sca-java-1.x/trunk/samples/web-resource/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-web-resource</artifactId>
@@ -39,27 +39,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sca-java-1.x/trunk/samples/zipcode-jaxws/pom.xml b/sca-java-1.x/trunk/samples/zipcode-jaxws/pom.xml
index 3aed3ff683..b1701ed8ba 100644
--- a/sca-java-1.x/trunk/samples/zipcode-jaxws/pom.xml
+++ b/sca-java-1.x/trunk/samples/zipcode-jaxws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-zipcode-jaxws</artifactId>
@@ -34,27 +34,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -124,7 +124,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.7-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>