[maven-release-plugin] prepare release tb3

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@756089 13f79535-47bb-0310-9956-ffa450edef68
author: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> 2009-03-19 17:04:12 +0000
committer: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> 2009-03-19 17:04:12 +0000
commit: 89b77073a3a3fa1402698ba52ef652e717db4a57 (patch)
tree: 5a3ac34d2ba022c3bb396cc0a89d4e186185de11 /sandbox/ant/sca/trunk
parent: 875ac5d246878b199c393e9700c8a085c8939333 (diff)
122 files changed, 541 insertions, 541 deletions
diff --git a/sandbox/ant/sca/trunk/archetypes/pom.xml b/sandbox/ant/sca/trunk/archetypes/pom.xml
index 84e3ffba8b..e36691b7cd 100644
--- a/sandbox/ant/sca/trunk/archetypes/pom.xml
+++ b/sandbox/ant/sca/trunk/archetypes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-archetype</artifactId>
diff --git a/sandbox/ant/sca/trunk/archetypes/quickstart-jsf/pom.xml b/sandbox/ant/sca/trunk/archetypes/quickstart-jsf/pom.xml
index 1622b0d885..176ae525ed 100644
--- a/sandbox/ant/sca/trunk/archetypes/quickstart-jsf/pom.xml
+++ b/sandbox/ant/sca/trunk/archetypes/quickstart-jsf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/sandbox/ant/sca/trunk/archetypes/quickstart-stripes/pom.xml b/sandbox/ant/sca/trunk/archetypes/quickstart-stripes/pom.xml
index 92d4497070..8d9db4adfe 100644
--- a/sandbox/ant/sca/trunk/archetypes/quickstart-stripes/pom.xml
+++ b/sandbox/ant/sca/trunk/archetypes/quickstart-stripes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/sandbox/ant/sca/trunk/archetypes/quickstart/pom.xml b/sandbox/ant/sca/trunk/archetypes/quickstart/pom.xml
index 3dd8fc6c18..8cc08261e6 100644
--- a/sandbox/ant/sca/trunk/archetypes/quickstart/pom.xml
+++ b/sandbox/ant/sca/trunk/archetypes/quickstart/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/sandbox/ant/sca/trunk/distribution/all/pom.xml b/sandbox/ant/sca/trunk/distribution/all/pom.xml
index 4d007001a0..227ed0dd8a 100644
--- a/sandbox/ant/sca/trunk/distribution/all/pom.xml
+++ b/sandbox/ant/sca/trunk/distribution/all/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,27 +35,27 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-all</artifactId>
             <type>pom</type>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-stripes</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-myfaces</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/distribution/pom.xml b/sandbox/ant/sca/trunk/distribution/pom.xml
index a667d60987..56cb852956 100644
--- a/sandbox/ant/sca/trunk/distribution/pom.xml
+++ b/sandbox/ant/sca/trunk/distribution/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.tuscany.sca</groupId>
     <artifactId>tuscany-distribution</artifactId>
diff --git a/sandbox/ant/sca/trunk/features/all/pom.xml b/sandbox/ant/sca/trunk/features/all/pom.xml
index ad73de0592..07f2146d29 100644
--- a/sandbox/ant/sca/trunk/features/all/pom.xml
+++ b/sandbox/ant/sca/trunk/features/all/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -36,42 +36,42 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-api</artifactId>
             <type>pom</type>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webservice</artifactId>
             <type>pom</type>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-ejava</artifactId>
             <type>pom</type>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webapp</artifactId>
             <type>pom</type>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-launcher</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
 
diff --git a/sandbox/ant/sca/trunk/features/api/pom.xml b/sandbox/ant/sca/trunk/features/api/pom.xml
index ae021cffc5..1970a614f2 100644
--- a/sandbox/ant/sca/trunk/features/api/pom.xml
+++ b/sandbox/ant/sca/trunk/features/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -36,14 +36,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <!-- Node API -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/features/core/pom.xml b/sandbox/ant/sca/trunk/features/core/pom.xml
index 602dda11e1..159b995e43 100644
--- a/sandbox/ant/sca/trunk/features/core/pom.xml
+++ b/sandbox/ant/sca/trunk/features/core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,7 +35,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-api</artifactId>
             <type>pom</type>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <!-- SCA API -->
@@ -57,17 +57,17 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <!-- Bindings -->
@@ -81,46 +81,46 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <!-- Core runtime -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <!-- Databindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <!-- Data API -->
@@ -134,26 +134,26 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <!-- Domain support -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-endpoint</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <!-- Core Extensibility -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <!--  Hosts -->
@@ -166,19 +166,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <!-- Implementation types -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
 
@@ -186,34 +186,34 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-jaxws</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <!-- Node runtime -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <!--
@@ -229,19 +229,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <!-- Policy models -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <!--dependency>
             <groupId>org.apache.tuscany.sca</groupId>
@@ -251,19 +251,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <!-- XMLSchema support -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/features/ejava/pom.xml b/sandbox/ant/sca/trunk/features/ejava/pom.xml
index 1e40bc2fa7..b3b5bb994c 100644
--- a/sandbox/ant/sca/trunk/features/ejava/pom.xml
+++ b/sandbox/ant/sca/trunk/features/ejava/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -37,14 +37,14 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <!-- Bindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 <!--
         <dependency>
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-rmi</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 <!--
         <dependency>
diff --git a/sandbox/ant/sca/trunk/features/pom.xml b/sandbox/ant/sca/trunk/features/pom.xml
index 0a4b94ec0b..a032d775c1 100644
--- a/sandbox/ant/sca/trunk/features/pom.xml
+++ b/sandbox/ant/sca/trunk/features/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.tuscany.sca</groupId>
     <artifactId>tuscany-feature</artifactId>
