[maven-release-plugin] prepare branch tb2

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@756024 13f79535-47bb-0310-9956-ffa450edef68
author: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> 2009-03-19 14:34:18 +0000
committer: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> 2009-03-19 14:34:18 +0000
commit: eb0f1aa15d6f6cb9905f80d6f656b31cfe76d618 (patch)
tree: f3d8afb9c1c792d75c70dc4ce805a00f0807abdc /sandbox/ant
parent: b954869b2e22bc61d5dcde3457d9fea6e676b270 (diff)
122 files changed, 538 insertions, 538 deletions
diff --git a/sandbox/ant/sca/trunk/archetypes/pom.xml b/sandbox/ant/sca/trunk/archetypes/pom.xml
index 7ad021d573..84e3ffba8b 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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 4f445fbdee..1622b0d885 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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 83b4b8891d..92d4497070 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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 f713f97903..3dd8fc6c18 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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 f9b2f530e4..4d007001a0 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-stripes</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-myfaces</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/distribution/pom.xml b/sandbox/ant/sca/trunk/distribution/pom.xml
index cde154edcb..a667d60987 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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 a39f443993..ad73de0592 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webservice</artifactId>
             <type>pom</type>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-ejava</artifactId>
             <type>pom</type>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webapp</artifactId>
             <type>pom</type>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-launcher</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
 
diff --git a/sandbox/ant/sca/trunk/features/api/pom.xml b/sandbox/ant/sca/trunk/features/api/pom.xml
index 8742fcff59..ae021cffc5 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <!-- Node API -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 e7b7d8e9ed..602dda11e1 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <!-- SCA API -->
@@ -57,17 +57,17 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <!-- Bindings -->
@@ -81,46 +81,46 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <!-- Core runtime -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <!-- Databindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <!-- Data API -->
@@ -134,26 +134,26 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <!-- Domain support -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-endpoint</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <!-- Core Extensibility -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <!--  Hosts -->
@@ -166,19 +166,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <!-- Implementation types -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
 
@@ -186,34 +186,34 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-jaxws</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <!-- Node runtime -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <!--
@@ -229,19 +229,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <!-- Policy models -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <!-- XMLSchema support -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 44e18f46ca..1e40bc2fa7 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <!-- Bindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 <!--
         <dependency>
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-rmi</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 <!--
         <dependency>
diff --git a/sandbox/ant/sca/trunk/features/pom.xml b/sandbox/ant/sca/trunk/features/pom.xml
index 6a439e1a1a..0a4b94ec0b 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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 f633bdf3d2..0ed3754fb1 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 5d1fb3a010..daac057d08 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <!-- Bindings -->
@@ -49,12 +49,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <!-- Databindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <!-- Policy models -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml-ws</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 ac7f8d1360..1d6b14b409 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 8a430f9891..cb0f7dc242 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 f1cdb3a35e..374a86ad94 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 4e94a348a6..b8da251b22 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 5cac560a34..b1bf524c56 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 dbaa8ac7a4..57b8677604 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 4bbb67ac51..22482bb693 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 04909243a8..cde8ffd87a 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 745f743238..0603798cca 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 c654722c35..365b1b66f3 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 7556094684..2ca71a90fb 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 4a0b1c3dc8..07c687bd06 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 3bb16cf56e..d283969725 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 05d4c72a0d..5faa226667 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 ca076961f4..7333629dac 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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 cf3e84e015..cf9568922e 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>helloworld-jsp</artifactId>
             <type>war</type>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 80dc2407d3..0bcf9bf423 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>helloworld</artifactId>
             <type>war</type>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 c8af9ed616..a09536f014 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 b42681da84..f10acd7387 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 f59d3c13a6..0043f54eba 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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 6e466773dc..591c9faa1c 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 d18b6e2d2b..cae6bc380f 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 ba5be34dbb..c0276bfd36 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 b2806884a5..2dec858c3c 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 44af0fa196..1f6431b406 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 98626866e4..1c65f15b81 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>        
 
         <!-- 
@@ -103,21 +103,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd-osoa</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 74c13eb5dd..1be3a92580 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>        
 
         <!-- 
