21 files changed, 122 insertions, 122 deletions
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/assets/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/assets/pom.xml
index 3f05db1c8e..3252816380 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/assets/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/assets/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-assets</artifactId>
@@ -39,13 +39,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -74,7 +74,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-ejb/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-ejb/pom.xml
index bc79145f00..d31f5ff5c4 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-ejb/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-ejb/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-mediation/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-mediation/pom.xml
index ab15e56bf0..0ddffd3f92 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-mediation/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-mediation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-catalog-mediation</artifactId>
@@ -39,13 +39,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tutorial-assets</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tutorial-catalog-ejb</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -76,7 +76,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-webapp/pom.xml
index b5031b0360..e9097f44fe 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-catalog-webapp</artifactId>
@@ -40,27 +40,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tutorial-assets</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
@@ -95,7 +95,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/domain/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/domain/pom.xml
index 32cdd49ed0..10738dd78a 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/domain/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/domain/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-domain</artifactId>
@@ -39,138 +39,138 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime-tuscany</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>    
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-js</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-js</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jms-asf</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -221,7 +221,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/pom.xml
index 36c7bf6d00..ea27cbacab 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorials</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-tutorial-store</artifactId>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-client/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-client/pom.xml
index cecdaab79b..b1499a014b 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-client/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-client</artifactId>
@@ -39,52 +39,52 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
@@ -108,7 +108,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-db/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-db/pom.xml
index e007c73a49..ae6c5f1012 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-db/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-db/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-db</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/build.xml
index d76185d010..adac2185c8 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/build.xml
@@ -46,7 +46,7 @@
     </target>
 
     <fileset id="tuscany.jars" dir="../../../modules">
-        <include name="tuscany-sca-api-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-1.6.1-SNAPSHOT.jar"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../../lib">
     </fileset>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/pom.xml
index 2e4e8d56ea..c86c6a8eb9 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-enterprise</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-eu/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-eu/pom.xml
index 92ab93ea08..18f6ed5128 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-eu/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-eu/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-eu</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-market/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-market/build.xml
index dc64e9500b..ebf9937f6c 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-market/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-market/build.xml
@@ -46,7 +46,7 @@
     </target>
 
     <fileset id="tuscany.jars" dir="../../../modules">
-        <include name="tuscany-sca-api-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-1.6.1-SNAPSHOT.jar"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../../lib">
     </fileset>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-market/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-market/pom.xml
index a3fb62dfa4..bb7517963d 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-market/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-market/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-market</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-mashup/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-mashup/pom.xml
index e936f0a9e3..e24295e804 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-mashup/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-mashup/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-mashup</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-merger/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-merger/pom.xml
index ab9fc41fa2..b1029cb4a2 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-merger/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-merger/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-merger</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-supplier/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-supplier/pom.xml
index 6c16395193..af4e2560f1 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-supplier/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-supplier/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-supplier</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/pom.xml
index b8543a8ff1..f335e8e05c 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-test</artifactId>
@@ -39,122 +39,122 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime-tuscany</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-jee-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
@@ -175,7 +175,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tutorial-store-supplier</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -200,7 +200,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store/pom.xml
index 521ddf6c2e..15f4665ada 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/warehouse-spring/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/warehouse-spring/build.xml
index b2a1387dab..318c662767 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/warehouse-spring/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/warehouse-spring/build.xml
@@ -46,24 +46,24 @@
     </target>
 
     <fileset id="tuscany.jars" dir="../../../modules">
-        <include name="tuscany-assembly-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-assembly-xml-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-jms-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-java-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-namespace-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-core-spi-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-data-api-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-extensibility-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-java-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-monitor-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-sca-api-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-sca-api-extension-1.6-SNAPSHOT.jar"/>
-        <include name="tutorial-assets-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xml-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-jms-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-java-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-namespace-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-core-spi-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-data-api-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-extensibility-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-monitor-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-1.6.1-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-extension-1.6.1-SNAPSHOT.jar"/>
+        <include name="tutorial-assets-1.6.1-SNAPSHOT.jar"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../../lib">
         <include name="derby-10.3.1.4.jar"/>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/warehouse-spring/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/warehouse-spring/pom.xml
index 939d3b24bc..2753f300f7 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/warehouse-spring/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/warehouse-spring/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-warehouse-spring</artifactId>
@@ -39,25 +39,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tutorial-assets</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -80,7 +80,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/web-services/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/web-services/pom.xml
index beedfd27ff..0332220c19 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/web-services/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/web-services/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial-store</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-web-services</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>