diff --git a/sandbox/ant/sca/trunk/features/webapp/pom.xml b/sandbox/ant/sca/trunk/features/webapp/pom.xml
index 0ed3754fb1..7ce155b15e 100644
--- a/sandbox/ant/sca/trunk/features/webapp/pom.xml
+++ b/sandbox/ant/sca/trunk/features/webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,14 +35,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <!-- Explicitly list the servlet/jsp apis as "provided" dependencies are not transitive -->
diff --git a/sandbox/ant/sca/trunk/features/webservice/pom.xml b/sandbox/ant/sca/trunk/features/webservice/pom.xml
index daac057d08..734511a735 100644
--- a/sandbox/ant/sca/trunk/features/webservice/pom.xml
+++ b/sandbox/ant/sca/trunk/features/webservice/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -37,7 +37,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <!-- Bindings -->
@@ -49,12 +49,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.ant</groupId>
@@ -85,24 +85,24 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <!-- Databindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <!--dependency>
             <groupId>org.apache.tuscany.sca</groupId>
@@ -119,14 +119,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <!-- Policy models -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml-ws</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/itest/callback-api/pom.xml b/sandbox/ant/sca/trunk/itest/callback-api/pom.xml
index 1d6b14b409..4deb295934 100644
--- a/sandbox/ant/sca/trunk/itest/callback-api/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/callback-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-api</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/itest/callback-basic/pom.xml b/sandbox/ant/sca/trunk/itest/callback-basic/pom.xml
index cb0f7dc242..d4706e591b 100644
--- a/sandbox/ant/sca/trunk/itest/callback-basic/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/callback-basic/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-basic</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/itest/callback-complex-type/pom.xml b/sandbox/ant/sca/trunk/itest/callback-complex-type/pom.xml
index 374a86ad94..2fd6fc59fd 100644
--- a/sandbox/ant/sca/trunk/itest/callback-complex-type/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/callback-complex-type/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-complex-type</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/itest/callback-id/pom.xml b/sandbox/ant/sca/trunk/itest/callback-id/pom.xml
index b8da251b22..a0338986f3 100644
--- a/sandbox/ant/sca/trunk/itest/callback-id/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/callback-id/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-id</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/itest/callback-multiple-wires/pom.xml b/sandbox/ant/sca/trunk/itest/callback-multiple-wires/pom.xml
index b1bf524c56..a0b1563e89 100644
--- a/sandbox/ant/sca/trunk/itest/callback-multiple-wires/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/callback-multiple-wires/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-multiple-wires</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/itest/callback-separatethread/pom.xml b/sandbox/ant/sca/trunk/itest/callback-separatethread/pom.xml
index 57b8677604..1d7804cc53 100644
--- a/sandbox/ant/sca/trunk/itest/callback-separatethread/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/callback-separatethread/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-separatethread</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/itest/callback-set-callback/pom.xml b/sandbox/ant/sca/trunk/itest/callback-set-callback/pom.xml
index 22482bb693..38010f9f05 100644
--- a/sandbox/ant/sca/trunk/itest/callback-set-callback/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/callback-set-callback/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-set-callback</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/itest/callback-set-conversation/pom.xml b/sandbox/ant/sca/trunk/itest/callback-set-conversation/pom.xml
index cde8ffd87a..769d902c54 100644
--- a/sandbox/ant/sca/trunk/itest/callback-set-conversation/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/callback-set-conversation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-set-conversation</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/itest/component-type/pom.xml b/sandbox/ant/sca/trunk/itest/component-type/pom.xml
index 0603798cca..17348c4776 100644
--- a/sandbox/ant/sca/trunk/itest/component-type/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/component-type/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-component-type</artifactId>
@@ -32,20 +32,20 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/itest/conversations/pom.xml b/sandbox/ant/sca/trunk/itest/conversations/pom.xml
index 365b1b66f3..2f86e9c8c8 100644
--- a/sandbox/ant/sca/trunk/itest/conversations/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/conversations/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-conversations</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/itest/distribution/bin-distro-unzip/pom.xml b/sandbox/ant/sca/trunk/itest/distribution/bin-distro-unzip/pom.xml
index 2ca71a90fb..b879b0227a 100644
--- a/sandbox/ant/sca/trunk/itest/distribution/bin-distro-unzip/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/distribution/bin-distro-unzip/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-bin-distro-unzip</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-distribution-all</artifactId>
             <type>pom</type>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/itest/distribution/binding-ws-calculator/pom.xml b/sandbox/ant/sca/trunk/itest/distribution/binding-ws-calculator/pom.xml
index 07c687bd06..dd5ac156a4 100644
--- a/sandbox/ant/sca/trunk/itest/distribution/binding-ws-calculator/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/distribution/binding-ws-calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distribution-binding-ws-calculator</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-bin-distro-unzip</artifactId>
             <type>pom</type>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>        
     </dependencies>
     
diff --git a/sandbox/ant/sca/trunk/itest/distribution/calculator-rmi/pom.xml b/sandbox/ant/sca/trunk/itest/distribution/calculator-rmi/pom.xml
index d283969725..9fc1edbd88 100644
--- a/sandbox/ant/sca/trunk/itest/distribution/calculator-rmi/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/distribution/calculator-rmi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distribution-calculator-rmi</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-bin-distro-unzip</artifactId>
             <type>pom</type>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>        
     </dependencies>
     
diff --git a/sandbox/ant/sca/trunk/itest/distribution/implementation-java-calculator/pom.xml b/sandbox/ant/sca/trunk/itest/distribution/implementation-java-calculator/pom.xml
index 5faa226667..9bca2ac289 100644
--- a/sandbox/ant/sca/trunk/itest/distribution/implementation-java-calculator/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/distribution/implementation-java-calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distribution-implementation-java-calculator</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-bin-distro-unzip</artifactId>
             <type>pom</type>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>        
     </dependencies>
     