@@ -103,21 +103,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 0e2306d667..84ba7e2243 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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 7978aabe55..7ab76dc186 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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 b4c7e37630..6a9ac439c1 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
 	    <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 5dfef7f0b8..1107ca165d 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 4c9c00af3c..c15ec3fb1d 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 cf1853c1c1..532dfbe6ce 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 ef8377eb14..50ee201467 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-rmi</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -63,14 +63,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 9e16256c87..85bf1cdd4b 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 6a81adbce8..f45344a741 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>      
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 4c9a7c422b..29dd5c435b 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>  
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency> 
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>       
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 0e53a8b2b5..8ab24824d7 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-M4-SNAPSHOT</version>
+		<version>2.0-M5-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-M4-SNAPSHOT</version>
+			<version>2.0-M5-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-policy-security</artifactId>
-			<version>2.0-M4-SNAPSHOT</version>
+			<version>2.0-M5-SNAPSHOT</version>
 		</dependency>	
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding-axiom</artifactId>
-			<version>2.0-M4-SNAPSHOT</version>
+			<version>2.0-M5-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 cfab54c9f9..b9164ed0ee 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2-policy</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml-ws</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 b2f98c30a8..80f0285c98 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-jaxws</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2-policy</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 36d4b197b1..019ce66f73 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>         
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 ccc3829b42..3ec524eec7 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 c1b967e781..6e8189cedf 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 575099c30e..73f9dc3a2a 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 ba14a0437b..1fc3cc2198 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 0e778a3b1a..4339f5fa59 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 959c19b6bf..fad71d15bb 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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 21e02b8a31..be05f2fc6e 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 d93a987ce9..16d0d96a0f 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 3d03a66512..1cdc6c121f 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 00025dfb6f..70dff8d69f 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 b1de3c3404..a886090a56 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 e4cf2d8cde..78efadd54c 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-M4-SNAPSHOT</version>
+		<version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 112078108d..c01bc0097a 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
     	
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 7d2baaed1a..346c2c2ab5 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
     
     	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 de5593ce39..42dde4bc55 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>  
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency> 
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency> 
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>         
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 7deece0288..ad8cd403cc 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 e7a4bc85d7..481573742c 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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 f96ce93372..79a25c58ce 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 f507df7199..c5560dd18d 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 00ce370a3b..9276b0da13 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 c2a83489fc..55bfde0f48 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 f91d172a6e..16308bb01f 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 f8aa924e61..215a493eb1 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+			<version>2.0-M5-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-assembly-xml</artifactId>
-			<version>2.0-M4-SNAPSHOT</version>
+			<version>2.0-M5-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface</artifactId>
-			<version>2.0-M4-SNAPSHOT</version>
+			<version>2.0-M5-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-wsdl</artifactId>
-			<version>2.0-M4-SNAPSHOT</version>
+			<version>2.0-M5-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-java</artifactId>
-			<version>2.0-M4-SNAPSHOT</version>
+			<version>2.0-M5-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-wsdl-xml</artifactId>
-			<version>2.0-M4-SNAPSHOT</version>
+			<version>2.0-M5-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding</artifactId>
-			<version>2.0-M4-SNAPSHOT</version>
+			<version>2.0-M5-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 51de1f3383..3d2d5414c6 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 6d7b96c123..c09008b84d 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 5ca541764e..c301accf02 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 ea37bd5c62..f752dfdd0a 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 f3d6c4bdd2..e801b7030e 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 ac8fd0c7cd..2653e53238 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -72,7 +72,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 f9915acc92..76118f362b 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
  
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 db63e3eeb4..652fb7e63e 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 51458a2927..b87e62d755 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 3436292332..0fc5f3deec 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 24861832ca..884bb3ccb9 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 d5ef4a8707..a051309c89 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 b9e711fbef..c3f1e185ec 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 42f0483434..19f08791ca 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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 109e07a250..f9cdab0810 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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 d824493a7a..11b9190a4a 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 8e181ce467..62e1191f3a 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 74ba9bbf05..4444d6e0d9 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>          
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-endpoint</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
                
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 cc0803a9fc..7243922f9a 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 dbe94fb361..b24fd33a2a 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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 c72ca03e30..edb19134f5 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 51e7932f67..c30e9d98c7 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 6c8f57ec43..49a3801884 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 203c520214..c5cbb15a6c 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
    </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/modules/pom.xml b/sandbox/ant/sca/trunk/modules/pom.xml
index 90894d178e..1b7b380a0b 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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 0483ca34d7..dc730ef945 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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 4a63e796f3..502591794d 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 1cbc305cf8..93a55ede6a 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 ed0c37379f..2a9578ce63 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 9a1a1f27db..23ae83af78 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 4efb036205..f8fb08caef 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 4468a3d37d..58eddb6dee 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/pom.xml b/sandbox/ant/sca/trunk/pom.xml
index f189b5b504..6c0a7e906a 100644
--- a/sandbox/ant/sca/trunk/pom.xml
+++ b/sandbox/ant/sca/trunk/pom.xml
@@ -30,7 +30,7 @@
     <packaging>pom</packaging>
     <name>Apache Tuscany SCA Implementation Project (2.x)</name>
     <url>http://tuscany.apache.org</url>
-    <version>2.0-M4-SNAPSHOT</version>
+    <version>2.0-M5-SNAPSHOT</version>
 
     <scm>
         <connection>scm:svn:https://svn.apache.org/repos/asf/tuscany/sandbox/ant/sca/branches/tb2</connection>
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 2d7129fa71..6bce713d7a 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webservice</artifactId>
             <type>pom</type>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-ejava</artifactId>
             <type>pom</type>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 345048cb25..de007a71f6 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>   
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 41ae9e7c0e..172f91333a 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 039e7d0a74..1a542d9395 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 37c29138a4..42874a5bbb 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 9310e363ab..9b930d6315 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 55f3dd46ed..5de2eb976e 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 df95e6b89c..b5a70091f2 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/sandbox/ant/sca/trunk/samples/pom.xml b/sandbox/ant/sca/trunk/samples/pom.xml
index c1c0211f22..d5e5da5cec 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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 d707357f5c..7a3beb1845 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 00697ee263..d96d07fb4f 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-stripes</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-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 c0c6541223..8e5e188404 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-M4-SNAPSHOT</version>
+        <version>2.0-M5-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-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-M4-SNAPSHOT</version>
+            <version>2.0-M5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
author	antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>	2009-03-19 14:34:18 +0000
committer	antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>	2009-03-19 14:34:18 +0000
commit	eb0f1aa15d6f6cb9905f80d6f656b31cfe76d618 (patch)
tree	f3d8afb9c1c792d75c70dc4ce805a00f0807abdc /sandbox/ant
parent	b954869b2e22bc61d5dcde3457d9fea6e676b270 (diff)