[maven-release-plugin] prepare branch tb2

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@756021 13f79535-47bb-0310-9956-ffa450edef68
author: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> 2009-03-19 14:27:42 +0000
committer: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> 2009-03-19 14:27:42 +0000
commit: b954869b2e22bc61d5dcde3457d9fea6e676b270 (patch)
tree: 1e5f65c224d9b9fcaff46e8bf3358f1ad6ad9cd8 /sandbox
parent: 11c3000651bc41fd5693d84f7e208904b796cba2 (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 9af87e9da9..7ad021d573 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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 64bddd83f2..4f445fbdee 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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 304ab13a9a..83b4b8891d 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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 6b2bd42530..f713f97903 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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 6cdcba11f3..f9b2f530e4 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-stripes</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-myfaces</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/distribution/pom.xml b/sandbox/ant/sca/trunk/distribution/pom.xml
index 795dc7d1f3..cde154edcb 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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 b868d63fe0..a39f443993 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webservice</artifactId>
             <type>pom</type>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-ejava</artifactId>
             <type>pom</type>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webapp</artifactId>
             <type>pom</type>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-launcher</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
 
diff --git a/sandbox/ant/sca/trunk/features/api/pom.xml b/sandbox/ant/sca/trunk/features/api/pom.xml
index bb0140c144..8742fcff59 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <!-- Node API -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 bc1971876d..e7b7d8e9ed 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <!-- SCA API -->
@@ -57,17 +57,17 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <!-- Bindings -->
@@ -81,46 +81,46 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <!-- Core runtime -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <!-- Databindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <!-- Data API -->
@@ -134,26 +134,26 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <!-- Domain support -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-endpoint</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <!-- Core Extensibility -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <!--  Hosts -->
@@ -166,19 +166,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <!-- Implementation types -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
 
@@ -186,34 +186,34 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-jaxws</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <!-- Node runtime -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <!--
@@ -229,19 +229,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <!-- Policy models -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <!-- XMLSchema support -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 f3963965ab..44e18f46ca 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <!-- Bindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 <!--
         <dependency>
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-rmi</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 <!--
         <dependency>
diff --git a/sandbox/ant/sca/trunk/features/pom.xml b/sandbox/ant/sca/trunk/features/pom.xml
index fb068365db..6a439e1a1a 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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 06c3470945..f633bdf3d2 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 f5eb4b402a..5d1fb3a010 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <!-- Bindings -->
@@ -49,12 +49,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <!-- Databindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <!-- Policy models -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml-ws</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 0638fc8f1b..ac7f8d1360 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 b67bf398f3..8a430f9891 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 91382415ef..f1cdb3a35e 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 079b25fa53..4e94a348a6 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 8bf41b3053..5cac560a34 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 545287362b..dbaa8ac7a4 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 beda7397d5..4bbb67ac51 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 b03051512b..04909243a8 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 713acdc6b1..745f743238 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 586f401c2e..c654722c35 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 72315969dc..7556094684 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 555dcaec41..4a0b1c3dc8 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 b629884690..3bb16cf56e 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 3b4180f0d2..05d4c72a0d 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 5d55696a09..ca076961f4 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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 83fe04bb2e..cf3e84e015 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>helloworld-jsp</artifactId>
             <type>war</type>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 235e08241d..80dc2407d3 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>helloworld</artifactId>
             <type>war</type>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 6e844c879e..c8af9ed616 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 258d7ef9d0..b42681da84 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 3e4fcddf9f..f59d3c13a6 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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 ebfd268bd0..6e466773dc 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 639f099a24..d18b6e2d2b 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 3fdebc4f61..ba5be34dbb 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 10fec06b79..b2806884a5 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 7bb086f569..44af0fa196 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 6427a4e461..98626866e4 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>        
 
         <!-- 
@@ -103,21 +103,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd-osoa</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 3260265b66..74c13eb5dd 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>        
 
         <!-- 
@@ -103,21 +103,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 449ee1ce38..0e2306d667 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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 6dace239f8..7978aabe55 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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 ba03ea6f3f..b4c7e37630 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
 	    <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 7b737701ee..5dfef7f0b8 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 7b0c239a0f..4c9c00af3c 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 07ebe0d1de..cf1853c1c1 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 a94e351ae0..ef8377eb14 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-rmi</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -63,14 +63,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 1150b229ba..9e16256c87 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 03b3c1bb8f..6a81adbce8 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>      
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 5403e3164b..4c9a7c422b 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>  
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency> 
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>       
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 52ee3e1cc8..0e53a8b2b5 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-M3-SNAPSHOT</version>
+		<version>2.0-M4-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-M3-SNAPSHOT</version>
+			<version>2.0-M4-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-policy-security</artifactId>
-			<version>2.0-M3-SNAPSHOT</version>
+			<version>2.0-M4-SNAPSHOT</version>
 		</dependency>	
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding-axiom</artifactId>
-			<version>2.0-M3-SNAPSHOT</version>
+			<version>2.0-M4-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 d92fdfe9d9..cfab54c9f9 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2-policy</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml-ws</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 4c47bceece..b2f98c30a8 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-jaxws</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2-policy</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 c23f367d2e..36d4b197b1 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>         
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 46bc025002..ccc3829b42 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 248eed1b3f..c1b967e781 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 2653102005..575099c30e 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 adb38dadaa..ba14a0437b 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 a88202aa1a..0e778a3b1a 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 523e7c18c3..959c19b6bf 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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 57adb3940d..21e02b8a31 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 a4c1d2e061..d93a987ce9 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 3da1101e9b..3d03a66512 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 c60a515f36..00025dfb6f 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 db41606e53..b1de3c3404 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 24ed7b7f87..e4cf2d8cde 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-M3-SNAPSHOT</version>
+		<version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 5dfdfe22ac..112078108d 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
     	
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 3094882df4..7d2baaed1a 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
     
     	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 3ffc51524f..de5593ce39 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>  
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency> 
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency> 
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>         
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 58c91c3bd1..7deece0288 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 491b559531..e7a4bc85d7 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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 2c072c3710..f96ce93372 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 ed7d8c1c74..f507df7199 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 900012a360..00ce370a3b 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 2bed8bbdbb..c2a83489fc 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 695a17e9e5..f91d172a6e 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 fdd2a68090..f8aa924e61 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+			<version>2.0-M4-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-assembly-xml</artifactId>
-			<version>2.0-M3-SNAPSHOT</version>
+			<version>2.0-M4-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface</artifactId>
-			<version>2.0-M3-SNAPSHOT</version>
+			<version>2.0-M4-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-wsdl</artifactId>
-			<version>2.0-M3-SNAPSHOT</version>
+			<version>2.0-M4-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-java</artifactId>
-			<version>2.0-M3-SNAPSHOT</version>
+			<version>2.0-M4-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-wsdl-xml</artifactId>
-			<version>2.0-M3-SNAPSHOT</version>
+			<version>2.0-M4-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding</artifactId>
-			<version>2.0-M3-SNAPSHOT</version>
+			<version>2.0-M4-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 793317c532..51de1f3383 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 0d6b982880..6d7b96c123 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 6dfc47350b..5ca541764e 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 cc7b1e22bb..ea37bd5c62 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 f1adbf46f9..f3d6c4bdd2 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 77cc8e10ff..ac8fd0c7cd 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -72,7 +72,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 1e8c17d67b..f9915acc92 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
  
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 c41bf05246..db63e3eeb4 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 a72dfab223..51458a2927 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 c070812990..3436292332 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 d5091051d6..24861832ca 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 e66bea41b8..d5ef4a8707 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 3bc80af11d..b9e711fbef 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 c1b9e519d0..42f0483434 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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 46426e6b81..109e07a250 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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 fcef012f69..d824493a7a 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 a75af4021c..8e181ce467 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 f0e50d8743..74ba9bbf05 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>          
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-endpoint</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
                
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 51490ab609..cc0803a9fc 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 70f86517f4..dbe94fb361 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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 ee5e15e392..c72ca03e30 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 c0669cfb12..51e7932f67 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 6e1bdcd7e1..6c8f57ec43 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 12ce89c0aa..203c520214 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
    </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/modules/pom.xml b/sandbox/ant/sca/trunk/modules/pom.xml
index 970b111f10..90894d178e 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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 866e268033..0483ca34d7 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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 aeb46f6fca..4a63e796f3 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 0518aef5c5..1cbc305cf8 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 58ca651f2f..ed0c37379f 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 60693fe9de..9a1a1f27db 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 296afaf2d9..4efb036205 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 c6065217c8..4468a3d37d 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/pom.xml b/sandbox/ant/sca/trunk/pom.xml
index 28c75def4a..f189b5b504 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-M3-SNAPSHOT</version>
+    <version>2.0-M4-SNAPSHOT</version>
 
     <scm>
-        <connection>scm:svn:https://svn.apache.org/repos/asf/tuscany/sandbox/ant/sca/tags/test-branch</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tuscany/sandbox/ant/sca/branches/test-branch</developerConnection>
-        <url>https://svn.apache.org/repos/asf/tuscany/sandbox/ant/sca/tags/test-branch</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 378e695560..2d7129fa71 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webservice</artifactId>
             <type>pom</type>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-ejava</artifactId>
             <type>pom</type>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 2297f7fd0a..345048cb25 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>   
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 8b76c896c4..41ae9e7c0e 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 937b9fd9ab..039e7d0a74 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 2804285002..37c29138a4 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 3aa27cd736..9310e363ab 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 8e99de8a14..55f3dd46ed 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 2565461a12..df95e6b89c 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/sandbox/ant/sca/trunk/samples/pom.xml b/sandbox/ant/sca/trunk/samples/pom.xml
index 4e412fa011..c1c0211f22 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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 1d11c86562..d707357f5c 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 ecd85d908c..00697ee263 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-stripes</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-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 ac9c21830f..c0c6541223 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-M3-SNAPSHOT</version>
+        <version>2.0-M4-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-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-M3-SNAPSHOT</version>
+            <version>2.0-M4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
author	antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>	2009-03-19 14:27:42 +0000
committer	antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>	2009-03-19 14:27:42 +0000
commit	b954869b2e22bc61d5dcde3457d9fea6e676b270 (patch)
tree	1e5f65c224d9b9fcaff46e8bf3358f1ad6ad9cd8 /sandbox
parent	11c3000651bc41fd5693d84f7e208904b796cba2 (diff)