diff --git a/sandbox/ant/sca/trunk/itest/distribution/pom.xml b/sandbox/ant/sca/trunk/itest/distribution/pom.xml
index 7333629dac..497e556bbd 100644
--- a/sandbox/ant/sca/trunk/itest/distribution/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/distribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/sandbox/ant/sca/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml b/sandbox/ant/sca/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml
index cf9568922e..3de026f192 100644
--- a/sandbox/ant/sca/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distribution-webapp-helloworld-jsp</artifactId>
@@ -34,14 +34,14 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-bin-distro-unzip</artifactId>
             <type>pom</type>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>helloworld-jsp</artifactId>
             <type>war</type>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/itest/distribution/webapp-helloworld/pom.xml b/sandbox/ant/sca/trunk/itest/distribution/webapp-helloworld/pom.xml
index 0bcf9bf423..f8df612c51 100644
--- a/sandbox/ant/sca/trunk/itest/distribution/webapp-helloworld/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/distribution/webapp-helloworld/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distribution-webapp-helloworld</artifactId>
@@ -34,14 +34,14 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-bin-distro-unzip</artifactId>
             <type>pom</type>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>helloworld</artifactId>
             <type>war</type>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/itest/exceptions/pom.xml b/sandbox/ant/sca/trunk/itest/exceptions/pom.xml
index a09536f014..28eb145c82 100644
--- a/sandbox/ant/sca/trunk/itest/exceptions/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/exceptions/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-exceptions</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/itest/interfaces/pom.xml b/sandbox/ant/sca/trunk/itest/interfaces/pom.xml
index f10acd7387..f5aed20395 100644
--- a/sandbox/ant/sca/trunk/itest/interfaces/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/interfaces/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-interfaces</artifactId>
@@ -32,20 +32,20 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sandbox/ant/sca/trunk/itest/pom.xml b/sandbox/ant/sca/trunk/itest/pom.xml
index 0043f54eba..a0f9224bfd 100644
--- a/sandbox/ant/sca/trunk/itest/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-itest</artifactId>
diff --git a/sandbox/ant/sca/trunk/itest/recursive-multi-level/pom.xml b/sandbox/ant/sca/trunk/itest/recursive-multi-level/pom.xml
index 591c9faa1c..6cc124816f 100644
--- a/sandbox/ant/sca/trunk/itest/recursive-multi-level/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/recursive-multi-level/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <!--relativePath>../pom.xml</relativePath-->
     </parent>
     <artifactId>itest-recursive-multi-level</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/itest/references/pom.xml b/sandbox/ant/sca/trunk/itest/references/pom.xml
index cae6bc380f..ff73d945bd 100644
--- a/sandbox/ant/sca/trunk/itest/references/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/references/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-references</artifactId>
@@ -32,20 +32,20 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/itest/scopes/pom.xml b/sandbox/ant/sca/trunk/itest/scopes/pom.xml
index c0276bfd36..4974bde905 100644
--- a/sandbox/ant/sca/trunk/itest/scopes/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/scopes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <name>Apache Tuscany SCA Scopes Integration Tests</name>
@@ -32,20 +32,20 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/itest/services/pom.xml b/sandbox/ant/sca/trunk/itest/services/pom.xml
index 2dec858c3c..0369ee144b 100644
--- a/sandbox/ant/sca/trunk/itest/services/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/services/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-services</artifactId>
@@ -32,20 +32,20 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/itest/wires/pom.xml b/sandbox/ant/sca/trunk/itest/wires/pom.xml
index 1f6431b406..501a5265cb 100644
--- a/sandbox/ant/sca/trunk/itest/wires/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/wires/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-wires</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/modules/assembly-xml-osoa/pom.xml b/sandbox/ant/sca/trunk/modules/assembly-xml-osoa/pom.xml
index 1c65f15b81..e66c3db630 100644
--- a/sandbox/ant/sca/trunk/modules/assembly-xml-osoa/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/assembly-xml-osoa/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-assembly-xml-osoa</artifactId>
@@ -32,44 +32,44 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>        
 
         <!-- 
@@ -103,21 +103,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd-osoa</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/modules/assembly-xml/pom.xml b/sandbox/ant/sca/trunk/modules/assembly-xml/pom.xml
index 1be3a92580..7d703879f7 100644
--- a/sandbox/ant/sca/trunk/modules/assembly-xml/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/assembly-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-assembly-xml</artifactId>
@@ -32,44 +32,44 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>        
 
         <!-- 
@@ -103,21 +103,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/modules/assembly-xsd-osoa/pom.xml b/sandbox/ant/sca/trunk/modules/assembly-xsd-osoa/pom.xml
index 84ba7e2243..fa210b8cc9 100644
--- a/sandbox/ant/sca/trunk/modules/assembly-xsd-osoa/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/assembly-xsd-osoa/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-assembly-xsd-osoa</artifactId>
diff --git a/sandbox/ant/sca/trunk/modules/assembly-xsd/pom.xml b/sandbox/ant/sca/trunk/modules/assembly-xsd/pom.xml
index 7ab76dc186..46ad6db5c4 100644
--- a/sandbox/ant/sca/trunk/modules/assembly-xsd/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/assembly-xsd/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-assembly-xsd</artifactId>
diff --git a/sandbox/ant/sca/trunk/modules/assembly/pom.xml b/sandbox/ant/sca/trunk/modules/assembly/pom.xml
index 6a9ac439c1..92fb75a64f 100644
--- a/sandbox/ant/sca/trunk/modules/assembly/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/assembly/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-assembly</artifactId>
@@ -32,25 +32,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
 	    <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>        
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/modules/binding-dwr/pom.xml b/sandbox/ant/sca/trunk/modules/binding-dwr/pom.xml
index 1107ca165d..fd033d606c 100644
--- a/sandbox/ant/sca/trunk/modules/binding-dwr/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/binding-dwr/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-dwr</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/modules/binding-jsonp/pom.xml b/sandbox/ant/sca/trunk/modules/binding-jsonp/pom.xml
index c15ec3fb1d..a24dd5dc56 100644
--- a/sandbox/ant/sca/trunk/modules/binding-jsonp/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/binding-jsonp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-jsonp</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/modules/binding-jsonrpc/pom.xml b/sandbox/ant/sca/trunk/modules/binding-jsonrpc/pom.xml
index 532dfbe6ce..b3b2fabca1 100644
--- a/sandbox/ant/sca/trunk/modules/binding-jsonrpc/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/binding-jsonrpc/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,19 +33,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/binding-rmi-runtime/pom.xml b/sandbox/ant/sca/trunk/modules/binding-rmi-runtime/pom.xml
index 50ee201467..461a552812 100644
--- a/sandbox/ant/sca/trunk/modules/binding-rmi-runtime/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/binding-rmi-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-rmi-runtime</artifactId>
@@ -33,19 +33,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-rmi</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -63,14 +63,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sandbox/ant/sca/trunk/modules/binding-rmi/pom.xml b/sandbox/ant/sca/trunk/modules/binding-rmi/pom.xml
index 85bf1cdd4b..1f9e4376eb 100644
--- a/sandbox/ant/sca/trunk/modules/binding-rmi/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/binding-rmi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-rmi</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/modules/binding-sca-xml/pom.xml b/sandbox/ant/sca/trunk/modules/binding-sca-xml/pom.xml
index f45344a741..483bdbf408 100644
--- a/sandbox/ant/sca/trunk/modules/binding-sca-xml/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/binding-sca-xml/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -36,13 +36,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>      
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>   
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/modules/binding-sca/pom.xml b/sandbox/ant/sca/trunk/modules/binding-sca/pom.xml
index 29dd5c435b..1e1714f389 100644
--- a/sandbox/ant/sca/trunk/modules/binding-sca/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/binding-sca/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,31 +35,31 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>  
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency> 
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>       
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>    
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/modules/binding-ws-axis2-policy/pom.xml b/sandbox/ant/sca/trunk/modules/binding-ws-axis2-policy/pom.xml
index 8ab24824d7..f384a9ba12 100644
--- a/sandbox/ant/sca/trunk/modules/binding-ws-axis2-policy/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/binding-ws-axis2-policy/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-modules</artifactId>
-		<version>2.0-M5-SNAPSHOT</version>
+		<version>2.0-M6-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>tuscany-binding-ws-axis2-policy</artifactId>
@@ -32,19 +32,19 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-contribution</artifactId>
-			<version>2.0-M5-SNAPSHOT</version>
+			<version>2.0-M6-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-policy-security</artifactId>
-			<version>2.0-M5-SNAPSHOT</version>
+			<version>2.0-M6-SNAPSHOT</version>
 		</dependency>	
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding-axiom</artifactId>
-			<version>2.0-M5-SNAPSHOT</version>
+			<version>2.0-M6-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
diff --git a/sandbox/ant/sca/trunk/modules/binding-ws-axis2/pom.xml b/sandbox/ant/sca/trunk/modules/binding-ws-axis2/pom.xml
index b9164ed0ee..8c15de7989 100644
--- a/sandbox/ant/sca/trunk/modules/binding-ws-axis2/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/binding-ws-axis2/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -42,91 +42,91 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2-policy</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml-ws</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>         
 
         <!-- Added by Mike Edwards, 11th December 2008 -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <!-- end of addition -->
 
@@ -325,28 +325,28 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
                
diff --git a/sandbox/ant/sca/trunk/modules/binding-ws-wsdlgen/pom.xml b/sandbox/ant/sca/trunk/modules/binding-ws-wsdlgen/pom.xml
index 80f0285c98..275e0fc220 100644
--- a/sandbox/ant/sca/trunk/modules/binding-ws-wsdlgen/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/binding-ws-wsdlgen/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
@@ -33,47 +33,47 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-jaxws</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2-policy</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sandbox/ant/sca/trunk/modules/binding-ws-xml/pom.xml b/sandbox/ant/sca/trunk/modules/binding-ws-xml/pom.xml
index 019ce66f73..f958442139 100644
--- a/sandbox/ant/sca/trunk/modules/binding-ws-xml/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/binding-ws-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-ws-xml</artifactId>
@@ -32,44 +32,44 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>         
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>                
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/modules/binding-ws/pom.xml b/sandbox/ant/sca/trunk/modules/binding-ws/pom.xml
index 3ec524eec7..02f67331e4 100644
--- a/sandbox/ant/sca/trunk/modules/binding-ws/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/binding-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-ws</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
          <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/contribution-java/pom.xml b/sandbox/ant/sca/trunk/modules/contribution-java/pom.xml
index 6e8189cedf..0de0c0a864 100644
--- a/sandbox/ant/sca/trunk/modules/contribution-java/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/contribution-java/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-contribution-java</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/contribution-namespace/pom.xml b/sandbox/ant/sca/trunk/modules/contribution-namespace/pom.xml
index 73f9dc3a2a..e523d4017a 100644
--- a/sandbox/ant/sca/trunk/modules/contribution-namespace/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/contribution-namespace/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-contribution-namespace</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/contribution-xml/pom.xml b/sandbox/ant/sca/trunk/modules/contribution-xml/pom.xml
index 1fc3cc2198..2a7552a779 100644
--- a/sandbox/ant/sca/trunk/modules/contribution-xml/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/contribution-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-contribution-xml</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/contribution/pom.xml b/sandbox/ant/sca/trunk/modules/contribution/pom.xml
index 4339f5fa59..2af0d4d2ea 100644
--- a/sandbox/ant/sca/trunk/modules/contribution/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-contribution</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <!--     	
diff --git a/sandbox/ant/sca/trunk/modules/core-databinding/pom.xml b/sandbox/ant/sca/trunk/modules/core-databinding/pom.xml
index fad71d15bb..53b74999ec 100644
--- a/sandbox/ant/sca/trunk/modules/core-databinding/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/core-databinding/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/sandbox/ant/sca/trunk/modules/core-spi/pom.xml b/sandbox/ant/sca/trunk/modules/core-spi/pom.xml
index be05f2fc6e..0c81daa8e9 100644
--- a/sandbox/ant/sca/trunk/modules/core-spi/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/core-spi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-core-spi</artifactId>
@@ -32,44 +32,44 @@
     	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>                        
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/core/pom.xml b/sandbox/ant/sca/trunk/modules/core/pom.xml
index 16d0d96a0f..5fb1e382dc 100644
--- a/sandbox/ant/sca/trunk/modules/core/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-core</artifactId>
@@ -32,31 +32,31 @@
     	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/databinding-axiom/pom.xml b/sandbox/ant/sca/trunk/modules/databinding-axiom/pom.xml
index 1cdc6c121f..a3bd77e343 100644
--- a/sandbox/ant/sca/trunk/modules/databinding-axiom/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/databinding-axiom/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-axiom</artifactId>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <!--
diff --git a/sandbox/ant/sca/trunk/modules/databinding-jaxb-axiom/pom.xml b/sandbox/ant/sca/trunk/modules/databinding-jaxb-axiom/pom.xml
index 70dff8d69f..3616b21d41 100644
--- a/sandbox/ant/sca/trunk/modules/databinding-jaxb-axiom/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/databinding-jaxb-axiom/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
diff --git a/sandbox/ant/sca/trunk/modules/databinding-jaxb/pom.xml b/sandbox/ant/sca/trunk/modules/databinding-jaxb/pom.xml
index a886090a56..5697e1140c 100644
--- a/sandbox/ant/sca/trunk/modules/databinding-jaxb/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/databinding-jaxb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-jaxb</artifactId>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <!-- 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/databinding/pom.xml b/sandbox/ant/sca/trunk/modules/databinding/pom.xml
index 78efadd54c..1fd8c2d763 100644
--- a/sandbox/ant/sca/trunk/modules/databinding/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/databinding/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-modules</artifactId>
-		<version>2.0-M5-SNAPSHOT</version>
+		<version>2.0-M6-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>tuscany-databinding</artifactId>
@@ -32,31 +32,31 @@
 		<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>		
 
         <!-- 
diff --git a/sandbox/ant/sca/trunk/modules/definitions-xml/pom.xml b/sandbox/ant/sca/trunk/modules/definitions-xml/pom.xml
index c01bc0097a..71108fcc31 100644
--- a/sandbox/ant/sca/trunk/modules/definitions-xml/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/definitions-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-definitions-xml</artifactId>
@@ -32,32 +32,32 @@
     	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
     	
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/modules/definitions/pom.xml b/sandbox/ant/sca/trunk/modules/definitions/pom.xml
index 346c2c2ab5..ef5f41fddc 100644
--- a/sandbox/ant/sca/trunk/modules/definitions/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/definitions/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-definitions</artifactId>
@@ -32,19 +32,19 @@
     	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
     
     	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/modules/endpoint/pom.xml b/sandbox/ant/sca/trunk/modules/endpoint/pom.xml
index 42dde4bc55..81ca642a78 100644
--- a/sandbox/ant/sca/trunk/modules/endpoint/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/endpoint/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,52 +35,52 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>  
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency> 
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency> 
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>         
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency> 
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/modules/extensibility-equinox/pom.xml b/sandbox/ant/sca/trunk/modules/extensibility-equinox/pom.xml
index ad8cd403cc..04bde27eb9 100644
--- a/sandbox/ant/sca/trunk/modules/extensibility-equinox/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/extensibility-equinox/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-extensibility-equinox</artifactId>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/extensibility/pom.xml b/sandbox/ant/sca/trunk/modules/extensibility/pom.xml
index 481573742c..ab2e839587 100644
--- a/sandbox/ant/sca/trunk/modules/extensibility/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/extensibility/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-extensibility</artifactId>
diff --git a/sandbox/ant/sca/trunk/modules/host-http/pom.xml b/sandbox/ant/sca/trunk/modules/host-http/pom.xml
index 79a25c58ce..4783683c1c 100644
--- a/sandbox/ant/sca/trunk/modules/host-http/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/host-http/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-host-http</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/host-jetty/pom.xml b/sandbox/ant/sca/trunk/modules/host-jetty/pom.xml
index c5560dd18d..09797099bd 100644
--- a/sandbox/ant/sca/trunk/modules/host-jetty/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/host-jetty/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-host-jetty</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/host-rmi/pom.xml b/sandbox/ant/sca/trunk/modules/host-rmi/pom.xml
index 9276b0da13..a9a1069f90 100644
--- a/sandbox/ant/sca/trunk/modules/host-rmi/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/host-rmi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-host-rmi</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/modules/host-webapp/pom.xml b/sandbox/ant/sca/trunk/modules/host-webapp/pom.xml
index 55bfde0f48..951a82ed81 100644
--- a/sandbox/ant/sca/trunk/modules/host-webapp/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/host-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,38 +33,38 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sandbox/ant/sca/trunk/modules/implementation-bpel-ode/pom.xml b/sandbox/ant/sca/trunk/modules/implementation-bpel-ode/pom.xml
index 16308bb01f..c0b26535ba 100644
--- a/sandbox/ant/sca/trunk/modules/implementation-bpel-ode/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/implementation-bpel-ode/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-bpel-ode</artifactId>
@@ -31,62 +31,62 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <!-- ODE Jars -->
diff --git a/sandbox/ant/sca/trunk/modules/implementation-bpel/pom.xml b/sandbox/ant/sca/trunk/modules/implementation-bpel/pom.xml
index 215a493eb1..3556056b59 100644
--- a/sandbox/ant/sca/trunk/modules/implementation-bpel/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/implementation-bpel/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>tuscany-implementation-bpel</artifactId>
@@ -32,43 +32,43 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-assembly</artifactId>
-			<version>2.0-M5-SNAPSHOT</version>
+			<version>2.0-M6-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-assembly-xml</artifactId>
-			<version>2.0-M5-SNAPSHOT</version>
+			<version>2.0-M6-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface</artifactId>
-			<version>2.0-M5-SNAPSHOT</version>
+			<version>2.0-M6-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-wsdl</artifactId>
-			<version>2.0-M5-SNAPSHOT</version>
+			<version>2.0-M6-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-java</artifactId>
-			<version>2.0-M5-SNAPSHOT</version>
+			<version>2.0-M6-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-wsdl-xml</artifactId>
-			<version>2.0-M5-SNAPSHOT</version>
+			<version>2.0-M6-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding</artifactId>
-			<version>2.0-M5-SNAPSHOT</version>
+			<version>2.0-M6-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
diff --git a/sandbox/ant/sca/trunk/modules/implementation-java-runtime/pom.xml b/sandbox/ant/sca/trunk/modules/implementation-java-runtime/pom.xml
index 3d2d5414c6..b50017d384 100644
--- a/sandbox/ant/sca/trunk/modules/implementation-java-runtime/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/implementation-java-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-java-runtime</artifactId>
@@ -32,31 +32,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>        
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/modules/implementation-java-xml/pom.xml b/sandbox/ant/sca/trunk/modules/implementation-java-xml/pom.xml
index c09008b84d..49d28b8301 100644
--- a/sandbox/ant/sca/trunk/modules/implementation-java-xml/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/implementation-java-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-java-xml</artifactId>
@@ -33,51 +33,51 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/modules/implementation-java/pom.xml b/sandbox/ant/sca/trunk/modules/implementation-java/pom.xml
index c301accf02..f3d3ff6402 100644
--- a/sandbox/ant/sca/trunk/modules/implementation-java/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/implementation-java/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-java</artifactId>
@@ -32,19 +32,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/implementation-node-runtime/pom.xml b/sandbox/ant/sca/trunk/modules/implementation-node-runtime/pom.xml
index f752dfdd0a..332fe1c6fa 100644
--- a/sandbox/ant/sca/trunk/modules/implementation-node-runtime/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/implementation-node-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,37 +33,37 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sandbox/ant/sca/trunk/modules/implementation-node/pom.xml b/sandbox/ant/sca/trunk/modules/implementation-node/pom.xml
index e801b7030e..a829999c56 100644
--- a/sandbox/ant/sca/trunk/modules/implementation-node/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/implementation-node/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,32 +33,32 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sandbox/ant/sca/trunk/modules/implementation-web-runtime/pom.xml b/sandbox/ant/sca/trunk/modules/implementation-web-runtime/pom.xml
index 2653e53238..2b4f32cc6f 100644
--- a/sandbox/ant/sca/trunk/modules/implementation-web-runtime/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/implementation-web-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,25 +34,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -72,7 +72,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/modules/implementation-web/pom.xml b/sandbox/ant/sca/trunk/modules/implementation-web/pom.xml
index 76118f362b..d5195dbf86 100644
--- a/sandbox/ant/sca/trunk/modules/implementation-web/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/implementation-web/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,44 +34,44 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
  
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sandbox/ant/sca/trunk/modules/interface-java-jaxws/pom.xml b/sandbox/ant/sca/trunk/modules/interface-java-jaxws/pom.xml
index 652fb7e63e..28c0374ac5 100644
--- a/sandbox/ant/sca/trunk/modules/interface-java-jaxws/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/interface-java-jaxws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-interface-java-jaxws</artifactId>
@@ -32,17 +32,17 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/interface-java-xml/pom.xml b/sandbox/ant/sca/trunk/modules/interface-java-xml/pom.xml
index b87e62d755..e67e0569fe 100644
--- a/sandbox/ant/sca/trunk/modules/interface-java-xml/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/interface-java-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-interface-java-xml</artifactId>
@@ -32,25 +32,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/modules/interface-java/pom.xml b/sandbox/ant/sca/trunk/modules/interface-java/pom.xml
index 0fc5f3deec..6727dd00db 100644
--- a/sandbox/ant/sca/trunk/modules/interface-java/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/interface-java/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-interface-java</artifactId>
@@ -32,31 +32,31 @@
     	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/modules/interface-wsdl-xml/pom.xml b/sandbox/ant/sca/trunk/modules/interface-wsdl-xml/pom.xml
index 884bb3ccb9..318587f92a 100644
--- a/sandbox/ant/sca/trunk/modules/interface-wsdl-xml/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/interface-wsdl-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-interface-wsdl-xml</artifactId>
@@ -32,37 +32,37 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/modules/interface-wsdl/pom.xml b/sandbox/ant/sca/trunk/modules/interface-wsdl/pom.xml
index a051309c89..fcef70a641 100644
--- a/sandbox/ant/sca/trunk/modules/interface-wsdl/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/interface-wsdl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-interface-wsdl</artifactId>
@@ -32,25 +32,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/interface/pom.xml b/sandbox/ant/sca/trunk/modules/interface/pom.xml
index c3f1e185ec..a0cfda06cf 100644
--- a/sandbox/ant/sca/trunk/modules/interface/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/interface/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-interface</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/modules/launcher/pom.xml b/sandbox/ant/sca/trunk/modules/launcher/pom.xml
index 19f08791ca..df4404858b 100644
--- a/sandbox/ant/sca/trunk/modules/launcher/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/launcher/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sandbox/ant/sca/trunk/modules/monitor/pom.xml b/sandbox/ant/sca/trunk/modules/monitor/pom.xml
index f9cdab0810..f16aed30b9 100644
--- a/sandbox/ant/sca/trunk/modules/monitor/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/monitor/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sandbox/ant/sca/trunk/modules/myfaces/pom.xml b/sandbox/ant/sca/trunk/modules/myfaces/pom.xml
index 11b9190a4a..e0cbcb79af 100644
--- a/sandbox/ant/sca/trunk/modules/myfaces/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/myfaces/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,13 +34,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/node-api/pom.xml b/sandbox/ant/sca/trunk/modules/node-api/pom.xml
index 62e1191f3a..b700fc7121 100644
--- a/sandbox/ant/sca/trunk/modules/node-api/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/node-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/modules/node-impl/pom.xml b/sandbox/ant/sca/trunk/modules/node-impl/pom.xml
index 4444d6e0d9..05575d1b5c 100644
--- a/sandbox/ant/sca/trunk/modules/node-impl/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/node-impl/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,111 +35,111 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>          
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-endpoint</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
                
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
               
diff --git a/sandbox/ant/sca/trunk/modules/node-launcher-equinox/pom.xml b/sandbox/ant/sca/trunk/modules/node-launcher-equinox/pom.xml
index 7243922f9a..b4a804e812 100644
--- a/sandbox/ant/sca/trunk/modules/node-launcher-equinox/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/node-launcher-equinox/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -73,14 +73,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
@@ -94,7 +94,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/modules/node-launcher/pom.xml b/sandbox/ant/sca/trunk/modules/node-launcher/pom.xml
index b24fd33a2a..3fd5f5aa46 100644
--- a/sandbox/ant/sca/trunk/modules/node-launcher/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/node-launcher/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sandbox/ant/sca/trunk/modules/policy-security/pom.xml b/sandbox/ant/sca/trunk/modules/policy-security/pom.xml
index edb19134f5..6eead0f4df 100644
--- a/sandbox/ant/sca/trunk/modules/policy-security/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/policy-security/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy-security</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/modules/policy-xml-ws/pom.xml b/sandbox/ant/sca/trunk/modules/policy-xml-ws/pom.xml
index c30e9d98c7..7e1b20da53 100644
--- a/sandbox/ant/sca/trunk/modules/policy-xml-ws/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/policy-xml-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy-xml-ws</artifactId>
@@ -32,19 +32,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/policy-xml/pom.xml b/sandbox/ant/sca/trunk/modules/policy-xml/pom.xml
index 49a3801884..c167a077ee 100644
--- a/sandbox/ant/sca/trunk/modules/policy-xml/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/policy-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy-xml</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/policy/pom.xml b/sandbox/ant/sca/trunk/modules/policy/pom.xml
index c5cbb15a6c..4378211d7f 100644
--- a/sandbox/ant/sca/trunk/modules/policy/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/policy/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
    </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/modules/pom.xml b/sandbox/ant/sca/trunk/modules/pom.xml
index 1b7b380a0b..1f392c066d 100644
--- a/sandbox/ant/sca/trunk/modules/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-modules</artifactId>
diff --git a/sandbox/ant/sca/trunk/modules/sca-api/pom.xml b/sandbox/ant/sca/trunk/modules/sca-api/pom.xml
index dc730ef945..63db674bbd 100644
--- a/sandbox/ant/sca/trunk/modules/sca-api/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/sca-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>org.apache.tuscany.sca</groupId>
diff --git a/sandbox/ant/sca/trunk/modules/stripes/pom.xml b/sandbox/ant/sca/trunk/modules/stripes/pom.xml
index 502591794d..7774a78f71 100644
--- a/sandbox/ant/sca/trunk/modules/stripes/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/stripes/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,12 +34,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/workspace-impl/pom.xml b/sandbox/ant/sca/trunk/modules/workspace-impl/pom.xml
index 93a55ede6a..e83c3ba356 100644
--- a/sandbox/ant/sca/trunk/modules/workspace-impl/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/workspace-impl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-workspace-impl</artifactId>
@@ -32,31 +32,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/modules/workspace-xml/pom.xml b/sandbox/ant/sca/trunk/modules/workspace-xml/pom.xml
index 2a9578ce63..80ec759962 100644
--- a/sandbox/ant/sca/trunk/modules/workspace-xml/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/workspace-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-workspace-xml</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/workspace/pom.xml b/sandbox/ant/sca/trunk/modules/workspace/pom.xml
index 23ae83af78..32891db631 100644
--- a/sandbox/ant/sca/trunk/modules/workspace/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/workspace/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-workspace</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/modules/xsd-xml/pom.xml b/sandbox/ant/sca/trunk/modules/xsd-xml/pom.xml
index f8fb08caef..6789b2468c 100644
--- a/sandbox/ant/sca/trunk/modules/xsd-xml/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/xsd-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-xsd-xml</artifactId>
@@ -32,25 +32,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/modules/xsd/pom.xml b/sandbox/ant/sca/trunk/modules/xsd/pom.xml
index 58eddb6dee..2c6042a259 100644
--- a/sandbox/ant/sca/trunk/modules/xsd/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/xsd/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-xsd</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/pom.xml b/sandbox/ant/sca/trunk/pom.xml
index c14f680b51..42a122c797 100644
--- a/sandbox/ant/sca/trunk/pom.xml
+++ b/sandbox/ant/sca/trunk/pom.xml
@@ -30,12 +30,12 @@
     <packaging>pom</packaging>
     <name>Apache Tuscany SCA Implementation Project (2.x)</name>
     <url>http://tuscany.apache.org</url>
-    <version>2.0-M5-SNAPSHOT</version>
+    <version>2.0-M6-SNAPSHOT</version>
 
     <scm>
-        <connection>scm:svn:https://svn.apache.org/repos/asf/tuscany/sandbox/ant/sca/branches/tb3</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tuscany/sandbox/ant/sca/branches/tb3</developerConnection>
-        <url>https://svn.apache.org/repos/asf/tuscany/sandbox/ant/sca/branches/tb3</url>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/tuscany/sandbox/ant/sca/branches/tb2</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tuscany/sandbox/ant/sca/branches/tb2</developerConnection>
+        <url>https://svn.apache.org/repos/asf/tuscany/sandbox/ant/sca/branches/tb2</url>
     </scm>
 
     <prerequisites>
diff --git a/sandbox/ant/sca/trunk/samples/binding-ws-calculator/pom.xml b/sandbox/ant/sca/trunk/samples/binding-ws-calculator/pom.xml
index 6bce713d7a..39f528457c 100644
--- a/sandbox/ant/sca/trunk/samples/binding-ws-calculator/pom.xml
+++ b/sandbox/ant/sca/trunk/samples/binding-ws-calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-binding-ws-calculator</artifactId>
@@ -40,28 +40,28 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-api</artifactId>
             <type>pom</type>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webservice</artifactId>
             <type>pom</type>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-ejava</artifactId>
             <type>pom</type>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>        
         
         <dependency>
diff --git a/sandbox/ant/sca/trunk/samples/calculator-equinox/pom.xml b/sandbox/ant/sca/trunk/samples/calculator-equinox/pom.xml
index de007a71f6..49c5b77263 100644
--- a/sandbox/ant/sca/trunk/samples/calculator-equinox/pom.xml
+++ b/sandbox/ant/sca/trunk/samples/calculator-equinox/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-calculator-equinox</artifactId>
@@ -39,40 +39,40 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>   
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/samples/calculator-osgi/pom.xml b/sandbox/ant/sca/trunk/samples/calculator-osgi/pom.xml
index 172f91333a..5ab5bf981c 100644
--- a/sandbox/ant/sca/trunk/samples/calculator-osgi/pom.xml
+++ b/sandbox/ant/sca/trunk/samples/calculator-osgi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-calculator-osgi</artifactId>
@@ -39,14 +39,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
 
diff --git a/sandbox/ant/sca/trunk/samples/calculator-rmi-reference/pom.xml b/sandbox/ant/sca/trunk/samples/calculator-rmi-reference/pom.xml
index 1a542d9395..69955e6ac0 100644
--- a/sandbox/ant/sca/trunk/samples/calculator-rmi-reference/pom.xml
+++ b/sandbox/ant/sca/trunk/samples/calculator-rmi-reference/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-calculator-rmi-reference</artifactId>
@@ -32,25 +32,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
diff --git a/sandbox/ant/sca/trunk/samples/calculator-rmi-service/pom.xml b/sandbox/ant/sca/trunk/samples/calculator-rmi-service/pom.xml
index 42874a5bbb..47da917c3f 100644
--- a/sandbox/ant/sca/trunk/samples/calculator-rmi-service/pom.xml
+++ b/sandbox/ant/sca/trunk/samples/calculator-rmi-service/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-calculator-rmi-service</artifactId>
@@ -32,24 +32,24 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
diff --git a/sandbox/ant/sca/trunk/samples/calculator/pom.xml b/sandbox/ant/sca/trunk/samples/calculator/pom.xml
index 9b930d6315..de72b53437 100644
--- a/sandbox/ant/sca/trunk/samples/calculator/pom.xml
+++ b/sandbox/ant/sca/trunk/samples/calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-calculator</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sandbox/ant/sca/trunk/samples/helloworld-bpel/pom.xml b/sandbox/ant/sca/trunk/samples/helloworld-bpel/pom.xml
index 5de2eb976e..e6ac9b471d 100644
--- a/sandbox/ant/sca/trunk/samples/helloworld-bpel/pom.xml
+++ b/sandbox/ant/sca/trunk/samples/helloworld-bpel/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-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-node-impl</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sandbox/ant/sca/trunk/samples/implementation-java-calculator/pom.xml b/sandbox/ant/sca/trunk/samples/implementation-java-calculator/pom.xml
index b5a70091f2..44c4f6cdd0 100644
--- a/sandbox/ant/sca/trunk/samples/implementation-java-calculator/pom.xml
+++ b/sandbox/ant/sca/trunk/samples/implementation-java-calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-implementation-java-calculator</artifactId>
@@ -40,14 +40,14 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-api</artifactId>
             <type>pom</type>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/sandbox/ant/sca/trunk/samples/pom.xml b/sandbox/ant/sca/trunk/samples/pom.xml
index d5e5da5cec..99722e80dd 100644
--- a/sandbox/ant/sca/trunk/samples/pom.xml
+++ b/sandbox/ant/sca/trunk/samples/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-samples</artifactId>
diff --git a/sandbox/ant/sca/trunk/samples/webapps/helloworld-jsp/pom.xml b/sandbox/ant/sca/trunk/samples/webapps/helloworld-jsp/pom.xml
index 7a3beb1845..26eb22c709 100644
--- a/sandbox/ant/sca/trunk/samples/webapps/helloworld-jsp/pom.xml
+++ b/sandbox/ant/sca/trunk/samples/webapps/helloworld-jsp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -35,14 +35,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sandbox/ant/sca/trunk/samples/webapps/helloworld-stripes/pom.xml b/sandbox/ant/sca/trunk/samples/webapps/helloworld-stripes/pom.xml
index d96d07fb4f..c3b8bf8dbc 100644
--- a/sandbox/ant/sca/trunk/samples/webapps/helloworld-stripes/pom.xml
+++ b/sandbox/ant/sca/trunk/samples/webapps/helloworld-stripes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -36,12 +36,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-stripes</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
         </dependency>
 
         <!--  Stripes Framework dependencies -->
diff --git a/sandbox/ant/sca/trunk/samples/webapps/helloworld/pom.xml b/sandbox/ant/sca/trunk/samples/webapps/helloworld/pom.xml
index 8e5e188404..287e42f4ab 100644
--- a/sandbox/ant/sca/trunk/samples/webapps/helloworld/pom.xml
+++ b/sandbox/ant/sca/trunk/samples/webapps/helloworld/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M5-SNAPSHOT</version>
+        <version>2.0-M6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -35,14 +35,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-M5-SNAPSHOT</version>
+            <version>2.0-M6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
author	antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>	2009-03-19 17:04:12 +0000
committer	antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>	2009-03-19 17:04:12 +0000
commit	89b77073a3a3fa1402698ba52ef652e717db4a57 (patch)
tree	5a3ac34d2ba022c3bb396cc0a89d4e186185de11 /sandbox/ant/sca/trunk
parent	875ac5d246878b199c393e9700c8a085c8939333 (diff)