Tag for 2.0-Beta1-RC2

git-svn-id: https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/tags/2.0-Beta1-RC2@1030026 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/distribution/aggregations/base-runtime-aggregation/pom.xml b/distribution/aggregations/base-runtime-aggregation/pom.xml
index 399bc31..3af8c71 100644
--- a/distribution/aggregations/base-runtime-aggregation/pom.xml
+++ b/distribution/aggregations/base-runtime-aggregation/pom.xml
@@ -1,171 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-distribution</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-

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

-    <artifactId>tuscany-base-runtime-aggregation</artifactId>

-    <name>Apache Tuscany SCA Base Runtime Aggregation</name>

-

-    <properties>

-      <bundle-symbolic-name>${project.groupId}.${artifactId}</bundle-symbolic-name>

-    </properties>

-

-

-    <!-- 

-         The dependencies required to run the Assembly otests minus the web service 

-         binding (which is only required by the otest framework). Provides a minimum

-         set of function for running composites using implementation.java and local 

-         wiring. Other extensions can be added to this base when required 

-    -->

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-base-runtime-pom</artifactId>

-            <version>${pom.version}</version>

-            <type>pom</type>

-            <optional>true</optional>

-            <exclusions>

-                <exclusion>

-                    <groupId>javax.servlet</groupId>

-                    <artifactId>servlet-api</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-    </dependencies>

-

-    <build>

-        <plugins>

-

-<!-- shades plugin but not worrying about manifests for the time being -->

-

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-shade-plugin</artifactId>

-                <version>1.3.2</version>

-                <executions>

-                    <execution>

-                        <phase>package</phase>

-                        <goals>

-                            <goal>shade</goal>

-                        </goals>

-                        <configuration>

-                           <createSourcesJar>true</createSourcesJar>

-                           <transformers>

-                              <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>

-                           </transformers>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-

-<!-- 

-   various different approaches to the problem of building aggregate jars

-   leaving here for reference while the build settles down

--->

-

-<!-- Our bundle plugin aggregation function

-     1/ it relies on generating the modules directory (which is not such a big deal)

-     2/ it generates a bundle with contains jars and a bundle classpath so is not jse friendly. 

-            <plugin>

-                <groupId>org.apache.tuscany.maven.plugins</groupId> 

-                <artifactId>maven-bundle-plugin</artifactId> 

-                <version>1.0.7-SNAPSHOT</version>

-                <executions>

-                    <execution>

-                        <id>distribution-modules</id>

-                        <phase>generate-resources</phase>

-                        <goals>

-                             <goal>generate-modules</goal>

-                        </goals>

-                        <configuration>

-                             <targetDirectory>target/modules</targetDirectory>

-                        </configuration>

-                    </execution>

-                    <execution>

-                        <id>aggregate</id>

-                        <phase>process-resources</phase>

-                        <goals>

-                             <goal>aggregate-modules</goal>

-                        </goals>

-                    </execution>

-                </executions>

-           </plugin>

--->

-

-<!-- Using the bundle plugin etc.

-     Unpack doesn't work with pom dependencies

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-dependency-plugin</artifactId>

-                <executions>

-

-                    <execution>

-                        <id>unpack-dependencies</id>

-                        <goals>

-                            <goal>unpack-dependencies</goal>

-                        </goals>

-                        <configuration>

-                            <outputDirectory>${project.build.directory}/classes</outputDirectory>

-                            <overWriteReleases>false</overWriteReleases>

-                            <overWriteSnapshots>true</overWriteSnapshots>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <artifactId>maven-jar-plugin</artifactId>

-                <configuration>

-                    <archive>

-                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>

-                    </archive>

-                </configuration>

-            </plugin>

-            <plugin>

-                <groupId>org.apache.felix</groupId>

-                <artifactId>maven-bundle-plugin</artifactId>

-

-                <extensions>true</extensions>

-                <executions>

-                    <execution>

-                        <id>bundle-manifest</id>

-                        <phase>process-classes</phase>

-                        <goals>

-                            <goal>manifest</goal>

-                        </goals>

-                    </execution>

-                </executions>

-                <configuration>

-                    <instructions>

-                        <Bundle-RequiredExecutionEnvironment>J2SE-1.6</Bundle-RequiredExecutionEnvironment>

-                    </instructions>

-                </configuration>

-            </plugin>

--->

-        </plugins>

-    </build>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-distribution</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.tuscany.sca.aggregation</groupId>
+    <artifactId>tuscany-base-runtime-aggregation</artifactId>
+    <name>Apache Tuscany SCA Base Runtime Aggregation</name>
+
+    <properties>
+      <bundle-symbolic-name>${project.groupId}.${artifactId}</bundle-symbolic-name>
+    </properties>
+
+
+    <!-- 
+         The dependencies required to run the Assembly otests minus the web service 
+         binding (which is only required by the otest framework). Provides a minimum
+         set of function for running composites using implementation.java and local 
+         wiring. Other extensions can be added to this base when required 
+    -->
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-base-runtime-pom</artifactId>
+            <version>${pom.version}</version>
+            <type>pom</type>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+
+<!-- shades plugin but not worrying about manifests for the time being -->
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>1.3.2</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                           <createSourcesJar>true</createSourcesJar>
+                           <transformers>
+                              <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                           </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+<!-- 
+   various different approaches to the problem of building aggregate jars
+   leaving here for reference while the build settles down
+-->
+
+<!-- Our bundle plugin aggregation function
+     1/ it relies on generating the modules directory (which is not such a big deal)
+     2/ it generates a bundle with contains jars and a bundle classpath so is not jse friendly. 
+            <plugin>
+                <groupId>org.apache.tuscany.maven.plugins</groupId> 
+                <artifactId>maven-bundle-plugin</artifactId> 
+                <version>1.0.7-SNAPSHOT</version>
+                <executions>
+                    <execution>
+                        <id>distribution-modules</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                             <goal>generate-modules</goal>
+                        </goals>
+                        <configuration>
+                             <targetDirectory>target/modules</targetDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>aggregate</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                             <goal>aggregate-modules</goal>
+                        </goals>
+                    </execution>
+                </executions>
+           </plugin>
+-->
+
+<!-- Using the bundle plugin etc.
+     Unpack doesn't work with pom dependencies
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+
+                    <execution>
+                        <id>unpack-dependencies</id>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+
+                <extensions>true</extensions>
+                <executions>
+                    <execution>
+                        <id>bundle-manifest</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>manifest</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <instructions>
+                        <Bundle-RequiredExecutionEnvironment>J2SE-1.6</Bundle-RequiredExecutionEnvironment>
+                    </instructions>
+                </configuration>
+            </plugin>
+-->
+        </plugins>
+    </build>
+
+</project>
diff --git a/distribution/aggregations/base-runtime-nodep/pom.xml b/distribution/aggregations/base-runtime-nodep/pom.xml
index 88e828d..2993d24 100644
--- a/distribution/aggregations/base-runtime-nodep/pom.xml
+++ b/distribution/aggregations/base-runtime-nodep/pom.xml
@@ -1,121 +1,121 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-distribution</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-

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

-    <artifactId>tuscany-base-runtime-nodep</artifactId>

-    <name>Apache Tuscany SCA Base Runtime Jar including dependencies</name>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-base-runtime</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>jline</groupId>

-            <artifactId>jline</artifactId>

-            <version>0.9.94</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>junit</groupId>

-                    <artifactId>junit</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <!-- Tuscany uses java.util.logging but extensions and dependencies may use 

-             log4j, commons-logging, slf4j, or java.util.logging. So inlcude slf4j 

-             modules for all of those that delegate to java.util.logging. This should

-             mean there's no need for any other logging jars and no conflicts on

-             logging verisons as those are handled transparently by slf4j, and, 

-             everything uses and can be configured just with java.util.logging.

-

-        <dependency>

-            <groupId>org.slf4j</groupId>

-            <artifactId>slf4j-api</artifactId>

-            <version>1.6.0</version>

-        </dependency>

-        <dependency>

-            <groupId>org.slf4j</groupId>

-            <artifactId>jcl-over-slf4j</artifactId>

-            <version>1.6.0</version>

-        </dependency>

-        <dependency>

-            <groupId>org.slf4j</groupId>

-            <artifactId>log4j-over-slf4j</artifactId>

-            <version>1.6.0</version>

-        </dependency>

-        <dependency>

-            <groupId>org.slf4j</groupId>

-            <artifactId>slf4j-jdk14</artifactId>

-            <version>1.6.0</version>

-        </dependency>

-        -->

-

-        <dependency>

-            <groupId>org.eclipse</groupId>

-            <artifactId>osgi</artifactId>

-            <version>3.5.0-v20090520</version>

-            <scope>provided</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-        <plugins>

-           <plugin>

-              <groupId>org.apache.maven.plugins</groupId>

-              <artifactId>maven-jar-plugin</artifactId>

-              <configuration>

-                 <archive>

-                    <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>

-                 </archive>

-              </configuration>

-            </plugin>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-shade-plugin</artifactId>

-                <version>1.3.2</version>

-                <executions>

-                    <execution>

-                        <phase>package</phase>

-                        <goals>

-                            <goal>shade</goal>

-                        </goals>

-                        <configuration>

-                           <createSourcesJar>true</createSourcesJar>

-                           <transformers>

-                              <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>

-                           </transformers>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-        </plugins>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-distribution</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.tuscany.sca</groupId>
+    <artifactId>tuscany-base-runtime-nodep</artifactId>
+    <name>Apache Tuscany SCA Base Runtime Jar including dependencies</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-base-runtime</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>jline</groupId>
+            <artifactId>jline</artifactId>
+            <version>0.9.94</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- Tuscany uses java.util.logging but extensions and dependencies may use 
+             log4j, commons-logging, slf4j, or java.util.logging. So inlcude slf4j 
+             modules for all of those that delegate to java.util.logging. This should
+             mean there's no need for any other logging jars and no conflicts on
+             logging verisons as those are handled transparently by slf4j, and, 
+             everything uses and can be configured just with java.util.logging.
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.6.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>1.6.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>log4j-over-slf4j</artifactId>
+            <version>1.6.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <version>1.6.0</version>
+        </dependency>
+        -->
+
+        <dependency>
+            <groupId>org.eclipse</groupId>
+            <artifactId>osgi</artifactId>
+            <version>3.5.0-v20090520</version>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+           <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-jar-plugin</artifactId>
+              <configuration>
+                 <archive>
+                    <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+                 </archive>
+              </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>1.3.2</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                           <createSourcesJar>true</createSourcesJar>
+                           <transformers>
+                              <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                           </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/distribution/aggregations/base-runtime/pom.xml b/distribution/aggregations/base-runtime/pom.xml
index f5e84f4..bb6296c 100644
--- a/distribution/aggregations/base-runtime/pom.xml
+++ b/distribution/aggregations/base-runtime/pom.xml
@@ -1,329 +1,329 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-distribution</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-

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

-    <artifactId>tuscany-base-runtime</artifactId>

-    <name>Apache Tuscany SCA Base Runtime Jar</name>

-

-    <dependencies>

-

-        <dependency>

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

-            <artifactId>tuscany-domain-node</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-launcher</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-sca-client-impl</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

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

-            <version>${pom.version}</version>

-            <exclusions>

-                <exclusion>

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

-                    <artifactId>tuscany-core-spi</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>org.mortbay.jetty</groupId>

-                    <artifactId>jetty</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>org.mortbay.jetty</groupId>

-                    <artifactId>jetty-util</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>javax.servlet</groupId>

-                    <artifactId>servlet-api</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-shell</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-stripes</artifactId>

-            <version>${pom.version}</version>

-            <exclusions>

-                <exclusion>

-                   <groupId>net.sourceforge.stripes</groupId>

-                   <artifactId>stripes</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-wink</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-runtime-jaxws-ri</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-data-api</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-

-<!-- All the scdl modules  -->

-

-        <dependency>

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

-            <artifactId>tuscany-binding-atom</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-binding-comet</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-binding-ejb</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-binding-jsonp</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-binding-rest</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-        <!-- dependency>

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

-            <artifactId>tuscany-implementation-jaxrs</artifactId>

-            <version>${pom.version}</version>

-        </dependency -->

-        <dependency>

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

-            <artifactId>tuscany-implementation-script</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-implementation-spring</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-implementation-widget</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-<!-- these remaining dependencies are not required when using JDK6, so use a scope of provided  -->

-

-        <dependency>

-            <groupId>org.apache.geronimo.specs</groupId>

-            <artifactId>geronimo-stax-api_1.0_spec</artifactId>

-            <version>1.0.1</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.codehaus.woodstox</groupId>

-            <artifactId>wstx-asl</artifactId>

-            <version>3.2.4</version>

-            <scope>provided</scope>

-            <exclusions>

-                <exclusion>

-                    <groupId>stax</groupId>

-                    <artifactId>stax-api</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>javax.xml.bind</groupId>

-            <artifactId>jaxb-api</artifactId>

-            <version>2.1</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>javax.activation</groupId>

-            <artifactId>activation</artifactId>

-            <version>1.1</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>com.sun.xml.bind</groupId>

-            <artifactId>jaxb-impl</artifactId>

-            <version>2.1.12</version>

-            <scope>provided</scope>

-        </dependency>

-

-

-        <dependency>

-            <groupId>javax.xml.ws</groupId>

-            <artifactId>jaxws-api</artifactId>

-            <version>2.1</version>

-            <scope>provided</scope>

-            <exclusions>

-                <exclusion>

-                    <groupId>javax.xml.soap</groupId>

-                    <artifactId>saaj-api</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>javax.annotation</groupId>

-            <artifactId>jsr250-api</artifactId>

-            <version>1.0</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>javax.jws</groupId>

-            <artifactId>jsr181-api</artifactId>

-            <version>1.0-MR1</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>javax.xml.stream</groupId>

-            <artifactId>stax-api</artifactId>

-            <version>1.0-2</version>

-            <scope>provided</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-shade-plugin</artifactId>

-                <version>1.3.2</version>

-                <executions>

-                    <execution>

-                        <phase>package</phase>

-                        <goals>

-                            <goal>shade</goal>

-                        </goals>

-                        <configuration>

-                           <createSourcesJar>true</createSourcesJar>

-                           <promoteTransitiveDependencies>true</promoteTransitiveDependencies>

-                           <artifactSet>

-                              <includes>

-                                 <include>org.apache.tuscany.sca:*</include>

-                              </includes>

-                           </artifactSet>

-                           <transformers>

-                              <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>

-                              <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">

-                                 <manifestEntries>

-                                    <Main-Class>org.apache.tuscany.sca.launcher.LauncherMain</Main-Class>

-                                 </manifestEntries>

-                              </transformer> 

-                           </transformers>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-        </plugins>

-    </build>

-</project>

-

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-distribution</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.tuscany.sca</groupId>
+    <artifactId>tuscany-base-runtime</artifactId>
+    <name>Apache Tuscany SCA Base Runtime Jar</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-domain-node</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-web-runtime</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-launcher</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-client-impl</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>${pom.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.tuscany.sca</groupId>
+                    <artifactId>tuscany-core-spi</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>jetty</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>jetty-util</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-shell</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-stripes</artifactId>
+            <version>${pom.version}</version>
+            <exclusions>
+                <exclusion>
+                   <groupId>net.sourceforge.stripes</groupId>
+                   <artifactId>stripes</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-wink</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-runtime-jaxws-ri</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-data-api</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy-security</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+<!-- All the scdl modules  -->
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-atom</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-comet</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-corba</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ejb</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-http</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jsonp</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jsonrpc</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-rest</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-rmi</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-bpel</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <!-- dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-jaxrs</artifactId>
+            <version>${pom.version}</version>
+        </dependency -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-script</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-spring</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-web</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-widget</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+<!-- these remaining dependencies are not required when using JDK6, so use a scope of provided  -->
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+            <version>1.0.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.codehaus.woodstox</groupId>
+            <artifactId>wstx-asl</artifactId>
+            <version>3.2.4</version>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>1.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.1.12</version>
+            <scope>provided</scope>
+        </dependency>
+
+
+        <dependency>
+            <groupId>javax.xml.ws</groupId>
+            <artifactId>jaxws-api</artifactId>
+            <version>2.1</version>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.xml.soap</groupId>
+                    <artifactId>saaj-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>jsr250-api</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.jws</groupId>
+            <artifactId>jsr181-api</artifactId>
+            <version>1.0-MR1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.xml.stream</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>1.0-2</version>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>1.3.2</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                           <createSourcesJar>true</createSourcesJar>
+                           <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                           <artifactSet>
+                              <includes>
+                                 <include>org.apache.tuscany.sca:*</include>
+                              </includes>
+                           </artifactSet>
+                           <transformers>
+                              <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                              <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                 <manifestEntries>
+                                    <Main-Class>org.apache.tuscany.sca.launcher.LauncherMain</Main-Class>
+                                 </manifestEntries>
+                              </transformer> 
+                           </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
+
diff --git a/distribution/aggregations/binding-rmi-runtime-aggregation/pom.xml b/distribution/aggregations/binding-rmi-runtime-aggregation/pom.xml
index 9c9bd0f..e650b17 100644
--- a/distribution/aggregations/binding-rmi-runtime-aggregation/pom.xml
+++ b/distribution/aggregations/binding-rmi-runtime-aggregation/pom.xml
@@ -1,70 +1,70 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-distribution</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-

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

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

-    <name>Apache Tuscany SCA Binding RMI Runtime Aggregation</name>

-

-    <dependencies>

-        <dependency>

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

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

-            <version>${pom.version}</version>

-            <optional>true</optional>

-        </dependency>

-    </dependencies>

-

-    <build>

-        <plugins>

-

-<!-- shades plugin but not worrying about manifests for the time being -->

-

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-shade-plugin</artifactId>

-                <version>1.3.2</version>

-                <executions>

-                    <execution>

-                        <phase>package</phase>

-                        <goals>

-                            <goal>shade</goal>

-                        </goals>

-                        <configuration>

-                           <createSourcesJar>true</createSourcesJar>

-                           <transformers>

-                              <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>

-                           </transformers>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-

-        </plugins>

-    </build>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-distribution</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.tuscany.sca.aggregation</groupId>
+    <artifactId>tuscany-binding-rmi-runtime-aggregation</artifactId>
+    <name>Apache Tuscany SCA Binding RMI Runtime Aggregation</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-rmi-runtime</artifactId>
+            <version>${pom.version}</version>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+
+<!-- shades plugin but not worrying about manifests for the time being -->
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>1.3.2</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                           <createSourcesJar>true</createSourcesJar>
+                           <transformers>
+                              <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                           </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+
+</project>
diff --git a/distribution/aggregations/binding-ws-runtime-axis2-aggregation/pom.xml b/distribution/aggregations/binding-ws-runtime-axis2-aggregation/pom.xml
index ada43e8..70fb07b 100644
--- a/distribution/aggregations/binding-ws-runtime-axis2-aggregation/pom.xml
+++ b/distribution/aggregations/binding-ws-runtime-axis2-aggregation/pom.xml
@@ -1,70 +1,70 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-distribution</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-

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

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

-    <name>Apache Tuscany SCA Binding WS Runtime Axis2 Aggregation</name>

-

-    <dependencies>

-        <dependency>

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

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

-            <version>${pom.version}</version>

-            <optional>true</optional>

-        </dependency>

-    </dependencies>

-

-    <build>

-        <plugins>

-

-<!-- shades plugin but not worrying about manifests for the time being -->

-

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-shade-plugin</artifactId>

-                <version>1.3.2</version>

-                <executions>

-                    <execution>

-                        <phase>package</phase>

-                        <goals>

-                            <goal>shade</goal>

-                        </goals>

-                        <configuration>

-                           <createSourcesJar>true</createSourcesJar>

-                           <transformers>

-                              <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>

-                           </transformers>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-

-        </plugins>

-    </build>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-distribution</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.tuscany.sca.aggregation</groupId>
+    <artifactId>tuscany-binding-ws-runtime-axis2-aggregation</artifactId>
+    <name>Apache Tuscany SCA Binding WS Runtime Axis2 Aggregation</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
+            <version>${pom.version}</version>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+
+<!-- shades plugin but not worrying about manifests for the time being -->
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>1.3.2</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                           <createSourcesJar>true</createSourcesJar>
+                           <transformers>
+                              <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                           </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+
+</project>
diff --git a/distribution/all/pom.xml b/distribution/all/pom.xml
index aa03dd2..3369aae 100644
--- a/distribution/all/pom.xml
+++ b/distribution/all/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -38,7 +38,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-all</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- aggregation jars for lib directory -->
@@ -46,19 +46,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca.aggregation</groupId>
             <artifactId>tuscany-base-runtime-aggregation</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca.aggregation</groupId>
             <artifactId>tuscany-binding-rmi-runtime-aggregation</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca.aggregation</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2-aggregation</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
     </dependencies>
@@ -252,116 +252,116 @@
                                  <feature>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-base-runtime-pom</artifactId>
-                                     <version>2.0-Beta1-SNAPSHOT</version>
+                                     <version>2.0-Beta1</version>
                                  </feature>
                              </features>
                              <extensions>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-atom-runtime</artifactId>
-                                     <version>2.0-Beta1-SNAPSHOT</version>
+                                     <version>2.0-Beta1</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-commet-runtime</artifactId>
-                                     <version>2.0-Beta1-SNAPSHOT</version>
+                                     <version>2.0-Beta1</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-corba-runtime</artifactId>
-                                     <version>2.0-Beta1-SNAPSHOT</version>
+                                     <version>2.0-Beta1</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-ejb-runtime</artifactId>
-                                     <version>2.0-Beta1-SNAPSHOT</version>
+                                     <version>2.0-Beta1</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-hazelcase-runtime</artifactId>
-                                     <version>2.0-Beta1-SNAPSHOT</version>
+                                     <version>2.0-Beta1</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-jms-runtime</artifactId>
-                                     <version>2.0-Beta1-SNAPSHOT</version>
+                                     <version>2.0-Beta1</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-jsonp-runtime</artifactId>
-                                     <version>2.0-Beta1-SNAPSHOT</version>
+                                     <version>2.0-Beta1</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-                                     <version>2.0-Beta1-SNAPSHOT</version>
+                                     <version>2.0-Beta1</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-rest-runtime</artifactId>
-                                     <version>2.0-Beta1-SNAPSHOT</version>
+                                     <version>2.0-Beta1</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-rmi-runtime</artifactId>
-                                     <version>2.0-Beta1-SNAPSHOT</version>
+                                     <version>2.0-Beta1</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-rss-runtime</artifactId>
-                                     <version>2.0-Beta1-SNAPSHOT</version>
+                                     <version>2.0-Beta1</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-                                     <version>2.0-Beta1-SNAPSHOT</version>
+                                     <version>2.0-Beta1</version>
                                  </extension>
 
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-implementation-bpel-runtime</artifactId>
-                                     <version>2.0-Beta1-SNAPSHOT</version>
+                                     <version>2.0-Beta1</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-implementation-jaxes-runtime</artifactId>
-                                     <version>2.0-Beta1-SNAPSHOT</version>
+                                     <version>2.0-Beta1</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-implementation-osgi-runtime</artifactId>
-                                     <version>2.0-Beta1-SNAPSHOT</version>
+                                     <version>2.0-Beta1</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-implementation-python-runtime</artifactId>
-                                     <version>2.0-Beta1-SNAPSHOT</version>
+                                     <version>2.0-Beta1</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-implementation-script-runtime</artifactId>
-                                     <version>2.0-Beta1-SNAPSHOT</version>
+                                     <version>2.0-Beta1</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-implementation-spring-runtime</artifactId>
-                                     <version>2.0-Beta1-SNAPSHOT</version>
+                                     <version>2.0-Beta1</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-implementation-web-runtime</artifactId>
-                                     <version>2.0-Beta1-SNAPSHOT</version>
+                                     <version>2.0-Beta1</version>
                                  </extension>
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-implementation-widget-runtime</artifactId>
-                                     <version>2.0-Beta1-SNAPSHOT</version>
+                                     <version>2.0-Beta1</version>
                                  </extension>
 
                                  <extension>
                                      <groupId>org.apache.tuscany.sca</groupId>
                                      <artifactId>tuscany-host-jetty</artifactId>
-                                     <version>2.0-Beta1-SNAPSHOT</version>
+                                     <version>2.0-Beta1</version>
                                  </extension>
                              </extensions>
                             <artifactManifests>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 8965ec3..1153d8d 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
     </parent>
     <groupId>org.apache.tuscany.sca</groupId>
     <artifactId>tuscany-distribution</artifactId>
diff --git a/distribution/tomcat/pom.xml b/distribution/tomcat/pom.xml
index e8ee11d..564fb68 100644
--- a/distribution/tomcat/pom.xml
+++ b/distribution/tomcat/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
     </parent>
     <groupId>org.apache.tuscany.sca</groupId>
     <artifactId>tuscany-distribution-tomcat</artifactId>
diff --git a/distribution/tomcat/testing/download-tomcat/pom.xml b/distribution/tomcat/testing/download-tomcat/pom.xml
index 579c486..24013c0 100644
--- a/distribution/tomcat/testing/download-tomcat/pom.xml
+++ b/distribution/tomcat/testing/download-tomcat/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution-tomcat-testing</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/distribution/tomcat/testing/helloworld-client-webapp/pom.xml b/distribution/tomcat/testing/helloworld-client-webapp/pom.xml
index 233c275..c1b6d19 100644
--- a/distribution/tomcat/testing/helloworld-client-webapp/pom.xml
+++ b/distribution/tomcat/testing/helloworld-client-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution-tomcat-testing</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/distribution/tomcat/testing/helloworld-reference-contribution/pom.xml b/distribution/tomcat/testing/helloworld-reference-contribution/pom.xml
index 0b5b0c7..c2ca0a2 100644
--- a/distribution/tomcat/testing/helloworld-reference-contribution/pom.xml
+++ b/distribution/tomcat/testing/helloworld-reference-contribution/pom.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

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

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

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

-    * 

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

-    * 

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

-    * software distributed under the License is distributed on an

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

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

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-distribution-tomcat-testing</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-

-    <artifactId>helloworld-reference-contribution</artifactId>

-    <name>Apache Tuscany SCA Tomcat Integration Testing Helloworld Reference Contribution</name>

-

-    <dependencies>

-        <dependency>

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

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

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>provided</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

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

-   </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-distribution-tomcat-testing</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>helloworld-reference-contribution</artifactId>
+    <name>Apache Tuscany SCA Tomcat Integration Testing Helloworld Reference Contribution</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+   </build>
+</project>
diff --git a/distribution/tomcat/testing/helloworld-scaclient-jsp/pom.xml b/distribution/tomcat/testing/helloworld-scaclient-jsp/pom.xml
index e517c81..1d93aa2 100644
--- a/distribution/tomcat/testing/helloworld-scaclient-jsp/pom.xml
+++ b/distribution/tomcat/testing/helloworld-scaclient-jsp/pom.xml
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-distribution-tomcat-testing</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-

-    <artifactId>helloworld-scaclient-jsp</artifactId>

-    <packaging>war</packaging>

-    <name>Apache Tuscany SCA Tomcat Integration Testing Helloworld Webapp Using SCAClient in a JSP</name>

-

-    <dependencies>

-        <dependency>

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

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

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>provided</scope>

-        </dependency>

-    </dependencies>

-

-    <build>

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

-   </build>

-

-</project>

-

-

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-distribution-tomcat-testing</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>helloworld-scaclient-jsp</artifactId>
+    <packaging>war</packaging>
+    <name>Apache Tuscany SCA Tomcat Integration Testing Helloworld Webapp Using SCAClient in a JSP</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+   </build>
+
+</project>
+
+
diff --git a/distribution/tomcat/testing/helloworld-scaclient-servlet/pom.xml b/distribution/tomcat/testing/helloworld-scaclient-servlet/pom.xml
index 75336d0..485e491 100644
--- a/distribution/tomcat/testing/helloworld-scaclient-servlet/pom.xml
+++ b/distribution/tomcat/testing/helloworld-scaclient-servlet/pom.xml
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-distribution-tomcat-testing</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-

-    <artifactId>helloworld-scaclient-servlet</artifactId>

-    <packaging>war</packaging>

-    <name>Apache Tuscany SCA Tomcat Integration Testing Helloworld Webapp Using SCAClient in a Servlet</name>

-

-    <dependencies>

-        <dependency>

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

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

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>provided</scope>

-        </dependency>

-        <dependency>

-            <groupId>javax.servlet</groupId>

-            <artifactId>servlet-api</artifactId>

-            <version>2.5</version>

-            <scope>provided</scope>

-        </dependency>

-    </dependencies>

-

-    <build>

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

-   </build>

-

-</project>

-

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-distribution-tomcat-testing</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>helloworld-scaclient-servlet</artifactId>
+    <packaging>war</packaging>
+    <name>Apache Tuscany SCA Tomcat Integration Testing Helloworld Webapp Using SCAClient in a Servlet</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+   </build>
+
+</project>
+
diff --git a/distribution/tomcat/testing/helloworld-service-contribution/pom.xml b/distribution/tomcat/testing/helloworld-service-contribution/pom.xml
index 2eccccd..09cd8fe 100644
--- a/distribution/tomcat/testing/helloworld-service-contribution/pom.xml
+++ b/distribution/tomcat/testing/helloworld-service-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution-tomcat-testing</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/distribution/tomcat/testing/legal-checks/pom.xml b/distribution/tomcat/testing/legal-checks/pom.xml
index 9f334bc..4bffcf3 100644
--- a/distribution/tomcat/testing/legal-checks/pom.xml
+++ b/distribution/tomcat/testing/legal-checks/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution-tomcat-testing</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>war-legal-checks</artifactId>
diff --git a/distribution/tomcat/testing/pom.xml b/distribution/tomcat/testing/pom.xml
index 7c06069..0bd1b45 100644
--- a/distribution/tomcat/testing/pom.xml
+++ b/distribution/tomcat/testing/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution-tomcat</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
     </parent>
     <groupId>org.apache.tuscany.sca</groupId>
     <artifactId>tuscany-distribution-tomcat-testing</artifactId>
diff --git a/distribution/tomcat/tomcat-hook/pom.xml b/distribution/tomcat/tomcat-hook/pom.xml
index 5b050a1..39f2a13 100644
--- a/distribution/tomcat/tomcat-hook/pom.xml
+++ b/distribution/tomcat/tomcat-hook/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/distribution/tomcat/tomcat-servlet/pom.xml b/distribution/tomcat/tomcat-servlet/pom.xml
index 935a565..ee471e4 100644
--- a/distribution/tomcat/tomcat-servlet/pom.xml
+++ b/distribution/tomcat/tomcat-servlet/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,14 +34,14 @@
         <dependency>
            <groupId>org.apache.tuscany.sca</groupId>
            <artifactId>tuscany-tomcat-hook</artifactId>
-           <version>2.0-Beta1-SNAPSHOT</version>
+           <version>2.0-Beta1</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
            <groupId>org.apache.tuscany.sca</groupId>
            <artifactId>tuscany-node-api</artifactId>
-           <version>2.0-Beta1-SNAPSHOT</version>
+           <version>2.0-Beta1</version>
            <scope>provided</scope>
         </dependency>
 
diff --git a/distribution/tomcat/tomcat-war/pom.xml b/distribution/tomcat/tomcat-war/pom.xml
index e4e7897..72743b1 100644
--- a/distribution/tomcat/tomcat-war/pom.xml
+++ b/distribution/tomcat/tomcat-war/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -39,17 +39,17 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-tomcat-servlet</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-tomcat-hook</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
     </dependencies>
 
diff --git a/features/all/pom.xml b/features/all/pom.xml
index d9d5b86..1829b4b 100644
--- a/features/all/pom.xml
+++ b/features/all/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -42,75 +42,75 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-api</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webservice</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-web20</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-ejava</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-osgi</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-sdo</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webapp</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-process</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-launcher</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-tracing-aspectj</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 -->
 
@@ -119,21 +119,21 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-osgi-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- binding extensions -->
@@ -141,83 +141,83 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-js-dojo</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-comet-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-corba-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <!-- for now til the base contents is sorted -->
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonp-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-js-dojo</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rest-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- implementation extensions -->
@@ -225,60 +225,60 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-jaxrs-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-python-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-script-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-client</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime-dojo</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- policy extensions -->
@@ -286,13 +286,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-logging</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-transaction-runtime-geronimo</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- databinding extensions -->
@@ -300,13 +300,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo-axiom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- host extensions -->
@@ -314,25 +314,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba-jee</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba-jse</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba-jse-tns</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- registry extensions -->
@@ -340,13 +340,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-hazelcast</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-endpoint-tribes</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- utilities -->
@@ -354,37 +354,37 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-launcher</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-node</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-myfaces</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-shell</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-stripes</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-tracing-aspectj</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <!-- test dependency of tuscany-tracing-aspectj but previously included in the distro? -->
         <dependency>
diff --git a/features/api/pom.xml b/features/api/pom.xml
index 4382b3f..b134972 100644
--- a/features/api/pom.xml
+++ b/features/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -36,21 +36,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Data Collection API -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <!-- Node API -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
     </dependencies>
diff --git a/features/core/pom.xml b/features/core/pom.xml
index 959812c..3111527 100644
--- a/features/core/pom.xml
+++ b/features/core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- SCA API -->
@@ -43,13 +43,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 -->
 
@@ -57,150 +57,150 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Bindings -->
         <!--dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-corba-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency-->
 
         <!-- Contribution model -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Core runtime -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Databindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Data API -->
         <!--dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency-->
 
         <!-- Core Extensibility -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <!--  Hosts -->
         <!--dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba-jse</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency-->
         <!-- host-http is required by tuscany-implementation-node-runtime -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Implementation types -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Interface models -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-jaxws</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Node runtime -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-client-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-node</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <!--
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-webapp</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>war</type>
         </dependency>
         -->
@@ -209,32 +209,32 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <!-- Policy models -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <!--dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security-jsr250</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency-->
 
         <!-- XMLSchema support -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-shell</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
     </dependencies>
diff --git a/features/ejava/pom.xml b/features/ejava/pom.xml
index 46b4a6a..9bc1e02 100644
--- a/features/ejava/pom.xml
+++ b/features/ejava/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -37,55 +37,55 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Bindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 <!--
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-corba-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Hosts -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-rmi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba-jee</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba-jse</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba-jse-tns</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
 
@@ -94,38 +94,38 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- OSGi Remote Services SCA Configuration Type -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl-osgi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
@@ -137,33 +137,33 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-script-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-jaxrs-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Policies -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-transaction</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-transaction-runtime-geronimo</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Hazelcast registry -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-hazelcast</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
     </dependencies>
diff --git a/features/osgi/pom.xml b/features/osgi/pom.xml
index 3650718..7628515 100644
--- a/features/osgi/pom.xml
+++ b/features/osgi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Bindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
        <!-- WebService -->
@@ -52,14 +52,14 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webservice</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Hosts -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-rmi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Implementations -->
@@ -68,19 +68,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl-osgi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
@@ -92,7 +92,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-endpoint-tribes</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Policies -->
@@ -100,7 +100,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-transaction</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 -->
     </dependencies>
diff --git a/features/pom.xml b/features/pom.xml
index db47323..b13b918 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
     </parent>
     <groupId>org.apache.tuscany.sca</groupId>
     <artifactId>tuscany-feature</artifactId>
diff --git a/features/process/pom.xml b/features/process/pom.xml
index 47abac7..44f9a0d 100644
--- a/features/process/pom.xml
+++ b/features/process/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -37,19 +37,19 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- ODE BPEL -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
     </dependencies>
diff --git a/features/sdo/pom.xml b/features/sdo/pom.xml
index 89d2414..49a5121 100644
--- a/features/sdo/pom.xml
+++ b/features/sdo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
 
@@ -45,12 +45,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo-axiom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
     </dependencies>
diff --git a/features/web20/pom.xml b/features/web20/pom.xml
index 96ed241..70567a9 100644
--- a/features/web20/pom.xml
+++ b/features/web20/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,105 +35,105 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-api</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <!-- Core distribution -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Common -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-common-http</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Interface models -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-jaxrs</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>		
 
         <!-- Implementation Types -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime-dojo</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 		        
         <!-- Bindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-js-dojo</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rest-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonp</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-js-dojo</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Dojo and Dojo Extensions -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-web-javascript-dojo</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>                
 
         <!--Databindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-json</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <!-- Hosts -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/features/webapp/pom.xml b/features/webapp/pom.xml
index 8d5faed..d9f7feb 100644
--- a/features/webapp/pom.xml
+++ b/features/webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Explicitly list the servlet/jsp apis as "provided" dependencies are not transitive -->
@@ -67,26 +67,26 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-stripes</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-myfaces</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
 	  <!-- JSONP Binding material -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonp</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonp-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 	  <!-- end of JSONP Binding -->
 
diff --git a/features/webservice/pom.xml b/features/webservice/pom.xml
index 15857b4..bf3e1b4 100644
--- a/features/webservice/pom.xml
+++ b/features/webservice/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -37,19 +37,19 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Bindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.ant</groupId>
@@ -80,26 +80,26 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Databindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Hosts -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
     </dependencies>
diff --git a/maven/archetypes/binding/pom.xml b/maven/archetypes/binding/pom.xml
index 5877dfe..ec84b39 100644
--- a/maven/archetypes/binding/pom.xml
+++ b/maven/archetypes/binding/pom.xml
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-

-    <artifactId>tuscany-binding-archetype</artifactId>

-    <packaging>maven-archetype</packaging>

-    <name>Create a Tuscany binding extension project</name>

-    <description>Create a Tuscany binding extension project</description>

-

-    <build>

-       <extensions>

-          <extension>

-             <groupId>org.apache.maven.archetype</groupId>

-             <artifactId>archetype-packaging</artifactId>

-             <version>2.0-alpha-5</version>

-          </extension>

-       </extensions>

-

-       <pluginManagement>

-          <plugins>

-             <plugin>

-                <artifactId>maven-archetype-plugin</artifactId>

-                <version>2.0-alpha-5</version>

-               <extensions>true</extensions>

-             </plugin>

-          </plugins>

-       </pluginManagement>

-    </build>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>tuscany-binding-archetype</artifactId>
+    <packaging>maven-archetype</packaging>
+    <name>Create a Tuscany binding extension project</name>
+    <description>Create a Tuscany binding extension project</description>
+
+    <build>
+       <extensions>
+          <extension>
+             <groupId>org.apache.maven.archetype</groupId>
+             <artifactId>archetype-packaging</artifactId>
+             <version>2.0-alpha-5</version>
+          </extension>
+       </extensions>
+
+       <pluginManagement>
+          <plugins>
+             <plugin>
+                <artifactId>maven-archetype-plugin</artifactId>
+                <version>2.0-alpha-5</version>
+               <extensions>true</extensions>
+             </plugin>
+          </plugins>
+       </pluginManagement>
+    </build>
+
+</project>
diff --git a/maven/archetypes/binding/src/main/resources/archetype-resources/pom.xml b/maven/archetypes/binding/src/main/resources/archetype-resources/pom.xml
index 79cb9a9..6512a20 100644
--- a/maven/archetypes/binding/src/main/resources/archetype-resources/pom.xml
+++ b/maven/archetypes/binding/src/main/resources/archetype-resources/pom.xml
@@ -1,94 +1,94 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- *

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

- *

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-modules</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-

-    <artifactId>binding-${artifactId}</artifactId>

-    <groupId>${groupId}</groupId>

-    <version>${version}</version>

-    <name>Apache Tuscany SCA ${bindingName} Binding Extension</name>

-

-    <dependencies>

-

-        <dependency>

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

-            <artifactId>tuscany-assembly-xml</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-http</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>provided</scope>

-        </dependency>   

-                

-        <dependency>

-            <groupId>javax.servlet</groupId>

-            <artifactId>servlet-api</artifactId>

-            <version>2.5</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

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

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

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

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

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

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

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

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

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>    

-

-        <dependency>

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

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

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-modules</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>binding-${artifactId}</artifactId>
+    <groupId>${groupId}</groupId>
+    <version>${version}</version>
+    <name>Apache Tuscany SCA ${bindingName} Binding Extension</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly-xml</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-http</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>provided</scope>
+        </dependency>   
+                
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>test</scope>
+        </dependency>    
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/maven/archetypes/contribution-jar/pom.xml b/maven/archetypes/contribution-jar/pom.xml
index e56995e..148f8ff 100644
--- a/maven/archetypes/contribution-jar/pom.xml
+++ b/maven/archetypes/contribution-jar/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/maven/archetypes/contribution-zip-discriptor/pom.xml b/maven/archetypes/contribution-zip-discriptor/pom.xml
index 8e120e4..c9eb582 100644
--- a/maven/archetypes/contribution-zip-discriptor/pom.xml
+++ b/maven/archetypes/contribution-zip-discriptor/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/maven/archetypes/contribution-zip/pom.xml b/maven/archetypes/contribution-zip/pom.xml
index 4aead42..bb12360 100644
--- a/maven/archetypes/contribution-zip/pom.xml
+++ b/maven/archetypes/contribution-zip/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/maven/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml b/maven/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml
index d31bb3c..538cd80 100644
--- a/maven/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml
+++ b/maven/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml
@@ -147,7 +147,7 @@
         </plugins>
     </build>
     <properties>
-        <tuscany.version>2.0-Beta1-SNAPSHOT</tuscany.version>
+        <tuscany.version>2.0-Beta1</tuscany.version>
     </properties>
     #end
 </project>
diff --git a/maven/archetypes/pom.xml b/maven/archetypes/pom.xml
index cf79d60..9a892b0 100644
--- a/maven/archetypes/pom.xml
+++ b/maven/archetypes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-archetype</artifactId>
diff --git a/maven/archetypes/quickstart-bpel/pom.xml b/maven/archetypes/quickstart-bpel/pom.xml
index 9505fe2..1764913 100644
--- a/maven/archetypes/quickstart-bpel/pom.xml
+++ b/maven/archetypes/quickstart-bpel/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml b/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml
index 43626f0..020beeb 100644
--- a/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml
+++ b/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml
@@ -175,7 +175,7 @@
 		</plugins>
 	</build>
 	<properties>
-		<tuscany.version>2.0-Beta1-SNAPSHOT</tuscany.version>
+		<tuscany.version>2.0-Beta1</tuscany.version>
 		<jetty.version>6.1.18</jetty.version>
 	</properties>
 	#end
diff --git a/maven/archetypes/quickstart-jsf/pom.xml b/maven/archetypes/quickstart-jsf/pom.xml
index 85efe57..3b6c726 100644
--- a/maven/archetypes/quickstart-jsf/pom.xml
+++ b/maven/archetypes/quickstart-jsf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml b/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml
index 065ebcb..103653e 100644
--- a/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml
+++ b/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml
@@ -145,7 +145,7 @@
 		</plugins>
 	</build>
 	<properties>
-		<tuscany.version>2.0-Beta1-SNAPSHOT</tuscany.version>
+		<tuscany.version>2.0-Beta1</tuscany.version>
 		<myfaces.version>1.5</myfaces.version>
 		<jetty.version>6.1.4</jetty.version>
  	</properties>
diff --git a/maven/archetypes/quickstart-jsonp/pom.xml b/maven/archetypes/quickstart-jsonp/pom.xml
index b6c38c2..c4f601a 100644
--- a/maven/archetypes/quickstart-jsonp/pom.xml
+++ b/maven/archetypes/quickstart-jsonp/pom.xml
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-

-    <artifactId>tuscany-quickstart-jsonp</artifactId>

-    <packaging>maven-archetype</packaging>

-    <name>Create a Tuscany SCA webapp project using the JSONP binding</name>

-    <description>Create a Tuscany SCA webapp project using the JSONP binding</description>

-

-    <build>

-    <extensions>

-      <extension>

-        <groupId>org.apache.maven.archetype</groupId>

-        <artifactId>archetype-packaging</artifactId>

-        <version>2.0-alpha-4</version>

-      </extension>

-    </extensions>

-    <plugins>

-      <plugin>

-        <artifactId>maven-archetype-plugin</artifactId>

-        <version>2.0-alpha-4</version>

-        <extensions>true</extensions>

-      </plugin>

-    </plugins>

-  </build>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>tuscany-quickstart-jsonp</artifactId>
+    <packaging>maven-archetype</packaging>
+    <name>Create a Tuscany SCA webapp project using the JSONP binding</name>
+    <description>Create a Tuscany SCA webapp project using the JSONP binding</description>
+
+    <build>
+    <extensions>
+      <extension>
+        <groupId>org.apache.maven.archetype</groupId>
+        <artifactId>archetype-packaging</artifactId>
+        <version>2.0-alpha-4</version>
+      </extension>
+    </extensions>
+    <plugins>
+      <plugin>
+        <artifactId>maven-archetype-plugin</artifactId>
+        <version>2.0-alpha-4</version>
+        <extensions>true</extensions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml b/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml
index 209742e..88354a8 100644
--- a/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml
+++ b/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml
@@ -1,154 +1,154 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- *

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

- *

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.

--->

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-

-	<modelVersion>4.0.0</modelVersion>

-	<groupId>${groupId}</groupId>

-	<artifactId>${artifactId}</artifactId>

-	<packaging>war</packaging>

-	<version>${version}</version>

-	<name>quickstart-jsonp</name>

-

-	<dependencies>

-		<!--  TUSCANY DEPENDENCIES -->

-            <dependency>

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

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

-               <version>${tuscany.version}</version>

-#if(${includeTuscanyRuntime} == "Y")

-               <scope>compile</scope>

-#else

-               <scope>provided</scope>

-#end

-            </dependency>

-

-            <dependency>

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

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

-               <version>${tuscany.version}</version>

-#if( $includeTuscanyRuntime == "Y")

-               <scope>runtime</scope>

-#else

-               <scope>provided</scope>

-#end

-            </dependency>

-

-            <dependency>

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

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

-               <version>${tuscany.version}</version>

-#if( $includeTuscanyRuntime == "Y")

-               <scope>runtime</scope>

-#else

-               <scope>provided</scope>

-#end

-            </dependency>

-

-		<!--  JUNIT DEPENDENCY FOR TESTING -->

-		<dependency>

-			<groupId>junit</groupId>

-			<artifactId>junit</artifactId>

-			<version>4.8.1</version>

-			<scope>test</scope>

-		</dependency>

-

-		<!--  JETTY DEPENDENCIES FOR TESTING  -->

-		<dependency>

-			<groupId>org.mortbay.jetty</groupId>

-			<artifactId>jetty</artifactId>

-			<version>${jetty.version}</version>

-			<scope>provided</scope>

-		</dependency>

-		<dependency>

-			<groupId>org.mortbay.jetty</groupId>

-			<artifactId>jetty-util</artifactId>

-			<version>${jetty.version}</version>

-			<scope>provided</scope>

-		</dependency>

-		<dependency>

-			<groupId>org.mortbay.jetty</groupId>

-			<artifactId>jetty-management</artifactId>

-			<version>${jetty.version}</version>

-			<scope>provided</scope>

-		</dependency>

-	</dependencies>

-	<build>

-            <defaultGoal>install</defaultGoal>

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

-		<resources>

-			<resource>

-				<filtering>false</filtering>

-				<directory>src/main/resources</directory>

-			</resource>

-			<resource>

-				<filtering>false</filtering>

-				<directory>src/main/java</directory>

-				<includes>

-					<include>**</include>

-				</includes>

-				<excludes>

-					<exclude>**/*.java</exclude>

-				</excludes>

-			</resource>

-		</resources>

-		<testResources>

-			<testResource>

-				<filtering>false</filtering>

-				<directory>src/test/java</directory>

-				<includes>

-					<include>**</include>

-				</includes>

-				<excludes>

-					<exclude>**/*.java</exclude>

-				</excludes>

-			</testResource>

-		</testResources>

-		<plugins>

-			<plugin>

-				<inherited>true</inherited>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-compiler-plugin</artifactId>

-				<configuration>

-					<source>1.5</source>

-					<target>1.5</target>

-					<optimise>true</optimise>

-					<debug>true</debug>

-				</configuration>

-			</plugin>

-			<plugin>

-				<groupId>org.mortbay.jetty</groupId>

-				<artifactId>maven-jetty-plugin</artifactId>

-                        <version>${jetty.version}</version>

-			</plugin>

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-eclipse-plugin</artifactId>

-				<configuration>

-					<downloadSources>true</downloadSources>

-				</configuration>

-			</plugin>

-		</plugins>

-	</build>

-	<properties>

-		<tuscany.version>2.0-Beta1-SNAPSHOT</tuscany.version>

-		<jetty.version>6.1.18</jetty.version>

-	</properties>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>${groupId}</groupId>
+	<artifactId>${artifactId}</artifactId>
+	<packaging>war</packaging>
+	<version>${version}</version>
+	<name>quickstart-jsonp</name>
+
+	<dependencies>
+		<!--  TUSCANY DEPENDENCIES -->
+            <dependency>
+               <groupId>org.apache.tuscany.sca</groupId>
+               <artifactId>tuscany-sca-api</artifactId>
+               <version>${tuscany.version}</version>
+#if(${includeTuscanyRuntime} == "Y")
+               <scope>compile</scope>
+#else
+               <scope>provided</scope>
+#end
+            </dependency>
+
+            <dependency>
+               <groupId>org.apache.tuscany.sca</groupId>
+               <artifactId>tuscany-implementation-web-runtime</artifactId>
+               <version>${tuscany.version}</version>
+#if( $includeTuscanyRuntime == "Y")
+               <scope>runtime</scope>
+#else
+               <scope>provided</scope>
+#end
+            </dependency>
+
+            <dependency>
+               <groupId>org.apache.tuscany.sca</groupId>
+               <artifactId>tuscany-binding-jsonp-runtime</artifactId>
+               <version>${tuscany.version}</version>
+#if( $includeTuscanyRuntime == "Y")
+               <scope>runtime</scope>
+#else
+               <scope>provided</scope>
+#end
+            </dependency>
+
+		<!--  JUNIT DEPENDENCY FOR TESTING -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.8.1</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!--  JETTY DEPENDENCIES FOR TESTING  -->
+		<dependency>
+			<groupId>org.mortbay.jetty</groupId>
+			<artifactId>jetty</artifactId>
+			<version>${jetty.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mortbay.jetty</groupId>
+			<artifactId>jetty-util</artifactId>
+			<version>${jetty.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mortbay.jetty</groupId>
+			<artifactId>jetty-management</artifactId>
+			<version>${jetty.version}</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+	<build>
+            <defaultGoal>install</defaultGoal>
+            <finalName>${artifactId}</finalName>
+		<resources>
+			<resource>
+				<filtering>false</filtering>
+				<directory>src/main/resources</directory>
+			</resource>
+			<resource>
+				<filtering>false</filtering>
+				<directory>src/main/java</directory>
+				<includes>
+					<include>**</include>
+				</includes>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
+			</resource>
+		</resources>
+		<testResources>
+			<testResource>
+				<filtering>false</filtering>
+				<directory>src/test/java</directory>
+				<includes>
+					<include>**</include>
+				</includes>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
+			</testResource>
+		</testResources>
+		<plugins>
+			<plugin>
+				<inherited>true</inherited>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+					<optimise>true</optimise>
+					<debug>true</debug>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.mortbay.jetty</groupId>
+				<artifactId>maven-jetty-plugin</artifactId>
+                        <version>${jetty.version}</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-eclipse-plugin</artifactId>
+				<configuration>
+					<downloadSources>true</downloadSources>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<properties>
+		<tuscany.version>2.0-Beta1</tuscany.version>
+		<jetty.version>6.1.18</jetty.version>
+	</properties>
+</project>
diff --git a/maven/archetypes/quickstart-stripes/pom.xml b/maven/archetypes/quickstart-stripes/pom.xml
index ebf95b3..38c1971 100644
--- a/maven/archetypes/quickstart-stripes/pom.xml
+++ b/maven/archetypes/quickstart-stripes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml b/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml
index 2071f4f..e4b92f6 100644
--- a/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml
+++ b/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml
@@ -115,7 +115,7 @@
 		</plugins>
 	</build>
 	<properties>
-		<tuscany.version>2.0-Beta1-SNAPSHOT</tuscany.version>
+		<tuscany.version>2.0-Beta1</tuscany.version>
 		<stripes.version>1.5.2</stripes.version>
 		<jetty.version>6.1.4</jetty.version>
 	</properties>
diff --git a/maven/archetypes/quickstart/pom.xml b/maven/archetypes/quickstart/pom.xml
index 6dfaf43..0df2032 100644
--- a/maven/archetypes/quickstart/pom.xml
+++ b/maven/archetypes/quickstart/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/maven/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml b/maven/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
index 54f87c3..c351e42 100644
--- a/maven/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
+++ b/maven/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
@@ -137,7 +137,7 @@
 		</plugins>
 	</build>
 	<properties>
-		<tuscany.version>2.0-Beta1-SNAPSHOT</tuscany.version>
+		<tuscany.version>2.0-Beta1</tuscany.version>
 		<jetty.version>6.1.18</jetty.version>
 	</properties>
 </project>
diff --git a/maven/maven-tuscany-plugin/pom.xml b/maven/maven-tuscany-plugin/pom.xml
index 5324c81..a00a359 100644
--- a/maven/maven-tuscany-plugin/pom.xml
+++ b/maven/maven-tuscany-plugin/pom.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- *

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

- *

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.

--->

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-sca</artifactId>

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

-        <version>2.0-Beta1-SNAPSHOT</version>

-    </parent>

-

-    <groupId>org.apache.tuscany.maven.plugins</groupId>

-    <artifactId>maven-tuscany-plugin</artifactId>

-    <packaging>maven-plugin</packaging>

-    <name>Apache Tuscany Maven Tuscany Plugin</name>

-    <version>2.0-Beta1-SNAPSHOT</version>

-

-    <dependencies>

-       <dependency>

-          <groupId>org.apache.maven</groupId>

-          <artifactId>maven-project</artifactId>

-          <version>2.0.3</version>

-       </dependency>

-       <dependency>

-          <groupId>org.apache.maven</groupId>

-          <artifactId>maven-plugin-api</artifactId>

-          <version>2.0.3</version>

-       </dependency>

-          <dependency>

-          <groupId>org.apache.maven</groupId>

-          <artifactId>maven-artifact</artifactId>

-          <version>2.0.3</version>

-       </dependency>

-

-       <dependency>

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

-          <artifactId>tuscany-base-runtime</artifactId>

-          <version>2.0-Beta1-SNAPSHOT</version>

-       </dependency>

-       <dependency>

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

-          <artifactId>tuscany-domain-hazelcast</artifactId>

-          <version>2.0-Beta1-SNAPSHOT</version>

-       </dependency>

-

-    </dependencies>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <relativePath>../../pom.xml</relativePath>
+        <version>2.0-Beta1</version>
+    </parent>
+
+    <groupId>org.apache.tuscany.maven.plugins</groupId>
+    <artifactId>maven-tuscany-plugin</artifactId>
+    <packaging>maven-plugin</packaging>
+    <name>Apache Tuscany Maven Tuscany Plugin</name>
+    <version>2.0-Beta1</version>
+
+    <dependencies>
+       <dependency>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-project</artifactId>
+          <version>2.0.3</version>
+       </dependency>
+       <dependency>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-plugin-api</artifactId>
+          <version>2.0.3</version>
+       </dependency>
+          <dependency>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-artifact</artifactId>
+          <version>2.0.3</version>
+       </dependency>
+
+       <dependency>
+          <groupId>org.apache.tuscany.sca</groupId>
+          <artifactId>tuscany-base-runtime</artifactId>
+          <version>2.0-Beta1</version>
+       </dependency>
+       <dependency>
+          <groupId>org.apache.tuscany.sca</groupId>
+          <artifactId>tuscany-domain-hazelcast</artifactId>
+          <version>2.0-Beta1</version>
+       </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/modules/assembly-xml/pom.xml b/modules/assembly-xml/pom.xml
index f94eccd..05df093 100644
--- a/modules/assembly-xml/pom.xml
+++ b/modules/assembly-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-assembly-xml</artifactId>
@@ -32,25 +32,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>    
              
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-common-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>         
 
         <!-- 
@@ -84,7 +84,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/modules/assembly-xsd/pom.xml b/modules/assembly-xsd/pom.xml
index b80f768..000ec3b 100644
--- a/modules/assembly-xsd/pom.xml
+++ b/modules/assembly-xsd/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-assembly-xsd</artifactId>
diff --git a/modules/assembly/pom.xml b/modules/assembly/pom.xml
index 21e5cba..9d9f42e 100644
--- a/modules/assembly/pom.xml
+++ b/modules/assembly/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-assembly</artifactId>
@@ -33,12 +33,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>        
     </dependencies>
 
diff --git a/modules/base-runtime-pom/pom.xml b/modules/base-runtime-pom/pom.xml
index 74f0ba0..59312ff 100644
--- a/modules/base-runtime-pom/pom.xml
+++ b/modules/base-runtime-pom/pom.xml
@@ -1,302 +1,302 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-modules</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-

-    <artifactId>tuscany-base-runtime-pom</artifactId>

-    <name>Apache Tuscany SCA Base Runtime POM</name>

-    <packaging>pom</packaging>

-

-    <!-- 

-         Provides a minimum set of function for running composites using implementation.java 

-         and local wiring. Other extensions can be added to this base when required 

-    -->

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-core-runtime-pom</artifactId>

-            <version>${pom.version}</version>

-            <type>pom</type>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-domain-node</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-launcher</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-sca-client-impl</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

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

-            <version>${pom.version}</version>

-            <exclusions>

-                <exclusion>

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

-                    <artifactId>tuscany-core-spi</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>org.mortbay.jetty</groupId>

-                    <artifactId>jetty</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>org.mortbay.jetty</groupId>

-                    <artifactId>jetty-util</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>javax.servlet</groupId>

-                    <artifactId>servlet-api</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-shell</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-wink</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-runtime-jaxws-ri</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-data-api</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-

-<!-- All the scdl modules  -->

-

-        <dependency>

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

-            <artifactId>tuscany-binding-atom</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-binding-comet</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-binding-ejb</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-binding-jsonp</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-binding-rest</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-implementation-jaxrs</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-implementation-python</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-implementation-script</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-implementation-spring</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-implementation-widget</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-<!-- these remaining dependencies are not required when using JDK6, so use a scope of provided  -->

-

-        <dependency>

-            <groupId>org.apache.geronimo.specs</groupId>

-            <artifactId>geronimo-stax-api_1.0_spec</artifactId>

-            <version>1.0.1</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.codehaus.woodstox</groupId>

-            <artifactId>wstx-asl</artifactId>

-            <version>3.2.4</version>

-            <scope>provided</scope>

-            <exclusions>

-                <exclusion>

-                    <groupId>stax</groupId>

-                    <artifactId>stax-api</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>javax.xml.bind</groupId>

-            <artifactId>jaxb-api</artifactId>

-            <version>2.1</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>javax.activation</groupId>

-            <artifactId>activation</artifactId>

-            <version>1.1</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>com.sun.xml.bind</groupId>

-            <artifactId>jaxb-impl</artifactId>

-            <version>2.1.12</version>

-            <scope>provided</scope>

-        </dependency>

-

-

-        <dependency>

-            <groupId>javax.xml.ws</groupId>

-            <artifactId>jaxws-api</artifactId>

-            <version>2.1</version>

-            <scope>provided</scope>

-            <exclusions>

-                <exclusion>

-                    <groupId>javax.xml.soap</groupId>

-                    <artifactId>saaj-api</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>javax.annotation</groupId>

-            <artifactId>jsr250-api</artifactId>

-            <version>1.0</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>javax.jws</groupId>

-            <artifactId>jsr181-api</artifactId>

-            <version>1.0-MR1</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>javax.xml.stream</groupId>

-            <artifactId>stax-api</artifactId>

-            <version>1.0-2</version>

-            <scope>provided</scope>

-        </dependency>

-

-

-    </dependencies>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-modules</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>tuscany-base-runtime-pom</artifactId>
+    <name>Apache Tuscany SCA Base Runtime POM</name>
+    <packaging>pom</packaging>
+
+    <!-- 
+         Provides a minimum set of function for running composites using implementation.java 
+         and local wiring. Other extensions can be added to this base when required 
+    -->
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-runtime-pom</artifactId>
+            <version>${pom.version}</version>
+            <type>pom</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-domain-node</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-web-runtime</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-launcher</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-client-impl</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>${pom.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.tuscany.sca</groupId>
+                    <artifactId>tuscany-core-spi</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>jetty</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>jetty-util</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-shell</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-wink</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-runtime-jaxws-ri</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-data-api</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy-security</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+<!-- All the scdl modules  -->
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-atom</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-comet</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-corba</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ejb</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-http</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jsonp</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jsonrpc</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-rest</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-rmi</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-bpel</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-jaxrs</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-python</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-script</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-spring</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-web</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-widget</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+<!-- these remaining dependencies are not required when using JDK6, so use a scope of provided  -->
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+            <version>1.0.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.codehaus.woodstox</groupId>
+            <artifactId>wstx-asl</artifactId>
+            <version>3.2.4</version>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>1.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.1.12</version>
+            <scope>provided</scope>
+        </dependency>
+
+
+        <dependency>
+            <groupId>javax.xml.ws</groupId>
+            <artifactId>jaxws-api</artifactId>
+            <version>2.1</version>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.xml.soap</groupId>
+                    <artifactId>saaj-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>jsr250-api</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.jws</groupId>
+            <artifactId>jsr181-api</artifactId>
+            <version>1.0-MR1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.xml.stream</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>1.0-2</version>
+            <scope>provided</scope>
+        </dependency>
+
+
+    </dependencies>
+
+</project>
diff --git a/modules/binding-atom-js-dojo/pom.xml b/modules/binding-atom-js-dojo/pom.xml
index e0344d5..8f692ee 100644
--- a/modules/binding-atom-js-dojo/pom.xml
+++ b/modules/binding-atom-js-dojo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
             
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-web-javascript</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>    
 
         <dependency>
diff --git a/modules/binding-atom-runtime/pom.xml b/modules/binding-atom-runtime/pom.xml
index 44a338c..cc14d18 100644
--- a/modules/binding-atom-runtime/pom.xml
+++ b/modules/binding-atom-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,55 +33,55 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-common-http</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
@@ -186,21 +186,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/modules/binding-atom/pom.xml b/modules/binding-atom/pom.xml
index e9e4141..5bbe1ba 100644
--- a/modules/binding-atom/pom.xml
+++ b/modules/binding-atom/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
 			<scope>test</scope>			
         </dependency>
 				
diff --git a/modules/binding-comet-runtime/pom.xml b/modules/binding-comet-runtime/pom.xml
index 0816d00..82686c6 100644
--- a/modules/binding-comet-runtime/pom.xml
+++ b/modules/binding-comet-runtime/pom.xml
@@ -1,86 +1,86 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- *

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

- *

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.

--->

-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

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

-		<artifactId>tuscany-modules</artifactId>

-		<version>2.0-Beta1-SNAPSHOT</version>

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

-	</parent>

-

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

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

-	<name>Apache Tuscany SCA Comet Binding Runtime</name>

-	<packaging>jar</packaging>

-

-	<dependencies>

-		<dependency>

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

-			<artifactId>tuscany-base-runtime-pom</artifactId>

-            <type>pom</type>

-			<version>2.0-Beta1-SNAPSHOT</version>

-			<scope>provided</scope>

-		</dependency>

-		<dependency>

-			<groupId>org.atmosphere</groupId>

-			<artifactId>atmosphere-commons</artifactId>

-			<version>0.6.1</version>

-		</dependency>

-		<dependency>

-			<groupId>org.atmosphere</groupId>

-			<artifactId>atmosphere-runtime</artifactId>

-			<version>0.6.1</version>

-		</dependency>

-		<dependency>

-			<groupId>com.google.code.gson</groupId>

-			<artifactId>gson</artifactId>

-			<version>1.4</version>

-		</dependency>

-		<dependency>

-			<groupId>org.apache.geronimo.specs</groupId>

-			<artifactId>geronimo-servlet_3.0_spec</artifactId>

-			<version>1.0</version>

-			<scope>provided</scope>

-		</dependency>

-

-        <dependency>

-            <groupId>org.mortbay.jetty</groupId>

-            <artifactId>jetty</artifactId>

-            <version>6.1.19</version>

-			<scope>test</scope>

-        </dependency>

-

-	</dependencies>

-

-	<repositories>

-		<repository>

-			<id>gson-googlecode-repository</id>

-			<url>http://google-gson.googlecode.com/svn/mavenrepo</url>

-			<snapshots>

-				<enabled>true</enabled>

-			</snapshots>

-			<releases>

-				<enabled>true</enabled>

-			</releases>

-		</repository>

-	</repositories>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.apache.tuscany.sca</groupId>
+		<artifactId>tuscany-modules</artifactId>
+		<version>2.0-Beta1</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<groupId>org.apache.tuscany.sca</groupId>
+	<artifactId>tuscany-binding-comet-runtime</artifactId>
+	<name>Apache Tuscany SCA Comet Binding Runtime</name>
+	<packaging>jar</packaging>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-base-runtime-pom</artifactId>
+            <type>pom</type>
+			<version>2.0-Beta1</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.atmosphere</groupId>
+			<artifactId>atmosphere-commons</artifactId>
+			<version>0.6.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.atmosphere</groupId>
+			<artifactId>atmosphere-runtime</artifactId>
+			<version>0.6.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>1.4</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-servlet_3.0_spec</artifactId>
+			<version>1.0</version>
+			<scope>provided</scope>
+		</dependency>
+
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+            <version>6.1.19</version>
+			<scope>test</scope>
+        </dependency>
+
+	</dependencies>
+
+	<repositories>
+		<repository>
+			<id>gson-googlecode-repository</id>
+			<url>http://google-gson.googlecode.com/svn/mavenrepo</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+	</repositories>
+
+</project>
diff --git a/modules/binding-comet/pom.xml b/modules/binding-comet/pom.xml
index e4cf411..8913f11 100644
--- a/modules/binding-comet/pom.xml
+++ b/modules/binding-comet/pom.xml
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- *

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

- *

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-modules</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-    

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

-    <artifactId>tuscany-binding-comet</artifactId>

-    <packaging>jar</packaging>

-    <name>Apache Tuscany SCA Comet Binding Model</name>

-

-    <dependencies>

-

-        <dependency>

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

-            <artifactId>tuscany-assembly</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-    </dependencies>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-modules</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    
+    <groupId>org.apache.tuscany.sca</groupId>
+    <artifactId>tuscany-binding-comet</artifactId>
+    <packaging>jar</packaging>
+    <name>Apache Tuscany SCA Comet Binding Model</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/modules/binding-corba-runtime/pom.xml b/modules/binding-corba-runtime/pom.xml
index 90d87ca..7603047 100644
--- a/modules/binding-corba-runtime/pom.xml
+++ b/modules/binding-corba-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-corba-runtime</artifactId>
@@ -32,25 +32,25 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-java</artifactId>
-			<version>2.0-Beta1-SNAPSHOT</version>
+			<version>2.0-Beta1</version>
 		</dependency>
     
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-corba</artifactId>
-			<version>2.0-Beta1-SNAPSHOT</version>
+			<version>2.0-Beta1</version>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-corba</artifactId>
-			<version>2.0-Beta1-SNAPSHOT</version>
+			<version>2.0-Beta1</version>
 		</dependency>
 	
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-corba-jse</artifactId>
-			<version>2.0-Beta1-SNAPSHOT</version>
+			<version>2.0-Beta1</version>
 			<scope>test</scope>
 		</dependency>
 		
diff --git a/modules/binding-corba/pom.xml b/modules/binding-corba/pom.xml
index 9972e71..f24a8fd 100644
--- a/modules/binding-corba/pom.xml
+++ b/modules/binding-corba/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-corba</artifactId>
@@ -33,19 +33,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
 	<dependency>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-host-corba</artifactId>
-		<version>2.0-Beta1-SNAPSHOT</version>
+		<version>2.0-Beta1</version>
 	</dependency>
 	
     </dependencies>
diff --git a/modules/binding-ejb-runtime/pom.xml b/modules/binding-ejb-runtime/pom.xml
index 466da7e..6e6eae0 100644
--- a/modules/binding-ejb-runtime/pom.xml
+++ b/modules/binding-ejb-runtime/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,13 +34,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ejb</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
@@ -72,14 +72,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/modules/binding-ejb/pom.xml b/modules/binding-ejb/pom.xml
index 1d53b77..beaa0ff 100644
--- a/modules/binding-ejb/pom.xml
+++ b/modules/binding-ejb/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,19 +34,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
diff --git a/modules/binding-http-runtime/pom.xml b/modules/binding-http-runtime/pom.xml
index b450f4c..0e11c82 100644
--- a/modules/binding-http-runtime/pom.xml
+++ b/modules/binding-http-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,31 +33,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-common-http</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
@@ -70,28 +70,28 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-json</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/modules/binding-http/pom.xml b/modules/binding-http/pom.xml
index 5c4fa98..0b316ae 100644
--- a/modules/binding-http/pom.xml
+++ b/modules/binding-http/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
diff --git a/modules/binding-jms-runtime/pom.xml b/modules/binding-jms-runtime/pom.xml
index c93c4f8..206e240 100644
--- a/modules/binding-jms-runtime/pom.xml
+++ b/modules/binding-jms-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-jms-runtime</artifactId>
@@ -34,14 +34,14 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>provided</scope>
         </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/modules/binding-jms/pom.xml b/modules/binding-jms/pom.xml
index 5772a39..843989d 100644
--- a/modules/binding-jms/pom.xml
+++ b/modules/binding-jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-jms</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
diff --git a/modules/binding-jsonp-runtime/pom.xml b/modules/binding-jsonp-runtime/pom.xml
index 06c7d61..52175db 100644
--- a/modules/binding-jsonp-runtime/pom.xml
+++ b/modules/binding-jsonp-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-jsonp-runtime</artifactId>
@@ -33,19 +33,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonp</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency-->   
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>   
                 
         <dependency>
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-json</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>         
 
@@ -83,28 +83,28 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>    
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/modules/binding-jsonp/pom.xml b/modules/binding-jsonp/pom.xml
index e053ae3..7a21fbe 100644
--- a/modules/binding-jsonp/pom.xml
+++ b/modules/binding-jsonp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-jsonp</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
     </dependencies>
diff --git a/modules/binding-jsonrpc-js-dojo/pom.xml b/modules/binding-jsonrpc-js-dojo/pom.xml
index 8dc5952..a38488e 100644
--- a/modules/binding-jsonrpc-js-dojo/pom.xml
+++ b/modules/binding-jsonrpc-js-dojo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
             
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-web-javascript</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>    
     
         <dependency>
diff --git a/modules/binding-jsonrpc-runtime/pom.xml b/modules/binding-jsonrpc-runtime/pom.xml
index 702986b..bdec798 100644
--- a/modules/binding-jsonrpc-runtime/pom.xml
+++ b/modules/binding-jsonrpc-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,37 +33,37 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-json</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
@@ -75,7 +75,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>        
         
@@ -125,14 +125,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>        
         
diff --git a/modules/binding-jsonrpc/pom.xml b/modules/binding-jsonrpc/pom.xml
index 0ca3e09..1d23ef0 100644
--- a/modules/binding-jsonrpc/pom.xml
+++ b/modules/binding-jsonrpc/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
diff --git a/modules/binding-rest-js-dojo/pom.xml b/modules/binding-rest-js-dojo/pom.xml
index dab19fa..3f552a8 100644
--- a/modules/binding-rest-js-dojo/pom.xml
+++ b/modules/binding-rest-js-dojo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rest</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
             
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-web-javascript</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>    
 
         <dependency>
diff --git a/modules/binding-rest-runtime/pom.xml b/modules/binding-rest-runtime/pom.xml
index 86cb9fe..c012b72 100644
--- a/modules/binding-rest-runtime/pom.xml
+++ b/modules/binding-rest-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,61 +33,61 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rest</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-common-http</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-json</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-jaxrs</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
@@ -124,21 +124,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/modules/binding-rest/pom.xml b/modules/binding-rest/pom.xml
index 541d147..9490613 100644
--- a/modules/binding-rest/pom.xml
+++ b/modules/binding-rest/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-common-http</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
                 
         <dependency>
diff --git a/modules/binding-rmi-runtime/pom.xml b/modules/binding-rmi-runtime/pom.xml
index b586a10..47b5970 100644
--- a/modules/binding-rmi-runtime/pom.xml
+++ b/modules/binding-rmi-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-rmi-runtime</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
@@ -41,19 +41,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-rmi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
             <scope>test</scope>
         </dependency>
diff --git a/modules/binding-rmi/pom.xml b/modules/binding-rmi/pom.xml
index b62b916..3e3f85b 100644
--- a/modules/binding-rmi/pom.xml
+++ b/modules/binding-rmi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-rmi</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
diff --git a/modules/binding-sca-runtime/pom.xml b/modules/binding-sca-runtime/pom.xml
index 9a8adf6..c577df4 100644
--- a/modules/binding-sca-runtime/pom.xml
+++ b/modules/binding-sca-runtime/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,37 +35,37 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>  
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency> 
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>       
 
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>       
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>    
     </dependencies>
 
diff --git a/modules/binding-ws-runtime-axis2/pom.xml b/modules/binding-ws-runtime-axis2/pom.xml
index bb68c7b..4efcd7d 100644
--- a/modules/binding-ws-runtime-axis2/pom.xml
+++ b/modules/binding-ws-runtime-axis2/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>     
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>provided</scope> <!-- it's in base -->
         </dependency>      
 
@@ -345,14 +345,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>        
 
@@ -360,7 +360,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
             <scope>test</scope>
         </dependency> 
@@ -368,7 +368,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>     
    
diff --git a/modules/binding-ws-runtime-jaxws-ri/pom.xml b/modules/binding-ws-runtime-jaxws-ri/pom.xml
index ff9a97f..0021051 100644
--- a/modules/binding-ws-runtime-jaxws-ri/pom.xml
+++ b/modules/binding-ws-runtime-jaxws-ri/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,60 +33,60 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-jaxws</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>compile</scope>
         </dependency>
 
@@ -94,21 +94,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-jaxws</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
 
@@ -117,21 +117,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/modules/binding-ws-runtime-jaxws/pom.xml b/modules/binding-ws-runtime-jaxws/pom.xml
index 65bfe24..8b91e49 100644
--- a/modules/binding-ws-runtime-jaxws/pom.xml
+++ b/modules/binding-ws-runtime-jaxws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,73 +33,73 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-jaxws</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!--  Test dependencies -->
@@ -107,14 +107,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/modules/binding-ws-wsdlgen/pom.xml b/modules/binding-ws-wsdlgen/pom.xml
index 9821608..7945444 100644
--- a/modules/binding-ws-wsdlgen/pom.xml
+++ b/modules/binding-ws-wsdlgen/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
@@ -33,32 +33,32 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-jaxws</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/modules/binding-ws/pom.xml b/modules/binding-ws/pom.xml
index 0b34736..168045d 100644
--- a/modules/binding-ws/pom.xml
+++ b/modules/binding-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-ws</artifactId>
@@ -33,19 +33,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
          <dependency>
diff --git a/modules/builder/pom.xml b/modules/builder/pom.xml
index 082d264..41cc87e 100644
--- a/modules/builder/pom.xml
+++ b/modules/builder/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-builder</artifactId>
@@ -33,31 +33,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
                        
     </dependencies>
diff --git a/modules/common-http/pom.xml b/modules/common-http/pom.xml
index ee20512..fefeb70 100644
--- a/modules/common-http/pom.xml
+++ b/modules/common-http/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-common-http</artifactId>
diff --git a/modules/common-java/pom.xml b/modules/common-java/pom.xml
index f7550b8..5c5bf01 100644
--- a/modules/common-java/pom.xml
+++ b/modules/common-java/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-common-java</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
     </dependencies>
diff --git a/modules/common-xml/pom.xml b/modules/common-xml/pom.xml
index f7f10b6..a7a3d85 100644
--- a/modules/common-xml/pom.xml
+++ b/modules/common-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-common-xml</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
diff --git a/modules/contribution-osgi/pom.xml b/modules/contribution-osgi/pom.xml
index 5706012..d1a433d 100644
--- a/modules/contribution-osgi/pom.xml
+++ b/modules/contribution-osgi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-contribution-osgi</artifactId>
@@ -32,19 +32,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>        
 
         <dependency>
diff --git a/modules/contribution-resource/pom.xml b/modules/contribution-resource/pom.xml
index 2abb35b..7ff6003 100644
--- a/modules/contribution-resource/pom.xml
+++ b/modules/contribution-resource/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-contribution-resource</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
diff --git a/modules/contribution/pom.xml b/modules/contribution/pom.xml
index 3a2257d..429103e 100644
--- a/modules/contribution/pom.xml
+++ b/modules/contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-contribution</artifactId>
@@ -32,31 +32,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-common-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-common-java</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
diff --git a/modules/core-databinding/pom.xml b/modules/core-databinding/pom.xml
index 8c76465..c669770 100644
--- a/modules/core-databinding/pom.xml
+++ b/modules/core-databinding/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/core-runtime-pom/pom.xml b/modules/core-runtime-pom/pom.xml
index e11700a..f633e1e 100644
--- a/modules/core-runtime-pom/pom.xml
+++ b/modules/core-runtime-pom/pom.xml
@@ -1,193 +1,193 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-modules</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-

-    <artifactId>tuscany-core-runtime-pom</artifactId>

-    <name>Apache Tuscany SCA Core Runtime POM</name>

-    <packaging>pom</packaging>

-

-    <!-- 

-         The core Tuscany modules that are generally required in order

-         to build an extension. This set of module contains the Tuscany

-         SPI

-    -->

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-assembly</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-assembly-xml</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-assembly-xsd</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <!-- included because binding-ws-wsdlgen needs it -->

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-

-        <!-- included as the runtime normalizes interfaces to WSDL -->

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-builder</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-common-java</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-common-http</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-common-xml</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-contribution</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-core</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-core-databinding</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-core-spi</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-databinding</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-databinding-jaxb</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-deployment</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-extensibility</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-http</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-monitor</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-xsd</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-    </dependencies>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-modules</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>tuscany-core-runtime-pom</artifactId>
+    <name>Apache Tuscany SCA Core Runtime POM</name>
+    <packaging>pom</packaging>
+
+    <!-- 
+         The core Tuscany modules that are generally required in order
+         to build an extension. This set of module contains the Tuscany
+         SPI
+    -->
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly-xml</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly-xsd</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <!-- included because binding-ws-wsdlgen needs it -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <!-- included as the runtime normalizes interfaces to WSDL -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-common-java</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-common-http</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-common-xml</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-databinding</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-spi</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-jaxb</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-deployment</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-extensibility</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-http</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-interface-java</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-interface-java-jaxws</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-interface-wsdl</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-monitor</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-api</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-xsd</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/modules/core-spi/pom.xml b/modules/core-spi/pom.xml
index 5ab0597..82780bd 100644
--- a/modules/core-spi/pom.xml
+++ b/modules/core-spi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-core-spi</artifactId>
@@ -32,25 +32,25 @@
     	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>                        
 
         <dependency>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index af31eed..48d76a6 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-core</artifactId>
@@ -32,25 +32,25 @@
     	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
diff --git a/modules/data-api/pom.xml b/modules/data-api/pom.xml
index 77d4a76..8ba91d1 100644
--- a/modules/data-api/pom.xml
+++ b/modules/data-api/pom.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

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

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

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

-    * 

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

-    * 

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

-    * software distributed under the License is distributed on an

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

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

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-modules</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-    <artifactId>tuscany-data-api</artifactId>

-    <name>Apache Tuscany SCA Data API</name>

-

-	<dependencies>

-		<dependency>

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

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

-			<version>2.0-Beta1-SNAPSHOT</version>

-		</dependency>

-	</dependencies>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-modules</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-data-api</artifactId>
+    <name>Apache Tuscany SCA Data API</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-sca-api</artifactId>
+			<version>2.0-Beta1</version>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/modules/databinding-axiom/pom.xml b/modules/databinding-axiom/pom.xml
index b56086b..31eb019 100644
--- a/modules/databinding-axiom/pom.xml
+++ b/modules/databinding-axiom/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-axiom</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>  
diff --git a/modules/databinding-jaxb-axiom/pom.xml b/modules/databinding-jaxb-axiom/pom.xml
index 348298e..1da0475 100644
--- a/modules/databinding-jaxb-axiom/pom.xml
+++ b/modules/databinding-jaxb-axiom/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>  
diff --git a/modules/databinding-jaxb/pom.xml b/modules/databinding-jaxb/pom.xml
index 3c95d2f..1f7291b 100644
--- a/modules/databinding-jaxb/pom.xml
+++ b/modules/databinding-jaxb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-jaxb</artifactId>
@@ -32,17 +32,17 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
diff --git a/modules/databinding-json/pom.xml b/modules/databinding-json/pom.xml
index ca71201..897bee6 100644
--- a/modules/databinding-json/pom.xml
+++ b/modules/databinding-json/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-json</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>provided</scope>
         </dependency> 
 
diff --git a/modules/databinding-sdo-axiom/pom.xml b/modules/databinding-sdo-axiom/pom.xml
index 5536eb4..cdaafe6 100644
--- a/modules/databinding-sdo-axiom/pom.xml
+++ b/modules/databinding-sdo-axiom/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-sdo-axiom</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
        <dependency>
diff --git a/modules/databinding-sdo/pom.xml b/modules/databinding-sdo/pom.xml
index d2a6484..3058366 100644
--- a/modules/databinding-sdo/pom.xml
+++ b/modules/databinding-sdo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-sdo</artifactId>
@@ -32,19 +32,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>  
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-common-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <!-- FIXME: We might want to create a separate module to host the processor -->
    
diff --git a/modules/databinding/pom.xml b/modules/databinding/pom.xml
index 7d9780e..647e876 100644
--- a/modules/databinding/pom.xml
+++ b/modules/databinding/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-modules</artifactId>
-		<version>2.0-Beta1-SNAPSHOT</version>
+		<version>2.0-Beta1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>tuscany-databinding</artifactId>
@@ -32,37 +32,37 @@
 		<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>		
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-common-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>       
 
 <!--         
diff --git a/modules/deployment/pom.xml b/modules/deployment/pom.xml
index 55f901d..06ce433 100644
--- a/modules/deployment/pom.xml
+++ b/modules/deployment/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,44 +35,44 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>        
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>         
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-builder</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
                
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency> 
         
diff --git a/modules/domain-hazelcast/pom.xml b/modules/domain-hazelcast/pom.xml
index b2f4dfd..16755a2 100644
--- a/modules/domain-hazelcast/pom.xml
+++ b/modules/domain-hazelcast/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-domain-hazelcast</artifactId>
@@ -62,7 +62,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/modules/domain-node/pom.xml b/modules/domain-node/pom.xml
index c56c9fc..c456eeb 100644
--- a/modules/domain-node/pom.xml
+++ b/modules/domain-node/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,38 +35,38 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-client-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>  
                       
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>  
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>         
 
diff --git a/modules/endpoint-tribes/pom.xml b/modules/endpoint-tribes/pom.xml
index 19e92b1..63a0a6e 100644
--- a/modules/endpoint-tribes/pom.xml
+++ b/modules/endpoint-tribes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-endpoint-tribes</artifactId>
@@ -39,25 +39,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-deployment</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/modules/extensibility-equinox/pom.xml b/modules/extensibility-equinox/pom.xml
index f17e996..b658641 100644
--- a/modules/extensibility-equinox/pom.xml
+++ b/modules/extensibility-equinox/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
diff --git a/modules/extensibility/pom.xml b/modules/extensibility/pom.xml
index ccb62bc..bc00002 100644
--- a/modules/extensibility/pom.xml
+++ b/modules/extensibility/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-extensibility</artifactId>
diff --git a/modules/host-corba-jee/pom.xml b/modules/host-corba-jee/pom.xml
index d92b13a..b99a92f 100644
--- a/modules/host-corba-jee/pom.xml
+++ b/modules/host-corba-jee/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
     </parent>
     <artifactId>tuscany-host-corba-jee</artifactId>
     <name>Apache Tuscany SCA JEE environment CORBA Host</name>
@@ -31,12 +31,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba-jse</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
 	    <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/modules/host-corba-jse-tns/pom.xml b/modules/host-corba-jse-tns/pom.xml
index 24bfd785..e655c11 100644
--- a/modules/host-corba-jse-tns/pom.xml
+++ b/modules/host-corba-jse-tns/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
     </parent>
     <artifactId>tuscany-host-corba-jse-tns</artifactId>
     <name>Apache Tuscany SCA Transient Name Server CORBA Host</name>
@@ -32,19 +32,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba-jse</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-corba-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/modules/host-corba-jse/pom.xml b/modules/host-corba-jse/pom.xml
index d8035dc..d12326f 100644
--- a/modules/host-corba-jse/pom.xml
+++ b/modules/host-corba-jse/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
     </parent>
     <artifactId>tuscany-host-corba-jse</artifactId>
     <name>Apache Tuscany SCA JSE built-in CORBA Host</name>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
     </dependencies>
 
diff --git a/modules/host-corba/pom.xml b/modules/host-corba/pom.xml
index 0c1c555..f465379 100644
--- a/modules/host-corba/pom.xml
+++ b/modules/host-corba/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
     </parent>
     <artifactId>tuscany-host-corba</artifactId>
     <name>Apache Tuscany SCA CORBA Host Extension Point</name>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
     </dependencies>
 
diff --git a/modules/host-http/pom.xml b/modules/host-http/pom.xml
index d2a051d..2638ebf 100644
--- a/modules/host-http/pom.xml
+++ b/modules/host-http/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
diff --git a/modules/host-jetty/pom.xml b/modules/host-jetty/pom.xml
index 14ad5f7..a01decd 100644
--- a/modules/host-jetty/pom.xml
+++ b/modules/host-jetty/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
diff --git a/modules/host-rmi/pom.xml b/modules/host-rmi/pom.xml
index 79e2e17..7676860 100644
--- a/modules/host-rmi/pom.xml
+++ b/modules/host-rmi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-runtime-pom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
diff --git a/modules/host-webapp/pom.xml b/modules/host-webapp/pom.xml
index 03c5243..9cff843 100644
--- a/modules/host-webapp/pom.xml
+++ b/modules/host-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,31 +33,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/modules/implementation-bpel-runtime/pom.xml b/modules/implementation-bpel-runtime/pom.xml
index 64ce876..5875002 100644
--- a/modules/implementation-bpel-runtime/pom.xml
+++ b/modules/implementation-bpel-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-bpel-runtime</artifactId>
@@ -32,7 +32,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>provided</scope>
         </dependency> 
         <!-- ODE Jars -->
diff --git a/modules/implementation-bpel/pom.xml b/modules/implementation-bpel/pom.xml
index d222d9e..ba71210 100644
--- a/modules/implementation-bpel/pom.xml
+++ b/modules/implementation-bpel/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>tuscany-implementation-bpel</artifactId>
@@ -32,25 +32,25 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-assembly</artifactId>
-			<version>2.0-Beta1-SNAPSHOT</version>
+			<version>2.0-Beta1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-assembly-xml</artifactId>
-			<version>2.0-Beta1-SNAPSHOT</version>
+			<version>2.0-Beta1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-wsdl</artifactId>
-			<version>2.0-Beta1-SNAPSHOT</version>
+			<version>2.0-Beta1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-java</artifactId>
-			<version>2.0-Beta1-SNAPSHOT</version>
+			<version>2.0-Beta1</version>
 		</dependency>
 
 		<dependency>
diff --git a/modules/implementation-java-runtime/pom.xml b/modules/implementation-java-runtime/pom.xml
index 5ee48ea..5d137ed 100644
--- a/modules/implementation-java-runtime/pom.xml
+++ b/modules/implementation-java-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-java-runtime</artifactId>
@@ -32,25 +32,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>        
     </dependencies>
 
diff --git a/modules/implementation-java/pom.xml b/modules/implementation-java/pom.xml
index 3314d00..faa123b 100644
--- a/modules/implementation-java/pom.xml
+++ b/modules/implementation-java/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-java</artifactId>
@@ -32,31 +32,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-jaxws</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>        
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>        
  
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
@@ -68,45 +68,45 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>         
 
         <!--dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-builder</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency-->             
 
diff --git a/modules/implementation-jaxrs-runtime/pom.xml b/modules/implementation-jaxrs-runtime/pom.xml
index 29c8ee3..7c18f40 100644
--- a/modules/implementation-jaxrs-runtime/pom.xml
+++ b/modules/implementation-jaxrs-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,33 +34,33 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-jaxrs</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rest-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!--
@@ -134,19 +134,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/modules/implementation-jaxrs/pom.xml b/modules/implementation-jaxrs/pom.xml
index 5859ac1..4838e9d 100644
--- a/modules/implementation-jaxrs/pom.xml
+++ b/modules/implementation-jaxrs/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,43 +34,43 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
  
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rest</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
                 
         <dependency>
diff --git a/modules/implementation-osgi-runtime/pom.xml b/modules/implementation-osgi-runtime/pom.xml
index 49bc19a..134fc53 100644
--- a/modules/implementation-osgi-runtime/pom.xml
+++ b/modules/implementation-osgi-runtime/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -37,13 +37,13 @@
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -57,13 +57,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
diff --git a/modules/implementation-osgi/pom.xml b/modules/implementation-osgi/pom.xml
index fce4276..c2e29be 100644
--- a/modules/implementation-osgi/pom.xml
+++ b/modules/implementation-osgi/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -44,20 +44,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
diff --git a/modules/implementation-python-runtime/pom.xml b/modules/implementation-python-runtime/pom.xml
index abb9d40..89831dd 100644
--- a/modules/implementation-python-runtime/pom.xml
+++ b/modules/implementation-python-runtime/pom.xml
@@ -1,89 +1,89 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- *

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

- *

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.

--->

-<project>

-

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-modules</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-

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

-    <name>Apache Tuscany SCA Python Implementation Extension</name>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-core-runtime-pom</artifactId>

-            <type>pom</type>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>provided</scope>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-implementation-python</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>provided</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.python</groupId>

-            <artifactId>jython</artifactId>

-            <version>2.5.2-beta1</version>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>                                      

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

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

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

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

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

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

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

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

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

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

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

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

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies> 

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project>
+
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-modules</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>tuscany-implementation-python-runtime</artifactId>
+    <name>Apache Tuscany SCA Python Implementation Extension</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-runtime-pom</artifactId>
+            <type>pom</type>
+            <version>2.0-Beta1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-python</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.python</groupId>
+            <artifactId>jython</artifactId>
+            <version>2.5.2-beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>                                      
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies> 
+</project>
diff --git a/modules/implementation-python/pom.xml b/modules/implementation-python/pom.xml
index dbb1e97..63f790e 100644
--- a/modules/implementation-python/pom.xml
+++ b/modules/implementation-python/pom.xml
@@ -1,84 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- *

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

- *

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-modules</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-

-    <artifactId>tuscany-implementation-python</artifactId>

-    <name>Apache Tuscany SCA Python Implementation Model</name>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-assembly</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-assembly-xml</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-core-spi</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

- 

-        <dependency>

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

-            <artifactId>tuscany-contribution</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

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

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

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-databinding-json</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-monitor</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-modules</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>tuscany-implementation-python</artifactId>
+    <name>Apache Tuscany SCA Python Implementation Model</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly-xml</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-spi</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+ 
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-interface-java</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-json</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-monitor</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/modules/implementation-script-runtime/pom.xml b/modules/implementation-script-runtime/pom.xml
index 614678a..e10c7e0 100644
--- a/modules/implementation-script-runtime/pom.xml
+++ b/modules/implementation-script-runtime/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,25 +34,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-script</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
        <dependency>
@@ -108,14 +108,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/modules/implementation-script/pom.xml b/modules/implementation-script/pom.xml
index 38c6273..03b10d4 100644
--- a/modules/implementation-script/pom.xml
+++ b/modules/implementation-script/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
diff --git a/modules/implementation-spring-runtime/pom.xml b/modules/implementation-spring-runtime/pom.xml
index 029221c..f66004f 100644
--- a/modules/implementation-spring-runtime/pom.xml
+++ b/modules/implementation-spring-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-spring-runtime</artifactId>
@@ -34,7 +34,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>provided</scope>
         </dependency> 
 
diff --git a/modules/implementation-spring-stub/pom.xml b/modules/implementation-spring-stub/pom.xml
index 6ca5067..91d18af 100644
--- a/modules/implementation-spring-stub/pom.xml
+++ b/modules/implementation-spring-stub/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-spring-stub</artifactId>
@@ -43,13 +43,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
                   
     </dependencies>
diff --git a/modules/implementation-spring-tie/pom.xml b/modules/implementation-spring-tie/pom.xml
index 2d9c775..9217068 100644
--- a/modules/implementation-spring-tie/pom.xml
+++ b/modules/implementation-spring-tie/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-spring-tie</artifactId>
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/modules/implementation-spring-webapp/pom.xml b/modules/implementation-spring-webapp/pom.xml
index 01b94e3..cbaf1cb 100644
--- a/modules/implementation-spring-webapp/pom.xml
+++ b/modules/implementation-spring-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-spring-webapp</artifactId>
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Spring dependencies... -->
diff --git a/modules/implementation-spring/pom.xml b/modules/implementation-spring/pom.xml
index 8964771..215f3b2 100644
--- a/modules/implementation-spring/pom.xml
+++ b/modules/implementation-spring/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-spring</artifactId>
@@ -32,27 +32,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
                   
     </dependencies>
diff --git a/modules/implementation-web-client/pom.xml b/modules/implementation-web-client/pom.xml
index 2660725..e5fa5da 100644
--- a/modules/implementation-web-client/pom.xml
+++ b/modules/implementation-web-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
diff --git a/modules/implementation-web-runtime/pom.xml b/modules/implementation-web-runtime/pom.xml
index c1e4f16..222a136 100644
--- a/modules/implementation-web-runtime/pom.xml
+++ b/modules/implementation-web-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
diff --git a/modules/implementation-web/pom.xml b/modules/implementation-web/pom.xml
index 7e81f6e..5a1d72c 100644
--- a/modules/implementation-web/pom.xml
+++ b/modules/implementation-web/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,31 +34,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
  
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
diff --git a/modules/implementation-widget-runtime-dojo/pom.xml b/modules/implementation-widget-runtime-dojo/pom.xml
index b6fd87e..6084f09 100644
--- a/modules/implementation-widget-runtime-dojo/pom.xml
+++ b/modules/implementation-widget-runtime-dojo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,13 +33,13 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-implementation-widget-runtime</artifactId>
-			<version>2.0-Beta1-SNAPSHOT</version>
+			<version>2.0-Beta1</version>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-web-javascript-dojo</artifactId>
-			<version>2.0-Beta1-SNAPSHOT</version>
+			<version>2.0-Beta1</version>
 		</dependency>		
 
 		<dependency>
diff --git a/modules/implementation-widget-runtime/pom.xml b/modules/implementation-widget-runtime/pom.xml
index 3ce6e18..85a630a 100644
--- a/modules/implementation-widget-runtime/pom.xml
+++ b/modules/implementation-widget-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,25 +33,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-web-javascript</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>           
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
        <dependency>
diff --git a/modules/implementation-widget/pom.xml b/modules/implementation-widget/pom.xml
index 8329c50..6112910 100644
--- a/modules/implementation-widget/pom.xml
+++ b/modules/implementation-widget/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,25 +33,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>        
 
         <dependency>
diff --git a/modules/interface-java-jaxrs/pom.xml b/modules/interface-java-jaxrs/pom.xml
index 9ec40b1..ea87605 100644
--- a/modules/interface-java-jaxrs/pom.xml
+++ b/modules/interface-java-jaxrs/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-interface-java-jaxrs</artifactId>
@@ -38,13 +38,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
diff --git a/modules/interface-java-jaxws/pom.xml b/modules/interface-java-jaxws/pom.xml
index b8ae1b2..afa387b 100644
--- a/modules/interface-java-jaxws/pom.xml
+++ b/modules/interface-java-jaxws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
diff --git a/modules/interface-java/pom.xml b/modules/interface-java/pom.xml
index a06ffa9..2dbe6fe 100644
--- a/modules/interface-java/pom.xml
+++ b/modules/interface-java/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>              
 
     </dependencies>
diff --git a/modules/interface-wsdl/pom.xml b/modules/interface-wsdl/pom.xml
index 425ad21..4ec8904 100644
--- a/modules/interface-wsdl/pom.xml
+++ b/modules/interface-wsdl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-interface-wsdl</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
@@ -56,13 +56,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <!-- dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency-->        
 
diff --git a/modules/launcher/pom.xml b/modules/launcher/pom.xml
index 8569992..ba26dff 100644
--- a/modules/launcher/pom.xml
+++ b/modules/launcher/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/monitor/pom.xml b/modules/monitor/pom.xml
index b0facbf..c9304d5 100644
--- a/modules/monitor/pom.xml
+++ b/modules/monitor/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/myfaces/pom.xml b/modules/myfaces/pom.xml
index 586d4d7..3eea406 100644
--- a/modules/myfaces/pom.xml
+++ b/modules/myfaces/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
diff --git a/modules/node-api/pom.xml b/modules/node-api/pom.xml
index 2d8df2a..da4e8f4 100644
--- a/modules/node-api/pom.xml
+++ b/modules/node-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
     </dependencies>
 
diff --git a/modules/node-impl-osgi/pom.xml b/modules/node-impl-osgi/pom.xml
index c43a5b1..192ca51 100644
--- a/modules/node-impl-osgi/pom.xml
+++ b/modules/node-impl-osgi/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -73,40 +73,40 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-osgi-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
@@ -114,7 +114,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 -->
diff --git a/modules/node-impl/pom.xml b/modules/node-impl/pom.xml
index a7133d1..3d86771 100644
--- a/modules/node-impl/pom.xml
+++ b/modules/node-impl/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,78 +35,78 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>          
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-deployment</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-builder</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
                
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>  
         
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>          
               
diff --git a/modules/node-launcher-equinox/pom.xml b/modules/node-launcher-equinox/pom.xml
index 17932e2..d11d5f7 100644
--- a/modules/node-launcher-equinox/pom.xml
+++ b/modules/node-launcher-equinox/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -75,33 +75,33 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
         <!-- dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency-->
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/modules/node-launcher/pom.xml b/modules/node-launcher/pom.xml
index 7a8c3f5..5f6f863 100644
--- a/modules/node-launcher/pom.xml
+++ b/modules/node-launcher/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/osgi-runtime-pom/pom.xml b/modules/osgi-runtime-pom/pom.xml
index 0bc7b71..b944a20 100644
--- a/modules/osgi-runtime-pom/pom.xml
+++ b/modules/osgi-runtime-pom/pom.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-modules</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-

-    <artifactId>tuscany-osgi-runtime-pom</artifactId>

-    <name>Apache Tuscany SCA OSGi Runtime POM</name>

-    <packaging>pom</packaging>

-

-    <!-- 

-         The dependencies required to run in an OSGi environment

-         also requires core and base runtimes

-    -->

-    <dependencies>

-

-        <dependency>

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

-            <artifactId>tuscany-contribution-osgi</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-extensibility-equinox</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

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

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-node-launcher-equinox</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-    </dependencies>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-modules</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>tuscany-osgi-runtime-pom</artifactId>
+    <name>Apache Tuscany SCA OSGi Runtime POM</name>
+    <packaging>pom</packaging>
+
+    <!-- 
+         The dependencies required to run in an OSGi environment
+         also requires core and base runtimes
+    -->
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-osgi</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-extensibility-equinox</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl-osgi</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-launcher-equinox</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/modules/policy-logging/pom.xml b/modules/policy-logging/pom.xml
index 1673694..946fdef 100644
--- a/modules/policy-logging/pom.xml
+++ b/modules/policy-logging/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy-logging</artifactId>
@@ -33,19 +33,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
     </dependencies>
diff --git a/modules/policy-security/pom.xml b/modules/policy-security/pom.xml
index 29c207b..d5420b2 100644
--- a/modules/policy-security/pom.xml
+++ b/modules/policy-security/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy-security</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
diff --git a/modules/policy-transaction-runtime-geronimo/pom.xml b/modules/policy-transaction-runtime-geronimo/pom.xml
index b5a4bc6..89cc838 100644
--- a/modules/policy-transaction-runtime-geronimo/pom.xml
+++ b/modules/policy-transaction-runtime-geronimo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy-transaction-runtime-geronimo</artifactId>
@@ -32,25 +32,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-transaction-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
diff --git a/modules/policy-transaction-runtime/pom.xml b/modules/policy-transaction-runtime/pom.xml
index 00c7ac3..af0a14c 100644
--- a/modules/policy-transaction-runtime/pom.xml
+++ b/modules/policy-transaction-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy-transaction-runtime</artifactId>
@@ -32,25 +32,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-transaction</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
diff --git a/modules/policy-transaction/pom.xml b/modules/policy-transaction/pom.xml
index 6e9414d..16932cc 100644
--- a/modules/policy-transaction/pom.xml
+++ b/modules/policy-transaction/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy-transaction</artifactId>
@@ -32,19 +32,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
     </dependencies>
 
diff --git a/modules/policy-wspolicy/pom.xml b/modules/policy-wspolicy/pom.xml
index c37133e..0660043 100644
--- a/modules/policy-wspolicy/pom.xml
+++ b/modules/policy-wspolicy/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy-wspolicy</artifactId>
@@ -33,26 +33,26 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>        
 
         <dependency>
diff --git a/modules/pom.xml b/modules/pom.xml
index 449a7f6..f6c6b73 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-modules</artifactId>
diff --git a/modules/sca-api/pom.xml b/modules/sca-api/pom.xml
index 7fad9d0..86d5a6b 100644
--- a/modules/sca-api/pom.xml
+++ b/modules/sca-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>org.apache.tuscany.sca</groupId>
diff --git a/modules/sca-client-impl/pom.xml b/modules/sca-client-impl/pom.xml
index 93157c2..54475e8 100644
--- a/modules/sca-client-impl/pom.xml
+++ b/modules/sca-client-impl/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,12 +34,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
     </dependencies>
diff --git a/modules/shell/pom.xml b/modules/shell/pom.xml
index 66ac7aa..eb6b492 100644
--- a/modules/shell/pom.xml
+++ b/modules/shell/pom.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- *

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

- *

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.

--->

-<project>

-

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-modules</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-

-    <artifactId>tuscany-shell</artifactId>

-    <name>Apache Tuscany SCA Shell</name>

-

-    <dependencies>

- 

-        <dependency>

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

-            <artifactId>tuscany-domain-node</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>jline</groupId>

-            <artifactId>jline</artifactId>

-            <version>0.9.94</version>

-            <optional>true</optional>

-        </dependency>

-

-    </dependencies>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project>
+
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-modules</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>tuscany-shell</artifactId>
+    <name>Apache Tuscany SCA Shell</name>
+
+    <dependencies>
+ 
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-domain-node</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>jline</groupId>
+            <artifactId>jline</artifactId>
+            <version>0.9.94</version>
+            <optional>true</optional>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/modules/stripes/pom.xml b/modules/stripes/pom.xml
index 7c692b3..5990b1f 100644
--- a/modules/stripes/pom.xml
+++ b/modules/stripes/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>provided</scope>
         </dependency>
         
diff --git a/modules/tracing-aspectj/pom.xml b/modules/tracing-aspectj/pom.xml
index 7d6321c..41a22be 100644
--- a/modules/tracing-aspectj/pom.xml
+++ b/modules/tracing-aspectj/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-tracing-aspectj</artifactId>
diff --git a/modules/web-javascript-dojo/pom.xml b/modules/web-javascript-dojo/pom.xml
index 7a295e3..7839bfe 100644
--- a/modules/web-javascript-dojo/pom.xml
+++ b/modules/web-javascript-dojo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,25 +33,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-common-http</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
 		<dependency>
diff --git a/modules/web-javascript/pom.xml b/modules/web-javascript/pom.xml
index 80db0cf..6b94477 100644
--- a/modules/web-javascript/pom.xml
+++ b/modules/web-javascript/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
diff --git a/modules/wink/pom.xml b/modules/wink/pom.xml
index 6d943c6..34429e8 100644
--- a/modules/wink/pom.xml
+++ b/modules/wink/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/modules/xsd/pom.xml b/modules/xsd/pom.xml
index 42972bc..7deef7d 100644
--- a/modules/xsd/pom.xml
+++ b/modules/xsd/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
     </dependencies>
 
diff --git a/pom.xml b/pom.xml
index 45029ad..259425f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
     <packaging>pom</packaging>
     <name>Apache Tuscany SCA Implementation Project (2.x)</name>
     <url>http://tuscany.apache.org</url>
-    <version>2.0-Beta1-SNAPSHOT</version>
+    <version>2.0-Beta1</version>
 
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk</connection>
@@ -488,7 +488,7 @@
                     <plugin>
                         <groupId>org.apache.tuscany.sca</groupId>
                         <artifactId>tuscany-maven-dependency-lister</artifactId>
-                        <version>2.0-Beta1-SNAPSHOT</version>
+                        <version>2.0-Beta1</version>
                         <executions>
                             <execution>
                                 <phase>process-resources</phase>
diff --git a/samples/applications/logging-scribe/helloworld-scribe/pom.xml b/samples/applications/logging-scribe/helloworld-scribe/pom.xml
index eaf7c44..64f2175 100644
--- a/samples/applications/logging-scribe/helloworld-scribe/pom.xml
+++ b/samples/applications/logging-scribe/helloworld-scribe/pom.xml
@@ -1,96 +1,96 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

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

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

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

-    * 

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

-    * 

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

-    * software distributed under the License is distributed on an

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

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

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-

-    <packaging>jar</packaging>

-    <artifactId>sample-logging-scribe</artifactId>

-    <name>Apache Tuscany SCA Scribe Logging Sample</name>

-

-    <dependencies>

-        <dependency>

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

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

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

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

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

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

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

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.thrift</groupId>

-            <artifactId>libthrift</artifactId>

-            <version>1.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.slf4j</groupId>

-            <artifactId>slf4j-api</artifactId>

-            <version>1.6.0</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.slf4j</groupId>

-            <artifactId>slf4j-simple</artifactId>

-            <version>1.6.0</version>

-        </dependency>

-

-        <dependency>

-            <groupId>commons-lang</groupId>

-            <artifactId>commons-lang</artifactId>

-            <version>2.4</version>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-

-    <build>

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

-       <plugins>

-         <plugin>

-             <groupId>org.apache.tuscany.maven.plugins</groupId>

-             <artifactId>maven-tuscany-plugin</artifactId>

-             <version>2.0-Beta1-SNAPSHOT</version>

-         </plugin>

-       </plugins>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <packaging>jar</packaging>
+    <artifactId>sample-logging-scribe</artifactId>
+    <name>Apache Tuscany SCA Scribe Logging Sample</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-api</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.thrift</groupId>
+            <artifactId>libthrift</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.6.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.6.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+       <plugins>
+         <plugin>
+             <groupId>org.apache.tuscany.maven.plugins</groupId>
+             <artifactId>maven-tuscany-plugin</artifactId>
+             <version>2.0-Beta1</version>
+         </plugin>
+       </plugins>
+    </build>
+</project>
diff --git a/samples/applications/logging-scribe/pom.xml b/samples/applications/logging-scribe/pom.xml
index aa399db..6633a4d 100644
--- a/samples/applications/logging-scribe/pom.xml
+++ b/samples/applications/logging-scribe/pom.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-    <artifactId>tuscany-sample-logging-scribe</artifactId>

-    <packaging>pom</packaging>

-    <name>Apache Tuscany SCA Sample Logging Scribe</name>

-

-    <profiles>

-        <profile>

-            <id>default</id>

-            <activation>

-                <activeByDefault>true</activeByDefault>

-            </activation>

-            <modules>

-                <!--module>helloworld-scribe</module-->

-            </modules>

-        </profile>

-    </profiles>    

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-sample-logging-scribe</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Tuscany SCA Sample Logging Scribe</name>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <!--module>helloworld-scribe</module-->
+            </modules>
+        </profile>
+    </profiles>    
+</project>
diff --git a/samples/applications/pom.xml b/samples/applications/pom.xml
index 58aebd8..cdd34b6 100644
--- a/samples/applications/pom.xml
+++ b/samples/applications/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-samples-applications</artifactId>
diff --git a/samples/applications/store-webapp/pom.xml b/samples/applications/store-webapp/pom.xml
index 258b7c7..047271b 100644
--- a/samples/applications/store-webapp/pom.xml
+++ b/samples/applications/store-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-store-webapp</artifactId>
@@ -33,20 +33,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-web20</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
diff --git a/samples/applications/store/pom.xml b/samples/applications/store/pom.xml
index 5437634..24628a6 100644
--- a/samples/applications/store/pom.xml
+++ b/samples/applications/store/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-store</artifactId>
@@ -32,20 +32,20 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-node-impl</artifactId>
-			<version>2.0-Beta1-SNAPSHOT</version>
+			<version>2.0-Beta1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-data-api</artifactId>
-			<version>2.0-Beta1-SNAPSHOT</version>
+			<version>2.0-Beta1</version>
 		</dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-web20</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
diff --git a/samples/extending-tuscany/binding-sample/pom.xml b/samples/extending-tuscany/binding-sample/pom.xml
index 175c6ab..6ac9cee 100644
--- a/samples/extending-tuscany/binding-sample/pom.xml
+++ b/samples/extending-tuscany/binding-sample/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -34,14 +34,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>provided</scope>
         </dependency>   
                 
@@ -55,28 +55,28 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>    
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/samples/extending-tuscany/implementation-sample/pom.xml b/samples/extending-tuscany/implementation-sample/pom.xml
index 747633d..00f44f7 100644
--- a/samples/extending-tuscany/implementation-sample/pom.xml
+++ b/samples/extending-tuscany/implementation-sample/pom.xml
@@ -1,79 +1,79 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-    <artifactId>sample-implementation-extension</artifactId>

-    <name>Apache Tuscany SCA Sample Implementation Extension</name>

-    <packaging>jar</packaging>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-feature-api</artifactId>

-            <type>pom</type>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>  

-        

-        <dependency>

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

-            <artifactId>tuscany-feature-core</artifactId>

-            <type>pom</type>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency> 

-        

-        <dependency>

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

-            <artifactId>tuscany-feature-webservice</artifactId>

-            <type>pom</type>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-feature-web20</artifactId>

-            <type>pom</type>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

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

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

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

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

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>sample-implementation-extension</artifactId>
+    <name>Apache Tuscany SCA Sample Implementation Extension</name>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-api</artifactId>
+            <type>pom</type>
+            <version>2.0-Beta1</version>
+        </dependency>  
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-core</artifactId>
+            <type>pom</type>
+            <version>2.0-Beta1</version>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-webservice</artifactId>
+            <type>pom</type>
+            <version>2.0-Beta1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-web20</artifactId>
+            <type>pom</type>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-webapp</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/samples/extending-tuscany/pom.xml b/samples/extending-tuscany/pom.xml
index 2fcb8d9..b5f3088 100644
--- a/samples/extending-tuscany/pom.xml
+++ b/samples/extending-tuscany/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/samples/getting-started/callback-api/pom.xml b/samples/getting-started/callback-api/pom.xml
index b2139bf..4860154 100644
--- a/samples/getting-started/callback-api/pom.xml
+++ b/samples/getting-started/callback-api/pom.xml
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

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

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

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

-    * 

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

-    * 

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

-    * software distributed under the License is distributed on an

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

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

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-    <artifactId>sample-callback-api-contribution</artifactId>

-    <name>Apache Tuscany SCA Sample Callback API Contribution</name>

-

-    <dependencies>

-        <dependency>

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

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

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

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

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

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

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

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

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-    </dependencies>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>sample-callback-api-contribution</artifactId>
+    <name>Apache Tuscany SCA Sample Callback API Contribution</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-api</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/samples/getting-started/helloworld-contribution/pom.xml b/samples/getting-started/helloworld-contribution/pom.xml
index bcae290..c60fea4 100644
--- a/samples/getting-started/helloworld-contribution/pom.xml
+++ b/samples/getting-started/helloworld-contribution/pom.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

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

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

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

-    * 

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

-    * 

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

-    * software distributed under the License is distributed on an

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

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

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-

-    <packaging>jar</packaging>

-    <artifactId>sample-helloworld-contribution</artifactId>

-    <name>Apache Tuscany SCA Samples - Getting Started - helloworld-contribution</name>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-base-runtime-pom</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <type>pom</type>

-        </dependency>

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-

-    <build>

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

-       <plugins>

-         <plugin>

-             <groupId>org.apache.tuscany.maven.plugins</groupId>

-             <artifactId>maven-tuscany-plugin</artifactId>

-             <version>2.0-Beta1-SNAPSHOT</version>

-         </plugin>

-       </plugins>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <packaging>jar</packaging>
+    <artifactId>sample-helloworld-contribution</artifactId>
+    <name>Apache Tuscany SCA Samples - Getting Started - helloworld-contribution</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-base-runtime-pom</artifactId>
+            <version>2.0-Beta1</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+       <plugins>
+         <plugin>
+             <groupId>org.apache.tuscany.maven.plugins</groupId>
+             <artifactId>maven-tuscany-plugin</artifactId>
+             <version>2.0-Beta1</version>
+         </plugin>
+       </plugins>
+    </build>
+</project>
diff --git a/samples/getting-started/helloworld-webapp/pom.xml b/samples/getting-started/helloworld-webapp/pom.xml
index ebb470a..f5cbad5 100644
--- a/samples/getting-started/helloworld-webapp/pom.xml
+++ b/samples/getting-started/helloworld-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
         </dependency>         
 
diff --git a/samples/getting-started/pom.xml b/samples/getting-started/pom.xml
index c9b74d0..3f229a4 100644
--- a/samples/getting-started/pom.xml
+++ b/samples/getting-started/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-samples-getting-started-contributions</artifactId>
diff --git a/samples/getting-started/sca-scopes/pom.xml b/samples/getting-started/sca-scopes/pom.xml
index f2555c2..c872373 100644
--- a/samples/getting-started/sca-scopes/pom.xml
+++ b/samples/getting-started/sca-scopes/pom.xml
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

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

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

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

-    * 

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

-    * 

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

-    * software distributed under the License is distributed on an

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

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

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-    <name>Apache Tuscany SCA Sample SCA Scopes Contribution</name>

-    <artifactId>sample-sca-scopes-contribution</artifactId>

-

-    <dependencies>

-         <dependency>

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

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

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

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

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

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

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

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

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-    </dependencies>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <name>Apache Tuscany SCA Sample SCA Scopes Contribution</name>
+    <artifactId>sample-sca-scopes-contribution</artifactId>
+
+    <dependencies>
+         <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-api</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/samples/getting-started/scdl-include-contribution/pom.xml b/samples/getting-started/scdl-include-contribution/pom.xml
index 4dc78b8..9ae0682 100644
--- a/samples/getting-started/scdl-include-contribution/pom.xml
+++ b/samples/getting-started/scdl-include-contribution/pom.xml
@@ -1,76 +1,76 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

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

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

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

-    * 

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

-    * 

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

-    * software distributed under the License is distributed on an

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

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

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-

-    <packaging>zip</packaging>

-    <artifactId>sample-scdl-include-contribution</artifactId>

-    <name>Apache Tuscany SCA Sample include Composite Contribution</name>

-

-    <dependencies>

-        <dependency>

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

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

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>provided</scope>

-        </dependency>

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-

-    <build>

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

-

-       <plugins>

-

-         <!-- plugin to support zip packaging for SCA contributions -->

-         <plugin>

-            <groupId>org.apache.tuscany.maven.plugins</groupId>

-            <artifactId>maven-zip-plugin</artifactId>

-            <version>alpha2</version>

-            <extensions>true</extensions>

-         </plugin>

-

-         <!-- plugin to support using mvn tuscany:run to run this contribution -->

-         <plugin>

-             <groupId>org.apache.tuscany.maven.plugins</groupId>

-             <artifactId>maven-tuscany-plugin</artifactId>

-             <version>2.0-Beta1-SNAPSHOT</version>

-             <configuration>

-                <contributions>

-                   <!-- add the dependee contribution that this contribution uses -->

-                   <param>..\helloworld-contribution\target\helloworld-contribution.jar</param>

-                </contributions>

-             </configuration>

-         </plugin>

-

-       </plugins>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <packaging>zip</packaging>
+    <artifactId>sample-scdl-include-contribution</artifactId>
+    <name>Apache Tuscany SCA Sample include Composite Contribution</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+
+       <plugins>
+
+         <!-- plugin to support zip packaging for SCA contributions -->
+         <plugin>
+            <groupId>org.apache.tuscany.maven.plugins</groupId>
+            <artifactId>maven-zip-plugin</artifactId>
+            <version>alpha2</version>
+            <extensions>true</extensions>
+         </plugin>
+
+         <!-- plugin to support using mvn tuscany:run to run this contribution -->
+         <plugin>
+             <groupId>org.apache.tuscany.maven.plugins</groupId>
+             <artifactId>maven-tuscany-plugin</artifactId>
+             <version>2.0-Beta1</version>
+             <configuration>
+                <contributions>
+                   <!-- add the dependee contribution that this contribution uses -->
+                   <param>..\helloworld-contribution\target\helloworld-contribution.jar</param>
+                </contributions>
+             </configuration>
+         </plugin>
+
+       </plugins>
+    </build>
+</project>
diff --git a/samples/learning-more/async/calculator-contribution/pom.xml b/samples/learning-more/async/calculator-contribution/pom.xml
index 22312d8..4e35c33 100644
--- a/samples/learning-more/async/calculator-contribution/pom.xml
+++ b/samples/learning-more/async/calculator-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-implementation-java-calculator-async-contribution</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-api</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
        
         <dependency>
@@ -50,7 +50,7 @@
          <plugin>
              <groupId>org.apache.tuscany.maven.plugins</groupId>
              <artifactId>maven-tuscany-plugin</artifactId>
-             <version>2.0-Beta1-SNAPSHOT</version>
+             <version>2.0-Beta1</version>
          </plugin>
        </plugins>
     </build>
diff --git a/samples/learning-more/async/pom.xml b/samples/learning-more/async/pom.xml
index 1b6ff7a..0672d09 100644
--- a/samples/learning-more/async/pom.xml
+++ b/samples/learning-more/async/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-tuscany-async</artifactId>
diff --git a/samples/learning-more/binding-comet/pom.xml b/samples/learning-more/binding-comet/pom.xml
index b1a15e3..f4d445c 100644
--- a/samples/learning-more/binding-comet/pom.xml
+++ b/samples/learning-more/binding-comet/pom.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-    <artifactId>tuscany-sample-binding-comet</artifactId>

-    <packaging>pom</packaging>

-    <name>Apache Tuscany SCA Sample binding.comet</name>

-

-    <profiles>

-        <profile>

-            <id>default</id>

-            <activation>

-                <activeByDefault>true</activeByDefault>

-            </activation>

-            <modules>

-                <module>weather-webapp</module>

-            </modules>

-        </profile>

-    </profiles>    

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-sample-binding-comet</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Tuscany SCA Sample binding.comet</name>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>weather-webapp</module>
+            </modules>
+        </profile>
+    </profiles>    
+</project>
diff --git a/samples/learning-more/binding-comet/weather-webapp/pom.xml b/samples/learning-more/binding-comet/weather-webapp/pom.xml
index 7ea814c..33c2da8 100644
--- a/samples/learning-more/binding-comet/weather-webapp/pom.xml
+++ b/samples/learning-more/binding-comet/weather-webapp/pom.xml
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- *

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

- *

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.

--->

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

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

-		<artifactId>tuscany-samples</artifactId>

-		<version>2.0-Beta1-SNAPSHOT</version>

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

-	</parent>

-

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

-	<artifactId>sample-binding-comet-weather-webapp</artifactId>

-	<packaging>war</packaging>

-	<version>1.0</version>

-	<name>Apache Tuscany SCA Sample binding.comet Weather Webapp</name>

-

-	<dependencies>

-		<dependency>

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

-			<artifactId>tuscany-base-runtime</artifactId>

-			<version>2.0-Beta1-SNAPSHOT</version>

-		</dependency>

-		<dependency>

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

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

-			<version>2.0-Beta1-SNAPSHOT</version>

-		</dependency>

-		<dependency>

-			<groupId>javax</groupId>

-			<artifactId>javaee-web-api</artifactId>

-			<version>6.0</version>

-			<scope>provided</scope>

-		</dependency>

-	</dependencies>

-	

-</project>

-

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.apache.tuscany.sca</groupId>
+		<artifactId>tuscany-samples</artifactId>
+		<version>2.0-Beta1</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<groupId>org.apache.tuscany.sca</groupId>
+	<artifactId>sample-binding-comet-weather-webapp</artifactId>
+	<packaging>war</packaging>
+	<version>1.0</version>
+	<name>Apache Tuscany SCA Sample binding.comet Weather Webapp</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-base-runtime</artifactId>
+			<version>2.0-Beta1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-binding-comet-runtime</artifactId>
+			<version>2.0-Beta1</version>
+		</dependency>
+		<dependency>
+			<groupId>javax</groupId>
+			<artifactId>javaee-web-api</artifactId>
+			<version>6.0</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+	
+</project>
+
diff --git a/samples/learning-more/binding-jms/helloworld-webapp/pom.xml b/samples/learning-more/binding-jms/helloworld-webapp/pom.xml
index 59ff823..b0660de 100644
--- a/samples/learning-more/binding-jms/helloworld-webapp/pom.xml
+++ b/samples/learning-more/binding-jms/helloworld-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -35,12 +35,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
diff --git a/samples/learning-more/binding-jms/pom.xml b/samples/learning-more/binding-jms/pom.xml
index 8a22c50..2a329e4 100644
--- a/samples/learning-more/binding-jms/pom.xml
+++ b/samples/learning-more/binding-jms/pom.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

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

-    <packaging>pom</packaging>

-    <name>Apache Tuscany SCA Sample binding.jms</name>

-

-    <profiles>

-        <profile>

-            <id>default</id>

-            <activation>

-                <activeByDefault>true</activeByDefault>

-            </activation>

-            <modules>

-                <module>helloworld-webapp</module>

-            </modules>

-        </profile>

-    </profiles>    

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-sample-binding-jms</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Tuscany SCA Sample binding.jms</name>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>helloworld-webapp</module>
+            </modules>
+        </profile>
+    </profiles>    
+</project>
diff --git a/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml b/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml
index 0c0c31c..f29d8a4 100644
--- a/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml
+++ b/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

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

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

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

-    * 

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

-    * 

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

-    * software distributed under the License is distributed on an

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

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

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-    <artifactId>sample-binding-jsonrpc-calculator-contribution</artifactId>

-    <name>Apache Tuscany SCA Sample binding.jsonrpc Calculator Contribution</name>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-feature-api</artifactId>

-            <type>pom</type>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency> 

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

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

-       <plugins>

-          <plugin>

-             <groupId>org.apache.tuscany.maven.plugins</groupId>

-             <artifactId>maven-tuscany-plugin</artifactId>

-             <version>2.0-Beta1-SNAPSHOT</version>

-          </plugin>

-       </plugins>

-   </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>sample-binding-jsonrpc-calculator-contribution</artifactId>
+    <name>Apache Tuscany SCA Sample binding.jsonrpc Calculator Contribution</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-api</artifactId>
+            <type>pom</type>
+            <version>2.0-Beta1</version>
+        </dependency> 
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+       <plugins>
+          <plugin>
+             <groupId>org.apache.tuscany.maven.plugins</groupId>
+             <artifactId>maven-tuscany-plugin</artifactId>
+             <version>2.0-Beta1</version>
+          </plugin>
+       </plugins>
+   </build>
+</project>
diff --git a/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml b/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml
index a0584eb..8ef115b 100644
--- a/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml
+++ b/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml
@@ -1,126 +1,126 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

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

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

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

-    * 

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

-    * 

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

-    * software distributed under the License is distributed on an

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

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

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

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

-    <name>Apache Tuscany SCA Sample binding.jsonrpc Calculator WebApp</name>

-    <packaging>war</packaging>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-feature-api</artifactId>

-            <type>pom</type>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency> 

-

-        <dependency>

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

-            <artifactId>tuscany-feature-webapp</artifactId>

-            <type>pom</type>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency> 

-

-        <dependency>

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

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

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-databinding-json</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>  

-        

-        <dependency>

-           <groupId>org.dojotoolkit</groupId>

-           <artifactId>dojo</artifactId>

-           <version>1.3.0</version>

-           <type>zip</type>

-        </dependency>                  

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

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

-       <plugins>

-          <plugin>

-             <groupId>org.apache.tuscany.maven.plugins</groupId>

-             <artifactId>maven-tuscany-plugin</artifactId>

-             <version>2.0-Beta1-SNAPSHOT</version>

-          </plugin>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-antrun-plugin</artifactId>

-                <executions>

-                    <execution>

-                        <id>copy-dojo-files</id>

-                        <phase>generate-resources</phase>

-                        <goals>

-                            <goal>run</goal>

-                        </goals>

-                        <configuration>

-                            <tasks>

-                                <ant antfile="./build-dojo.xml" target="unpack-dojo-files">

-                                    <property name="localRepository" value="${settings.localRepository}"/>

-                                    <property name="artifactId" value="${artifactId}"/>

-                                </ant>

-                            </tasks>

-                        </configuration>

-                    </execution>

-                    <execution>

-                        <id>clean-dojo-files</id>

-                        <phase>clean</phase>

-                        <goals>

-                            <goal>run</goal>

-                        </goals>

-                        <configuration>

-                            <tasks>

-                                <ant antfile="./build-dojo.xml" target="clean-dojo-files">

-                                    <property name="localRepository" value="${settings.localRepository}"/>

-                                    <property name="artifactId" value="${artifactId}"/>

-                                </ant>

-                            </tasks>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>          

-          <plugin>

-             <groupId>org.mortbay.jetty</groupId>

-             <artifactId>maven-jetty-plugin</artifactId>

-             <version>6.1.18</version>

-          </plugin>

-       </plugins>

-   </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>sample-binding-jsonrpc-calculator-webapp</artifactId>
+    <name>Apache Tuscany SCA Sample binding.jsonrpc Calculator WebApp</name>
+    <packaging>war</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-api</artifactId>
+            <type>pom</type>
+            <version>2.0-Beta1</version>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-webapp</artifactId>
+            <type>pom</type>
+            <version>2.0-Beta1</version>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-json</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>  
+        
+        <dependency>
+           <groupId>org.dojotoolkit</groupId>
+           <artifactId>dojo</artifactId>
+           <version>1.3.0</version>
+           <type>zip</type>
+        </dependency>                  
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+       <plugins>
+          <plugin>
+             <groupId>org.apache.tuscany.maven.plugins</groupId>
+             <artifactId>maven-tuscany-plugin</artifactId>
+             <version>2.0-Beta1</version>
+          </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dojo-files</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <ant antfile="./build-dojo.xml" target="unpack-dojo-files">
+                                    <property name="localRepository" value="${settings.localRepository}"/>
+                                    <property name="artifactId" value="${artifactId}"/>
+                                </ant>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>clean-dojo-files</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <ant antfile="./build-dojo.xml" target="clean-dojo-files">
+                                    <property name="localRepository" value="${settings.localRepository}"/>
+                                    <property name="artifactId" value="${artifactId}"/>
+                                </ant>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>          
+          <plugin>
+             <groupId>org.mortbay.jetty</groupId>
+             <artifactId>maven-jetty-plugin</artifactId>
+             <version>6.1.18</version>
+          </plugin>
+       </plugins>
+   </build>
+</project>
diff --git a/samples/learning-more/binding-jsonrpc/pom.xml b/samples/learning-more/binding-jsonrpc/pom.xml
index aa37b2f..37ac74b 100644
--- a/samples/learning-more/binding-jsonrpc/pom.xml
+++ b/samples/learning-more/binding-jsonrpc/pom.xml
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

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

-    <packaging>pom</packaging>

-    <name>Apache Tuscany SCA Sample binding.jsonrpc</name>

-

-    <profiles>

-        <profile>

-            <id>default</id>

-            <activation>

-                <activeByDefault>true</activeByDefault>

-            </activation>

-            <modules>

-                <module>calculator-contribution</module>

-                <module>calculator-webapp</module>

-            </modules>

-        </profile>

-    </profiles>    

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-sample-binding-jsonrpc</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Tuscany SCA Sample binding.jsonrpc</name>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>calculator-contribution</module>
+                <module>calculator-webapp</module>
+            </modules>
+        </profile>
+    </profiles>    
+</project>
diff --git a/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml b/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml
index 014488e..5040e49 100644
--- a/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml
+++ b/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-binding-rmi-calculator-reference-contribution</artifactId>
@@ -32,24 +32,24 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -66,7 +66,7 @@
          <plugin>
              <groupId>org.apache.tuscany.maven.plugins</groupId>
              <artifactId>maven-tuscany-plugin</artifactId>
-             <version>2.0-Beta1-SNAPSHOT</version>
+             <version>2.0-Beta1</version>
          </plugin>
        </plugins>
     </build>
diff --git a/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml b/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml
index 31facd3..84ed2d7 100644
--- a/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml
+++ b/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-binding-rmi-calculator-service-contribution</artifactId>
@@ -32,24 +32,24 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -66,7 +66,7 @@
          <plugin>
              <groupId>org.apache.tuscany.maven.plugins</groupId>
              <artifactId>maven-tuscany-plugin</artifactId>
-             <version>2.0-Beta1-SNAPSHOT</version>
+             <version>2.0-Beta1</version>
          </plugin>
        </plugins>
     </build>
diff --git a/samples/learning-more/binding-rmi/pom.xml b/samples/learning-more/binding-rmi/pom.xml
index 75d8112..5267045 100644
--- a/samples/learning-more/binding-rmi/pom.xml
+++ b/samples/learning-more/binding-rmi/pom.xml
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

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

-    <packaging>pom</packaging>

-    <name>Apache Tuscany SCA Sample binding.rmi</name>

-

-    <profiles>

-        <profile>

-            <id>default</id>

-            <activation>

-                <activeByDefault>true</activeByDefault>

-            </activation>

-            <modules>

-                <module>calculator-reference-contribution</module>

-                <module>calculator-service-contribution</module>

-            </modules>

-        </profile>

-    </profiles>    

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-sample-binding-rmi</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Tuscany SCA Sample binding.rmi</name>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>calculator-reference-contribution</module>
+                <module>calculator-service-contribution</module>
+            </modules>
+        </profile>
+    </profiles>    
+</project>
diff --git a/samples/learning-more/binding-sca/calculator-contribution/pom.xml b/samples/learning-more/binding-sca/calculator-contribution/pom.xml
index d49c31c..aa95b0b 100644
--- a/samples/learning-more/binding-sca/calculator-contribution/pom.xml
+++ b/samples/learning-more/binding-sca/calculator-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-binding-sca-calculator-contribution</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-api</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency> 
 
         <dependency>
@@ -51,7 +51,7 @@
           <plugin>
              <groupId>org.apache.tuscany.maven.plugins</groupId>
              <artifactId>maven-tuscany-plugin</artifactId>
-             <version>2.0-Beta1-SNAPSHOT</version>
+             <version>2.0-Beta1</version>
           </plugin>
        </plugins>
    </build>
diff --git a/samples/learning-more/binding-sca/pom.xml b/samples/learning-more/binding-sca/pom.xml
index 218266e..3a64113 100644
--- a/samples/learning-more/binding-sca/pom.xml
+++ b/samples/learning-more/binding-sca/pom.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

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

-    <packaging>pom</packaging>

-    <name>Apache Tuscany SCA Sample binding.sca</name>

-

-    <profiles>

-        <profile>

-            <id>default</id>

-            <activation>

-                <activeByDefault>true</activeByDefault>

-            </activation>

-            <modules>

-                <module>calculator-contribution</module>

-            </modules>

-        </profile>

-    </profiles>    

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-sample-binding-sca</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Tuscany SCA Sample binding.sca</name>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>calculator-contribution</module>
+            </modules>
+        </profile>
+    </profiles>    
+</project>
diff --git a/samples/learning-more/binding-ws/calculator-contribution/pom.xml b/samples/learning-more/binding-ws/calculator-contribution/pom.xml
index aa3152e..03fd49f 100644
--- a/samples/learning-more/binding-ws/calculator-contribution/pom.xml
+++ b/samples/learning-more/binding-ws/calculator-contribution/pom.xml
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

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

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

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

-    * 

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

-    * 

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

-    * software distributed under the License is distributed on an

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

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

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-    <artifactId>sample-binding-ws-calculator-contribution</artifactId>

-    <name>Apache Tuscany SCA Sample binding.ws Calculator Contribution</name>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-feature-api</artifactId>

-            <type>pom</type>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>     

-        

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

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

-

-       <plugins>

-       </plugins>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>sample-binding-ws-calculator-contribution</artifactId>
+    <name>Apache Tuscany SCA Sample binding.ws Calculator Contribution</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-api</artifactId>
+            <type>pom</type>
+            <version>2.0-Beta1</version>
+        </dependency>     
+        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+
+       <plugins>
+       </plugins>
+    </build>
+</project>
diff --git a/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml b/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml
index 8835255..7ec782f 100644
--- a/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml
+++ b/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-binding-ws-helloworld-ws-sdo-contribution</artifactId>
@@ -32,26 +32,26 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -79,14 +79,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -108,12 +108,12 @@
             <plugin>
                <groupId>org.apache.tuscany.maven.plugins</groupId>
                <artifactId>maven-tuscany-plugin</artifactId>
-               <version>2.0-Beta1-SNAPSHOT</version>
+               <version>2.0-Beta1</version>
                <dependencies>
                   <dependency>
                      <groupId>org.apache.tuscany.sca</groupId>
                      <artifactId>tuscany-databinding-sdo</artifactId>
-                     <version>2.0-Beta1-SNAPSHOT</version>
+                     <version>2.0-Beta1</version>
                   </dependency>
                </dependencies>
             </plugin>
diff --git a/samples/learning-more/binding-ws/pom.xml b/samples/learning-more/binding-ws/pom.xml
index 342741e..4661f84 100644
--- a/samples/learning-more/binding-ws/pom.xml
+++ b/samples/learning-more/binding-ws/pom.xml
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

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

-    <packaging>pom</packaging>

-    <name>Apache Tuscany SCA Sample binding.ws</name>

-

-    <profiles>

-        <profile>

-            <id>default</id>

-            <activation>

-                <activeByDefault>true</activeByDefault>

-            </activation>

-            <modules>

-                <module>calculator-contribution</module>

-                <!--module>helloworld-ws-sdo-contribution</module-->

-            </modules>

-        </profile>

-    </profiles>    

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-sample-binding-ws</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Tuscany SCA Sample binding.ws</name>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>calculator-contribution</module>
+                <!--module>helloworld-ws-sdo-contribution</module-->
+            </modules>
+        </profile>
+    </profiles>    
+</project>
diff --git a/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml b/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml
index 170d835..e3501ff 100644
--- a/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml
+++ b/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,21 +33,21 @@
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-all</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl-osgi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml b/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml
index c43aadb..25d53d1 100644
--- a/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml
+++ b/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,27 +33,27 @@
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-ejava</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
         </dependency>
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webservice</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
             <scope>runtime</scope>
         </dependency>
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl-osgi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/samples/learning-more/distributed-osgi/pom.xml b/samples/learning-more/distributed-osgi/pom.xml
index 94d98e9..abe0fd0 100644
--- a/samples/learning-more/distributed-osgi/pom.xml
+++ b/samples/learning-more/distributed-osgi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-samples-distributed-osgi</artifactId>
diff --git a/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml b/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml
index faa0c2e..1423cca 100644
--- a/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml
+++ b/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -61,12 +61,12 @@
          <plugin>
              <groupId>org.apache.tuscany.maven.plugins</groupId>
              <artifactId>maven-tuscany-plugin</artifactId>
-             <version>2.0-Beta1-SNAPSHOT</version>
+             <version>2.0-Beta1</version>
              <dependencies>
                 <dependency>
                    <groupId>org.apache.tuscany.sca</groupId>
                    <artifactId>tuscany-implementation-bpel-runtime</artifactId>
-                   <version>2.0-Beta1-SNAPSHOT</version>
+                   <version>2.0-Beta1</version>
                 </dependency>
              </dependencies>
          </plugin>
diff --git a/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/pom.xml b/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/pom.xml
index 70a4a4a..1be8232 100644
--- a/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/pom.xml
+++ b/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/pom.xml
@@ -1,160 +1,160 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-

-      <modelVersion>4.0.0</modelVersion>

-      <parent>

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

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-      </parent>

-

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

-      <packaging>war</packaging>

-      <name>Apache Tuscany SCA Sample implementation.bpel Helloworld WebApp</name>

-

-	<properties>

-		<tuscany.version>2.0-Beta1-SNAPSHOT</tuscany.version>

-		<jetty.version>6.1.18</jetty.version>

-	</properties>

-

-	<dependencies>

-		<!--  TUSCANY DEPENDENCIES -->

-            <dependency>

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

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

-               <version>${tuscany.version}</version>

-            </dependency>

-

-            <dependency>

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

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

-               <version>${tuscany.version}</version>

-               <scope>runtime</scope>

-            </dependency>

-

-            <dependency>

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

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

-               <version>${tuscany.version}</version>

-               <scope>runtime</scope>

-            </dependency>

-

-		<!--  JUNIT DEPENDENCY FOR TESTING -->

-		<dependency>

-			<groupId>junit</groupId>

-			<artifactId>junit</artifactId>

-			<version>4.8.1</version>

-			<scope>test</scope>

-		</dependency>

-

-		<!--  JETTY DEPENDENCIES FOR TESTING  -->

-		<dependency>

-			<groupId>org.mortbay.jetty</groupId>

-			<artifactId>jetty</artifactId>

-			<version>${jetty.version}</version>

-			<scope>provided</scope>

-		</dependency>

-		<dependency>

-			<groupId>org.mortbay.jetty</groupId>

-			<artifactId>jetty-util</artifactId>

-			<version>${jetty.version}</version>

-			<scope>provided</scope>

-		</dependency>

-		<dependency>

-			<groupId>org.mortbay.jetty</groupId>

-			<artifactId>jetty-management</artifactId>

-			<version>${jetty.version}</version>

-			<scope>provided</scope>

-		</dependency>

-	</dependencies>

-

-	<build>

-         <finalName>helloworld-bpel</finalName>

-

-         <plugins>

-            <plugin>

-              <groupId>org.apache.maven.plugins</groupId>

-              <artifactId>maven-dependency-plugin</artifactId>

-              <executions>

-                <execution>

-                  <id>unpack</id>

-                  <phase>compile</phase>

-                  <goals>

-                    <goal>unpack</goal>

-                  </goals>

-                  <configuration>

-                    <artifactItems>

-                      <artifactItem>

-                        <groupId>org.apache.ode</groupId>

-                        <artifactId>ode-dao-jpa-ojpa-derby</artifactId>

-                        <version>1.1.1</version>

-                        <type>zip</type>

-                        <overWrite>false</overWrite>

-                        <outputDirectory>${project.build.directory}/classes</outputDirectory>

-                        <includes>**/*</includes>

-                      </artifactItem>

-                    </artifactItems>

-                   </configuration>

-                </execution>

-              </executions>

-            </plugin>

-

-          <plugin>

-             <groupId>org.mortbay.jetty</groupId>

-             <artifactId>maven-jetty-plugin</artifactId>

-             <version>6.1.18</version>

-             <configuration>

-                <contextPath>helloworld-bpel</contextPath>

-                <stopKey>foo</stopKey>

-                <stopPort>9999</stopPort>

-             </configuration>

-             <executions>

-                <execution>

-                   <id>start-jetty</id>

-                   <phase>process-test-classes</phase>

-                   <goals>

-                       <goal>run</goal>

-                   </goals>

-                   <configuration>

-                       <scanIntervalSeconds>0</scanIntervalSeconds>

-                       <daemon>true</daemon>

-                       <connectors>

-                          <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">

-                             <port>8085</port>

-                          </connector>

-                       </connectors>

-                   </configuration>

-                </execution>

-                <execution>

-                   <id>stop-jetty</id>

-                   <phase>prepare-package</phase>

-                   <goals>

-                       <goal>stop</goal>

-                   </goals>

-                </execution>

-             </executions>

-          </plugin>

-

-         </plugins>

-	</build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+      <modelVersion>4.0.0</modelVersion>
+      <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../../pom.xml</relativePath>
+      </parent>
+
+      <artifactId>sample-implementation-bpel-helloworld-webapp</artifactId>
+      <packaging>war</packaging>
+      <name>Apache Tuscany SCA Sample implementation.bpel Helloworld WebApp</name>
+
+	<properties>
+		<tuscany.version>2.0-Beta1</tuscany.version>
+		<jetty.version>6.1.18</jetty.version>
+	</properties>
+
+	<dependencies>
+		<!--  TUSCANY DEPENDENCIES -->
+            <dependency>
+               <groupId>org.apache.tuscany.sca</groupId>
+               <artifactId>tuscany-sca-api</artifactId>
+               <version>${tuscany.version}</version>
+            </dependency>
+
+            <dependency>
+               <groupId>org.apache.tuscany.sca</groupId>
+               <artifactId>tuscany-implementation-web-runtime</artifactId>
+               <version>${tuscany.version}</version>
+               <scope>runtime</scope>
+            </dependency>
+
+            <dependency>
+               <groupId>org.apache.tuscany.sca</groupId>
+               <artifactId>tuscany-implementation-bpel-runtime</artifactId>
+               <version>${tuscany.version}</version>
+               <scope>runtime</scope>
+            </dependency>
+
+		<!--  JUNIT DEPENDENCY FOR TESTING -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.8.1</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!--  JETTY DEPENDENCIES FOR TESTING  -->
+		<dependency>
+			<groupId>org.mortbay.jetty</groupId>
+			<artifactId>jetty</artifactId>
+			<version>${jetty.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mortbay.jetty</groupId>
+			<artifactId>jetty-util</artifactId>
+			<version>${jetty.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mortbay.jetty</groupId>
+			<artifactId>jetty-management</artifactId>
+			<version>${jetty.version}</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+         <finalName>helloworld-bpel</finalName>
+
+         <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-dependency-plugin</artifactId>
+              <executions>
+                <execution>
+                  <id>unpack</id>
+                  <phase>compile</phase>
+                  <goals>
+                    <goal>unpack</goal>
+                  </goals>
+                  <configuration>
+                    <artifactItems>
+                      <artifactItem>
+                        <groupId>org.apache.ode</groupId>
+                        <artifactId>ode-dao-jpa-ojpa-derby</artifactId>
+                        <version>1.1.1</version>
+                        <type>zip</type>
+                        <overWrite>false</overWrite>
+                        <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                        <includes>**/*</includes>
+                      </artifactItem>
+                    </artifactItems>
+                   </configuration>
+                </execution>
+              </executions>
+            </plugin>
+
+          <plugin>
+             <groupId>org.mortbay.jetty</groupId>
+             <artifactId>maven-jetty-plugin</artifactId>
+             <version>6.1.18</version>
+             <configuration>
+                <contextPath>helloworld-bpel</contextPath>
+                <stopKey>foo</stopKey>
+                <stopPort>9999</stopPort>
+             </configuration>
+             <executions>
+                <execution>
+                   <id>start-jetty</id>
+                   <phase>process-test-classes</phase>
+                   <goals>
+                       <goal>run</goal>
+                   </goals>
+                   <configuration>
+                       <scanIntervalSeconds>0</scanIntervalSeconds>
+                       <daemon>true</daemon>
+                       <connectors>
+                          <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                             <port>8085</port>
+                          </connector>
+                       </connectors>
+                   </configuration>
+                </execution>
+                <execution>
+                   <id>stop-jetty</id>
+                   <phase>prepare-package</phase>
+                   <goals>
+                       <goal>stop</goal>
+                   </goals>
+                </execution>
+             </executions>
+          </plugin>
+
+         </plugins>
+	</build>
+</project>
diff --git a/samples/learning-more/implementation-bpel/pom.xml b/samples/learning-more/implementation-bpel/pom.xml
index 92d6334..a983531 100644
--- a/samples/learning-more/implementation-bpel/pom.xml
+++ b/samples/learning-more/implementation-bpel/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-samples-implememtation-bpel</artifactId>
diff --git a/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml b/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml
index dabdadd..47dcf5f 100644
--- a/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml
+++ b/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml
@@ -1,82 +1,82 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

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

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

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

-    *

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

-    *

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

-    * software distributed under the License is distributed on an

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

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

-    * specific language governing permissions and limitations

-    * under the License.

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-

-    <packaging>zip</packaging>

-    <artifactId>sample-implementation-composite-helloworld-ws-contribution</artifactId>

-    <name>Apache Tuscany SCA Sample implemenation.composite Helloworld WS Contribution</name>

-

-    <dependencies>

-        <dependency>

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

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

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>provided</scope>

-        </dependency>

-        <dependency>

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

-            <artifactId>sample-helloworld-contribution</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>provided</scope>

-        </dependency>

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-

-    <build>

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

-       <plugins>

-

-         <!-- plugin to support zip packaging for SCA contributions -->

-         <plugin>

-            <groupId>org.apache.tuscany.maven.plugins</groupId>

-            <artifactId>maven-zip-plugin</artifactId>

-            <version>alpha2</version>

-            <extensions>true</extensions>

-         </plugin>

-

-         <!-- plugin to support using mvn tuscany:run to run this contribution -->

-         <plugin>

-             <groupId>org.apache.tuscany.maven.plugins</groupId>

-             <artifactId>maven-tuscany-plugin</artifactId>

-             <version>2.0-Beta1-SNAPSHOT</version>

-             <configuration>

-                <contributions>

-                   <!-- add the dependee contribution that this contribution uses -->

-                   <param>..\helloworld-recursive\target\sample-helloworld-recursive.jar</param>

-                   <param>..\..\..\getting-started\helloworld\target\helloworld-contribution.jar</param>

-                </contributions>

-             </configuration>

-         </plugin>

-

-       </plugins>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <packaging>zip</packaging>
+    <artifactId>sample-implementation-composite-helloworld-ws-contribution</artifactId>
+    <name>Apache Tuscany SCA Sample implemenation.composite Helloworld WS Contribution</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>sample-helloworld-contribution</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+       <plugins>
+
+         <!-- plugin to support zip packaging for SCA contributions -->
+         <plugin>
+            <groupId>org.apache.tuscany.maven.plugins</groupId>
+            <artifactId>maven-zip-plugin</artifactId>
+            <version>alpha2</version>
+            <extensions>true</extensions>
+         </plugin>
+
+         <!-- plugin to support using mvn tuscany:run to run this contribution -->
+         <plugin>
+             <groupId>org.apache.tuscany.maven.plugins</groupId>
+             <artifactId>maven-tuscany-plugin</artifactId>
+             <version>2.0-Beta1</version>
+             <configuration>
+                <contributions>
+                   <!-- add the dependee contribution that this contribution uses -->
+                   <param>..\helloworld-recursive\target\sample-helloworld-recursive.jar</param>
+                   <param>..\..\..\getting-started\helloworld\target\helloworld-contribution.jar</param>
+                </contributions>
+             </configuration>
+         </plugin>
+
+       </plugins>
+    </build>
+</project>
diff --git a/samples/learning-more/implementation-composite/helloworld-recursive/pom.xml b/samples/learning-more/implementation-composite/helloworld-recursive/pom.xml
index 80c1506..0ae9245 100644
--- a/samples/learning-more/implementation-composite/helloworld-recursive/pom.xml
+++ b/samples/learning-more/implementation-composite/helloworld-recursive/pom.xml
@@ -1,76 +1,76 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

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

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

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

-    * 

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

-    * 

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

-    * software distributed under the License is distributed on an

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

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

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-

-    <packaging>zip</packaging>

-    <artifactId>sample-implementation-composite-helloworld-contribution</artifactId>

-    <name>Apache Tuscany SCA Sample implementation.composite Helloworld Contribution</name>

-

-    <dependencies>

-        <dependency>

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

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

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>provided</scope>

-        </dependency>

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-

-    <build>

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

-

-       <plugins>

-

-         <!-- plugin to support zip packaging for SCA contributions -->

-         <plugin>

-            <groupId>org.apache.tuscany.maven.plugins</groupId>

-            <artifactId>maven-zip-plugin</artifactId>

-            <version>alpha2</version>

-            <extensions>true</extensions>

-         </plugin>

-

-         <!-- plugin to support using mvn tuscany:run to run this contribution -->

-         <plugin>

-             <groupId>org.apache.tuscany.maven.plugins</groupId>

-             <artifactId>maven-tuscany-plugin</artifactId>

-             <version>2.0-Beta1-SNAPSHOT</version>

-             <configuration>

-                <contributions>

-                   <!-- add the dependee contribution that this contribution uses -->

-                   <param>..\helloworld\target\sample-helloworld.jar</param>

-                </contributions>

-             </configuration>

-         </plugin>

-

-       </plugins>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <packaging>zip</packaging>
+    <artifactId>sample-implementation-composite-helloworld-contribution</artifactId>
+    <name>Apache Tuscany SCA Sample implementation.composite Helloworld Contribution</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+
+       <plugins>
+
+         <!-- plugin to support zip packaging for SCA contributions -->
+         <plugin>
+            <groupId>org.apache.tuscany.maven.plugins</groupId>
+            <artifactId>maven-zip-plugin</artifactId>
+            <version>alpha2</version>
+            <extensions>true</extensions>
+         </plugin>
+
+         <!-- plugin to support using mvn tuscany:run to run this contribution -->
+         <plugin>
+             <groupId>org.apache.tuscany.maven.plugins</groupId>
+             <artifactId>maven-tuscany-plugin</artifactId>
+             <version>2.0-Beta1</version>
+             <configuration>
+                <contributions>
+                   <!-- add the dependee contribution that this contribution uses -->
+                   <param>..\helloworld\target\sample-helloworld.jar</param>
+                </contributions>
+             </configuration>
+         </plugin>
+
+       </plugins>
+    </build>
+</project>
diff --git a/samples/learning-more/implementation-composite/pom.xml b/samples/learning-more/implementation-composite/pom.xml
index 2910e9e..75ab3eb 100644
--- a/samples/learning-more/implementation-composite/pom.xml
+++ b/samples/learning-more/implementation-composite/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-samples-implememtation-composite</artifactId>
diff --git a/samples/learning-more/implementation-java/calculator-contribution/pom.xml b/samples/learning-more/implementation-java/calculator-contribution/pom.xml
index fed6d87..a67fe40 100644
--- a/samples/learning-more/implementation-java/calculator-contribution/pom.xml
+++ b/samples/learning-more/implementation-java/calculator-contribution/pom.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

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

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

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

-    * 

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

-    * 

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

-    * software distributed under the License is distributed on an

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

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

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-    <artifactId>sample-implementation-java-calculator-contribution</artifactId>

-    <name>Apache Tuscany SCA Sample implementation.java Calculator Contribution</name>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-feature-api</artifactId>

-            <type>pom</type>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-       

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

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

-       <plugins>

-         <plugin>

-             <groupId>org.apache.tuscany.maven.plugins</groupId>

-             <artifactId>maven-tuscany-plugin</artifactId>

-             <version>2.0-Beta1-SNAPSHOT</version>

-         </plugin>

-       </plugins>

-    </build>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>sample-implementation-java-calculator-contribution</artifactId>
+    <name>Apache Tuscany SCA Sample implementation.java Calculator Contribution</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-api</artifactId>
+            <type>pom</type>
+            <version>2.0-Beta1</version>
+        </dependency>
+       
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <finalName>${artifactId}</finalName>
+       <plugins>
+         <plugin>
+             <groupId>org.apache.tuscany.maven.plugins</groupId>
+             <artifactId>maven-tuscany-plugin</artifactId>
+             <version>2.0-Beta1</version>
+         </plugin>
+       </plugins>
+    </build>
+
+</project>
diff --git a/samples/learning-more/implementation-java/pom.xml b/samples/learning-more/implementation-java/pom.xml
index 2d5609c..6aec533 100644
--- a/samples/learning-more/implementation-java/pom.xml
+++ b/samples/learning-more/implementation-java/pom.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

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

-    <packaging>pom</packaging>

-    <name>Apache Tuscany SCA Sample implementation.java</name>

-

-    <profiles>

-        <profile>

-            <id>default</id>

-            <activation>

-                <activeByDefault>true</activeByDefault>

-            </activation>

-            <modules>

-                <module>calculator-contribution</module>

-            </modules>

-        </profile>

-    </profiles>    

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-sample-implementation-java</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Tuscany SCA Sample implementation.java</name>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>calculator-contribution</module>
+            </modules>
+        </profile>
+    </profiles>    
+</project>
diff --git a/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml b/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml
index 95796ef..6d4f4c6 100644
--- a/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml
+++ b/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,21 +33,21 @@
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-all</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl-osgi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml b/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml
index c9f4b01..a6c0eb7 100644
--- a/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml
+++ b/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,27 +33,27 @@
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-ejava</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
         </dependency>
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webservice</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
             <scope>runtime</scope>
         </dependency>
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl-osgi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/samples/learning-more/implementation-osgi/pom.xml b/samples/learning-more/implementation-osgi/pom.xml
index 1ca7266..2194494 100644
--- a/samples/learning-more/implementation-osgi/pom.xml
+++ b/samples/learning-more/implementation-osgi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-samples-distributed-osgi-static</artifactId>
diff --git a/samples/learning-more/implementation-script/calculator-contribution/pom.xml b/samples/learning-more/implementation-script/calculator-contribution/pom.xml
index 92193b8..bc1475b 100644
--- a/samples/learning-more/implementation-script/calculator-contribution/pom.xml
+++ b/samples/learning-more/implementation-script/calculator-contribution/pom.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

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

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

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

-    * 

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

-    * 

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

-    * software distributed under the License is distributed on an

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

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

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-    <artifactId>sample-implementation-script-calculator-contribution</artifactId>

-    <name>Apache Tuscany SCA Sample implementation.script Calculator Contribution</name>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-feature-api</artifactId>

-            <type>pom</type>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency> 

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

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

-       <plugins>

-          <plugin>

-             <groupId>org.apache.tuscany.maven.plugins</groupId>

-             <artifactId>maven-tuscany-plugin</artifactId>

-             <version>2.0-Beta1-SNAPSHOT</version>

-          </plugin>

-       </plugins>

-   </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>sample-implementation-script-calculator-contribution</artifactId>
+    <name>Apache Tuscany SCA Sample implementation.script Calculator Contribution</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-api</artifactId>
+            <type>pom</type>
+            <version>2.0-Beta1</version>
+        </dependency> 
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+       <plugins>
+          <plugin>
+             <groupId>org.apache.tuscany.maven.plugins</groupId>
+             <artifactId>maven-tuscany-plugin</artifactId>
+             <version>2.0-Beta1</version>
+          </plugin>
+       </plugins>
+   </build>
+</project>
diff --git a/samples/learning-more/implementation-script/pom.xml b/samples/learning-more/implementation-script/pom.xml
index 1033626..2996fe9 100644
--- a/samples/learning-more/implementation-script/pom.xml
+++ b/samples/learning-more/implementation-script/pom.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-    <artifactId>tuscany-sample-implementation-script</artifactId>

-    <packaging>pom</packaging>

-    <name>Apache Tuscany SCA Sample implementation.script</name>

-

-    <profiles>

-        <profile>

-            <id>default</id>

-            <activation>

-                <activeByDefault>true</activeByDefault>

-            </activation>

-            <modules>

-                <module>calculator-contribution</module>

-            </modules>

-        </profile>

-    </profiles>    

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-sample-implementation-script</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Tuscany SCA Sample implementation.script</name>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>calculator-contribution</module>
+            </modules>
+        </profile>
+    </profiles>    
+</project>
diff --git a/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml b/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml
index a2bd178..30d49a7 100644
--- a/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml
+++ b/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

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

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

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

-    *

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

-    *

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

-    * software distributed under the License is distributed on an

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

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

-    * specific language governing permissions and limitations

-    * under the License.

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-

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

-    <name>Apache Tuscany SCA Sample implemenation.spring HelloWorld Contribution</name>

-

-    <dependencies>

-        <dependency>

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

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

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>provided</scope>

-        </dependency>

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-

-    <build>

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

-       <plugins>

-

-         <!-- plugin to support using mvn tuscany:run to run this contribution -->

-         <plugin>

-             <groupId>org.apache.tuscany.maven.plugins</groupId>

-             <artifactId>maven-tuscany-plugin</artifactId>

-             <version>2.0-Beta1-SNAPSHOT</version>

-             <dependencies>

-                <dependency>

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

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

-                   <version>2.0-Beta1-SNAPSHOT</version>

-                </dependency>

-             </dependencies>

-         </plugin>

-

-       </plugins>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>sample-implementation-spring-helloworld-contribution</artifactId>
+    <name>Apache Tuscany SCA Sample implemenation.spring HelloWorld Contribution</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+       <plugins>
+
+         <!-- plugin to support using mvn tuscany:run to run this contribution -->
+         <plugin>
+             <groupId>org.apache.tuscany.maven.plugins</groupId>
+             <artifactId>maven-tuscany-plugin</artifactId>
+             <version>2.0-Beta1</version>
+             <dependencies>
+                <dependency>
+                   <groupId>org.apache.tuscany.sca</groupId>
+                   <artifactId>tuscany-implementation-spring-runtime</artifactId>
+                   <version>2.0-Beta1</version>
+                </dependency>
+             </dependencies>
+         </plugin>
+
+       </plugins>
+    </build>
+</project>
diff --git a/samples/learning-more/implementation-spring/helloworld-spring-webapp/pom.xml b/samples/learning-more/implementation-spring/helloworld-spring-webapp/pom.xml
index 1a79e7f..8ec49f0 100644
--- a/samples/learning-more/implementation-spring/helloworld-spring-webapp/pom.xml
+++ b/samples/learning-more/implementation-spring/helloworld-spring-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -34,31 +34,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring-webapp</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>sample-implementation-spring-helloworld-contribution</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/samples/learning-more/implementation-spring/pom.xml b/samples/learning-more/implementation-spring/pom.xml
index 8aead9b..b109806 100644
--- a/samples/learning-more/implementation-spring/pom.xml
+++ b/samples/learning-more/implementation-spring/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-samples-implememtation-spring</artifactId>
diff --git a/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml b/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml
index 875033c..77f5f4a 100644
--- a/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml
+++ b/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml
@@ -1,116 +1,116 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- *

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

- *

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

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

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

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

-    </parent>

-

-    <artifactId>sample-implementation-web-helloworld-jaxrs-webapp</artifactId>

-    <packaging>war</packaging>

-    <name>Apache Tuscany SCA Sample implemenation.web Helloworld JAX-RS WebApp</name>

-

-    <dependencies>

-

-        <!-- Tuscany dependency -->

-        <dependency>

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

-            <artifactId>tuscany-base-runtime-nodep</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <!-- Wink dependency for JAX-RS support -->

-        <dependency>

-            <groupId>org.apache.wink</groupId>

-            <artifactId>wink-common</artifactId>

-            <version>1.1.1-incubating</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.wink</groupId>

-            <artifactId>wink-server</artifactId>

-            <version>1.1.1-incubating</version>

-        </dependency>

-        <dependency>

-            <groupId>org.slf4j</groupId>

-            <artifactId>slf4j-api</artifactId>

-            <version>1.6.0</version>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>net.sourceforge.htmlunit</groupId>

-            <artifactId>htmlunit</artifactId>

-            <version>2.6</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>helloworld-jaxrs</finalName>

-       <plugins>

-          <plugin>

-             <groupId>org.mortbay.jetty</groupId>

-             <artifactId>maven-jetty-plugin</artifactId>

-             <version>6.1.18</version>

-             <configuration>

-                <contextPath>helloworld-jaxrs</contextPath>

-                <stopKey>foo</stopKey>

-                <stopPort>9999</stopPort>

-             </configuration>

-             <executions>

-                <execution>

-                   <id>start-jetty</id>

-                   <phase>process-test-classes</phase>

-                   <goals>

-                       <goal>run</goal>

-                   </goals>

-                   <configuration>

-                       <scanIntervalSeconds>0</scanIntervalSeconds>

-                       <daemon>true</daemon>

-                       <connectors>

-                          <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">

-                             <port>8085</port>

-                          </connector>

-                       </connectors>

-                   </configuration>

-                </execution>

-                <execution>

-                   <id>stop-jetty</id>

-                   <phase>prepare-package</phase>

-                   <goals>

-                       <goal>stop</goal>

-                   </goals>

-                </execution>

-             </executions>

-          </plugin>

-       </plugins>

-    </build>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>sample-implementation-web-helloworld-jaxrs-webapp</artifactId>
+    <packaging>war</packaging>
+    <name>Apache Tuscany SCA Sample implemenation.web Helloworld JAX-RS WebApp</name>
+
+    <dependencies>
+
+        <!-- Tuscany dependency -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-base-runtime-nodep</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <!-- Wink dependency for JAX-RS support -->
+        <dependency>
+            <groupId>org.apache.wink</groupId>
+            <artifactId>wink-common</artifactId>
+            <version>1.1.1-incubating</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.wink</groupId>
+            <artifactId>wink-server</artifactId>
+            <version>1.1.1-incubating</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.6.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.sourceforge.htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <version>2.6</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>helloworld-jaxrs</finalName>
+       <plugins>
+          <plugin>
+             <groupId>org.mortbay.jetty</groupId>
+             <artifactId>maven-jetty-plugin</artifactId>
+             <version>6.1.18</version>
+             <configuration>
+                <contextPath>helloworld-jaxrs</contextPath>
+                <stopKey>foo</stopKey>
+                <stopPort>9999</stopPort>
+             </configuration>
+             <executions>
+                <execution>
+                   <id>start-jetty</id>
+                   <phase>process-test-classes</phase>
+                   <goals>
+                       <goal>run</goal>
+                   </goals>
+                   <configuration>
+                       <scanIntervalSeconds>0</scanIntervalSeconds>
+                       <daemon>true</daemon>
+                       <connectors>
+                          <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                             <port>8085</port>
+                          </connector>
+                       </connectors>
+                   </configuration>
+                </execution>
+                <execution>
+                   <id>stop-jetty</id>
+                   <phase>prepare-package</phase>
+                   <goals>
+                       <goal>stop</goal>
+                   </goals>
+                </execution>
+             </executions>
+          </plugin>
+       </plugins>
+    </build>
+
+</project>
diff --git a/samples/learning-more/implementation-web/helloworld-js-client/pom.xml b/samples/learning-more/implementation-web/helloworld-js-client/pom.xml
index 7bd8798..8cf4f50 100644
--- a/samples/learning-more/implementation-web/helloworld-js-client/pom.xml
+++ b/samples/learning-more/implementation-web/helloworld-js-client/pom.xml
@@ -1,104 +1,104 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>sample-implementation-web-helloworld-js-client-webapp</artifactId>

-    <packaging>war</packaging>

-    <name>Apache Tuscany SCA Sample implemenation.web Helloworld Javascript Client WebApp</name>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-base-runtime</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-databinding-json</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>net.sourceforge.htmlunit</groupId>

-            <artifactId>htmlunit</artifactId>

-            <version>2.6</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>helloworld-js-client</finalName>

-       <plugins>

-          <plugin>

-             <groupId>org.mortbay.jetty</groupId>

-             <artifactId>maven-jetty-plugin</artifactId>

-             <version>6.1.18</version>

-             <configuration>

-                <contextPath>helloworld-js-client</contextPath>

-                <stopKey>foo</stopKey>

-                <stopPort>9999</stopPort>

-             </configuration>

-             <executions>

-                <execution>

-                   <id>start-jetty</id>

-                   <phase>process-test-classes</phase>

-                   <goals>

-                       <goal>run</goal>

-                   </goals>

-                   <configuration>

-                       <scanIntervalSeconds>0</scanIntervalSeconds>

-                       <daemon>true</daemon>

-                       <connectors>

-                          <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">

-                             <port>8085</port>

-                          </connector>

-                       </connectors>

-                   </configuration>

-                </execution>

-                <execution>

-                   <id>stop-jetty</id>

-                   <phase>prepare-package</phase>

-                   <goals>

-                       <goal>stop</goal>

-                   </goals>

-                </execution>

-             </executions>

-          </plugin>

-       </plugins>

-    </build>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>sample-implementation-web-helloworld-js-client-webapp</artifactId>
+    <packaging>war</packaging>
+    <name>Apache Tuscany SCA Sample implemenation.web Helloworld Javascript Client WebApp</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-base-runtime</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-json</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.sourceforge.htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <version>2.6</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>helloworld-js-client</finalName>
+       <plugins>
+          <plugin>
+             <groupId>org.mortbay.jetty</groupId>
+             <artifactId>maven-jetty-plugin</artifactId>
+             <version>6.1.18</version>
+             <configuration>
+                <contextPath>helloworld-js-client</contextPath>
+                <stopKey>foo</stopKey>
+                <stopPort>9999</stopPort>
+             </configuration>
+             <executions>
+                <execution>
+                   <id>start-jetty</id>
+                   <phase>process-test-classes</phase>
+                   <goals>
+                       <goal>run</goal>
+                   </goals>
+                   <configuration>
+                       <scanIntervalSeconds>0</scanIntervalSeconds>
+                       <daemon>true</daemon>
+                       <connectors>
+                          <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                             <port>8085</port>
+                          </connector>
+                       </connectors>
+                   </configuration>
+                </execution>
+                <execution>
+                   <id>stop-jetty</id>
+                   <phase>prepare-package</phase>
+                   <goals>
+                       <goal>stop</goal>
+                   </goals>
+                </execution>
+             </executions>
+          </plugin>
+       </plugins>
+    </build>
+
+</project>
diff --git a/samples/learning-more/implementation-web/helloworld-jsf/pom.xml b/samples/learning-more/implementation-web/helloworld-jsf/pom.xml
index b5f0242..a141f82 100644
--- a/samples/learning-more/implementation-web/helloworld-jsf/pom.xml
+++ b/samples/learning-more/implementation-web/helloworld-jsf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -35,21 +35,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-myfaces</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/samples/learning-more/implementation-web/helloworld-jsp/pom.xml b/samples/learning-more/implementation-web/helloworld-jsp/pom.xml
index 37c44d7..6232782 100644
--- a/samples/learning-more/implementation-web/helloworld-jsp/pom.xml
+++ b/samples/learning-more/implementation-web/helloworld-jsp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
diff --git a/samples/learning-more/implementation-web/helloworld-servlet/pom.xml b/samples/learning-more/implementation-web/helloworld-servlet/pom.xml
index 39670da..bd1fed4 100644
--- a/samples/learning-more/implementation-web/helloworld-servlet/pom.xml
+++ b/samples/learning-more/implementation-web/helloworld-servlet/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-nodep</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
diff --git a/samples/learning-more/implementation-web/helloworld-stripes/pom.xml b/samples/learning-more/implementation-web/helloworld-stripes/pom.xml
index 5ed2aff..c80a0bc 100644
--- a/samples/learning-more/implementation-web/helloworld-stripes/pom.xml
+++ b/samples/learning-more/implementation-web/helloworld-stripes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -36,13 +36,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-stripes</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!--  Stripes Framework dependencies -->
diff --git a/samples/learning-more/implementation-web/pom.xml b/samples/learning-more/implementation-web/pom.xml
index 6835e24..9b85d8d 100644
--- a/samples/learning-more/implementation-web/pom.xml
+++ b/samples/learning-more/implementation-web/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-samples-implementation-webapp</artifactId>
diff --git a/samples/learning-more/pom.xml b/samples/learning-more/pom.xml
index 92601c0..d149ceb 100644
--- a/samples/learning-more/pom.xml
+++ b/samples/learning-more/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>org.apache.tuscany.sca</groupId>
     <artifactId>tuscany-samples-learning-more</artifactId>
-    <version>2.0-Beta1-SNAPSHOT</version>
+    <version>2.0-Beta1</version>
     <packaging>pom</packaging>
     <name>Apache Tuscany SCA Learning More Sample Contributions</name>
 
diff --git a/samples/learning-more/sca-client/calculator-scaclient/pom.xml b/samples/learning-more/sca-client/calculator-scaclient/pom.xml
index 086444b..7f1946f 100644
--- a/samples/learning-more/sca-client/calculator-scaclient/pom.xml
+++ b/samples/learning-more/sca-client/calculator-scaclient/pom.xml
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>sample-sca-client-calculator</artifactId>

-    <name>Apache Tuscany SCA Sample SCA Client Calculator</name>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-base-runtime</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-       <plugins>

-         <plugin>

-           <groupId>org.codehaus.mojo</groupId>

-           <artifactId>exec-maven-plugin</artifactId>

-           <version>1.1.1</version>

-           <executions>

-             <execution>

-               <goals>

-                 <goal>java</goal>

-               </goals>

-             </execution>

-           </executions>

-           <configuration>

-             <mainClass>sample.CalculatorSCAClient</mainClass>

-           </configuration>

-         </plugin>

-      </plugins>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>sample-sca-client-calculator</artifactId>
+    <name>Apache Tuscany SCA Sample SCA Client Calculator</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-base-runtime</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+       <plugins>
+         <plugin>
+           <groupId>org.codehaus.mojo</groupId>
+           <artifactId>exec-maven-plugin</artifactId>
+           <version>1.1.1</version>
+           <executions>
+             <execution>
+               <goals>
+                 <goal>java</goal>
+               </goals>
+             </execution>
+           </executions>
+           <configuration>
+             <mainClass>sample.CalculatorSCAClient</mainClass>
+           </configuration>
+         </plugin>
+      </plugins>
+    </build>
+</project>
diff --git a/samples/learning-more/sca-client/helloworld-scaclient/pom.xml b/samples/learning-more/sca-client/helloworld-scaclient/pom.xml
index 0aa4dea..8f1fdb7 100644
--- a/samples/learning-more/sca-client/helloworld-scaclient/pom.xml
+++ b/samples/learning-more/sca-client/helloworld-scaclient/pom.xml
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>sample-sca-client-helloworld</artifactId>

-    <name>Apache Tuscany SCA Sample SCA Client Helloworld </name>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-base-runtime</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-       <plugins>

-         <plugin>

-           <groupId>org.codehaus.mojo</groupId>

-           <artifactId>exec-maven-plugin</artifactId>

-           <version>1.1.1</version>

-           <executions>

-             <execution>

-               <goals>

-                 <goal>java</goal>

-               </goals>

-             </execution>

-           </executions>

-           <configuration>

-             <mainClass>sample.HelloworldSCAClient</mainClass>

-           </configuration>

-         </plugin>

-      </plugins>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>sample-sca-client-helloworld</artifactId>
+    <name>Apache Tuscany SCA Sample SCA Client Helloworld </name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-base-runtime</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+       <plugins>
+         <plugin>
+           <groupId>org.codehaus.mojo</groupId>
+           <artifactId>exec-maven-plugin</artifactId>
+           <version>1.1.1</version>
+           <executions>
+             <execution>
+               <goals>
+                 <goal>java</goal>
+               </goals>
+             </execution>
+           </executions>
+           <configuration>
+             <mainClass>sample.HelloworldSCAClient</mainClass>
+           </configuration>
+         </plugin>
+      </plugins>
+    </build>
+</project>
diff --git a/samples/learning-more/sca-client/pom.xml b/samples/learning-more/sca-client/pom.xml
index eedf7b3..8a9381f 100644
--- a/samples/learning-more/sca-client/pom.xml
+++ b/samples/learning-more/sca-client/pom.xml
@@ -22,11 +22,11 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>org.apache.tuscany.sca</groupId>
-    <version>2.0-Beta1-SNAPSHOT</version>
+    <version>2.0-Beta1</version>
     <artifactId>tuscany-samples-sca-client</artifactId>
     <packaging>pom</packaging>
     <name>Apache Tuscany SCA SCAClient Samples</name>
diff --git a/samples/pom.xml b/samples/pom.xml
index 94b7c7e..2f19861 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-samples</artifactId>
     <groupId>org.apache.tuscany.sca</groupId>
-    <version>2.0-Beta1-SNAPSHOT</version>
+    <version>2.0-Beta1</version>
     <packaging>pom</packaging>
     <name>Apache Tuscany SCA Samples</name>
 
diff --git a/samples/running-tuscany/embedded-jse/build.xml b/samples/running-tuscany/embedded-jse/build.xml
index ae72c3c..4ad76f7 100644
--- a/samples/running-tuscany/embedded-jse/build.xml
+++ b/samples/running-tuscany/embedded-jse/build.xml
@@ -1,141 +1,141 @@
-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project name="launcher-embedded-jse" default="run"> 

-    <property name="tuscany.home" value="../../.."/>

-    <property name="jar.name"   value="sample-launcher-embedded-jse.jar" />

-

-    <echo>Root of Tuscany binary distribution is - ${tuscany.home}</echo>

-

-    <import file="${tuscany.home}/features/tuscany-base-runtime-pom/build-path.xml"/>

-    <import file="${tuscany.home}/features/tuscany-binding-ws-runtime-axis2/build-path.xml"/>

-    <import file="${tuscany.home}/features/tuscany-binding-rmi-runtime/build-path.xml"/>

-    <import file="${tuscany.home}/features/tuscany-host-jetty/build-path.xml"/>

-

-    <target name="init"> 

-      <delete quiet="true" includeemptydirs="true"> 

-         <fileset dir="target"/> 

-      </delete> 

-      <mkdir dir="target/classes"/> 

-    </target>

-	

-    <target name="compile" depends="init">

-      <javac srcdir="src/main/java" 

-      	     destdir="target/classes" 

-      	     debug="on"

-             source="1.5"

-             target="1.5"

-      	     failonerror="true"> 

-         <classpath>

-            <fileset dir="${tuscany.home}/lib">

-               <include name="tuscany-base-*.jar" />

-            </fileset>

-         </classpath>

-      </javac> 

-      <jar destfile="target/${jar.name}" basedir="target/classes"> 

-      </jar>    	

-    </target>

-	

-    <target name="run" depends="compile">

-        <echo>Please use 'ant run-name-of-sample-contribution-to-run' for example, try one of</echo>

-	<echo>  'ant sample-binding-sca-calculator-contribution' </echo>

-	<echo>  'ant sample-binding-ws-calculator-contribution'  </echo>

-	<echo>  'ant sample-binding-rmi-calculator-contribution'  </echo>

-	<echo>  'ant sample-implementation-java-calculator-contribution'  </echo>

-    <echo>  'ant sample-implementation-java-calculator-async-contribution'  </echo>

-    </target>

-

-    <!-- Run using the "all" manifest jar -->

-    <target name="sample-binding-sca-calculator-contribution" depends="compile">

-  	     <java classname="launcher.JSELauncherBindingSCACalculator"

-              fork="true"

-              failonerror="true">

-            <classpath>  

-                <pathelement location="target/${jar.name}"/>

-                <fileset dir="${tuscany.home}/features">

-                   <include name="tuscany-sca-manifest.jar" />

-                </fileset>

-            </classpath> 

-        </java>  

-    </target>

-	

-    <!-- Run using the base + extension ant paths -->

-    <target name="sample-binding-ws-calculator-contribution" depends="compile">

-        <java classname="launcher.JSELauncherBindingWSCalculator"

-              fork="true"

-              failonerror="true">

-            <classpath>  

-                <pathelement location="target/${jar.name}"/>

-                <path refid="tuscany-base-runtime-pom.path"/>

-                <path refid="tuscany-binding-ws-runtime-axis2.path"/>

-                <path refid="tuscany-host-jetty.path"/>

-            </classpath> 

-        </java>     

-    </target>	

-	

-    <!-- Run using the base + extension manifest -->

-    <target name="sample-binding-rmi-calculator-contribution" depends="compile">

-        <java classname="launcher.JSELauncherBindingRMICalculator"

-              fork="true"

-              failonerror="true">

-            <classpath>  

-                <pathelement location="target/${jar.name}"/>

-                <fileset dir="${tuscany.home}/features/tuscany-base-runtime-pom">

-                   <include name="tuscany-base-runtime-pom-manifest.jar" />

-                </fileset>

-                <fileset dir="${tuscany.home}/features/tuscany-binding-rmi-runtime">

-                   <include name="tuscany-binding-rmi-runtime-manifest.jar" />

-                </fileset>

-            </classpath> 

-        </java>       

-    </target>	

-	

-    <!-- Run using the base + extension aggregations -->

-    <target name="sample-implementation-java-calculator-contribution" depends="compile">

-        <java classname="launcher.JSELauncherImplementationJavaCalculator"

-              fork="true"

-              failonerror="true">

-            <classpath>  

-                <pathelement location="target/${jar.name}"/>

-                <fileset dir="${tuscany.home}/lib">

-                   <include name="tuscany-base-runtime-aggregation-2.0-Beta1-SNAPSHOT.jar" />

-                </fileset>

-            </classpath> 

-        </java>       

-    </target>	

-	

-    <target name="sample-implementation-java-calculator-async-contribution" depends="compile">

-        <java classname="launcher.JSELauncherImplementationJavaCalculatorAsync"

-              fork="true"

-              failonerror="true">

-            <classpath>  

-                <pathelement location="target/${jar.name}"/>

-                <fileset dir="${tuscany.home}/features/tuscany-base-runtime-pom">

-                   <include name="tuscany-base-runtime-pom-manifest.jar" />

-                </fileset>

-                <fileset dir="${tuscany.home}/features/tuscany-binding-ws-runtime-axis2">

-                   <include name="tuscany-binding-ws-runtime-axis2-manifest.jar" />

-                </fileset>

-                <fileset dir="${tuscany.home}/features/tuscany-host-jetty">

-                   <include name="tuscany-host-jetty-manifest.jar" />

-                </fileset>            	

-            </classpath>

-        </java>       

-    </target>	

-

-</project>

+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project name="launcher-embedded-jse" default="run"> 
+    <property name="tuscany.home" value="../../.."/>
+    <property name="jar.name"   value="sample-launcher-embedded-jse.jar" />
+
+    <echo>Root of Tuscany binary distribution is - ${tuscany.home}</echo>
+
+    <import file="${tuscany.home}/features/tuscany-base-runtime-pom/build-path.xml"/>
+    <import file="${tuscany.home}/features/tuscany-binding-ws-runtime-axis2/build-path.xml"/>
+    <import file="${tuscany.home}/features/tuscany-binding-rmi-runtime/build-path.xml"/>
+    <import file="${tuscany.home}/features/tuscany-host-jetty/build-path.xml"/>
+
+    <target name="init"> 
+      <delete quiet="true" includeemptydirs="true"> 
+         <fileset dir="target"/> 
+      </delete> 
+      <mkdir dir="target/classes"/> 
+    </target>
+	
+    <target name="compile" depends="init">
+      <javac srcdir="src/main/java" 
+      	     destdir="target/classes" 
+      	     debug="on"
+             source="1.5"
+             target="1.5"
+      	     failonerror="true"> 
+         <classpath>
+            <fileset dir="${tuscany.home}/lib">
+               <include name="tuscany-base-*.jar" />
+            </fileset>
+         </classpath>
+      </javac> 
+      <jar destfile="target/${jar.name}" basedir="target/classes"> 
+      </jar>    	
+    </target>
+	
+    <target name="run" depends="compile">
+        <echo>Please use 'ant run-name-of-sample-contribution-to-run' for example, try one of</echo>
+	<echo>  'ant sample-binding-sca-calculator-contribution' </echo>
+	<echo>  'ant sample-binding-ws-calculator-contribution'  </echo>
+	<echo>  'ant sample-binding-rmi-calculator-contribution'  </echo>
+	<echo>  'ant sample-implementation-java-calculator-contribution'  </echo>
+    <echo>  'ant sample-implementation-java-calculator-async-contribution'  </echo>
+    </target>
+
+    <!-- Run using the "all" manifest jar -->
+    <target name="sample-binding-sca-calculator-contribution" depends="compile">
+  	     <java classname="launcher.JSELauncherBindingSCACalculator"
+              fork="true"
+              failonerror="true">
+            <classpath>  
+                <pathelement location="target/${jar.name}"/>
+                <fileset dir="${tuscany.home}/features">
+                   <include name="tuscany-sca-manifest.jar" />
+                </fileset>
+            </classpath> 
+        </java>  
+    </target>
+	
+    <!-- Run using the base + extension ant paths -->
+    <target name="sample-binding-ws-calculator-contribution" depends="compile">
+        <java classname="launcher.JSELauncherBindingWSCalculator"
+              fork="true"
+              failonerror="true">
+            <classpath>  
+                <pathelement location="target/${jar.name}"/>
+                <path refid="tuscany-base-runtime-pom.path"/>
+                <path refid="tuscany-binding-ws-runtime-axis2.path"/>
+                <path refid="tuscany-host-jetty.path"/>
+            </classpath> 
+        </java>     
+    </target>	
+	
+    <!-- Run using the base + extension manifest -->
+    <target name="sample-binding-rmi-calculator-contribution" depends="compile">
+        <java classname="launcher.JSELauncherBindingRMICalculator"
+              fork="true"
+              failonerror="true">
+            <classpath>  
+                <pathelement location="target/${jar.name}"/>
+                <fileset dir="${tuscany.home}/features/tuscany-base-runtime-pom">
+                   <include name="tuscany-base-runtime-pom-manifest.jar" />
+                </fileset>
+                <fileset dir="${tuscany.home}/features/tuscany-binding-rmi-runtime">
+                   <include name="tuscany-binding-rmi-runtime-manifest.jar" />
+                </fileset>
+            </classpath> 
+        </java>       
+    </target>	
+	
+    <!-- Run using the base + extension aggregations -->
+    <target name="sample-implementation-java-calculator-contribution" depends="compile">
+        <java classname="launcher.JSELauncherImplementationJavaCalculator"
+              fork="true"
+              failonerror="true">
+            <classpath>  
+                <pathelement location="target/${jar.name}"/>
+                <fileset dir="${tuscany.home}/lib">
+                   <include name="tuscany-base-runtime-aggregation-2.0-Beta1.jar" />
+                </fileset>
+            </classpath> 
+        </java>       
+    </target>	
+	
+    <target name="sample-implementation-java-calculator-async-contribution" depends="compile">
+        <java classname="launcher.JSELauncherImplementationJavaCalculatorAsync"
+              fork="true"
+              failonerror="true">
+            <classpath>  
+                <pathelement location="target/${jar.name}"/>
+                <fileset dir="${tuscany.home}/features/tuscany-base-runtime-pom">
+                   <include name="tuscany-base-runtime-pom-manifest.jar" />
+                </fileset>
+                <fileset dir="${tuscany.home}/features/tuscany-binding-ws-runtime-axis2">
+                   <include name="tuscany-binding-ws-runtime-axis2-manifest.jar" />
+                </fileset>
+                <fileset dir="${tuscany.home}/features/tuscany-host-jetty">
+                   <include name="tuscany-host-jetty-manifest.jar" />
+                </fileset>            	
+            </classpath>
+        </java>       
+    </target>	
+
+</project>
diff --git a/samples/running-tuscany/embedded-jse/pom.xml b/samples/running-tuscany/embedded-jse/pom.xml
index 462c89f..96eeb42 100644
--- a/samples/running-tuscany/embedded-jse/pom.xml
+++ b/samples/running-tuscany/embedded-jse/pom.xml
@@ -1,92 +1,92 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-launcher-embedded-jse</artifactId>

-    <name>Apache Tuscany SCA Sample Launcher Embedded JSE</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-base-runtime-pom</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <type>pom</type>

-        </dependency> 

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-osgi-runtime-pom</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <type>pom</type>

-        </dependency> 

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-rmi-runtime</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>        

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency> 

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-script-runtime</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>  

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>     

-                

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-        

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-

-       <plugins>

-         

-       </plugins>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>sample-launcher-embedded-jse</artifactId>
+    <name>Apache Tuscany SCA Sample Launcher Embedded JSE</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-base-runtime-pom</artifactId>
+            <version>2.0-Beta1</version>
+            <type>pom</type>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-osgi-runtime-pom</artifactId>
+            <version>2.0-Beta1</version>
+            <type>pom</type>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-rmi-runtime</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-script-runtime</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>  
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>     
+                
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+        
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+
+       <plugins>
+         
+       </plugins>
+    </build>
+</project>
diff --git a/samples/running-tuscany/embedded-osgi-base/pom.xml b/samples/running-tuscany/embedded-osgi-base/pom.xml
index d0d264c..faead94 100644
--- a/samples/running-tuscany/embedded-osgi-base/pom.xml
+++ b/samples/running-tuscany/embedded-osgi-base/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-launcher-embedded-osgi-base</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-nodep</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>commons-cli</groupId>
diff --git a/samples/running-tuscany/embedded-osgi/pom.xml b/samples/running-tuscany/embedded-osgi/pom.xml
index b3cd164..c65682e 100644
--- a/samples/running-tuscany/embedded-osgi/pom.xml
+++ b/samples/running-tuscany/embedded-osgi/pom.xml
@@ -1,75 +1,75 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-launcher-embedded-osgi</artifactId>

-    <name>Apache Tuscany SCA Sample Launcher Embedded OSGi</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-base-runtime-pom</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <type>pom</type>

-        </dependency> 

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-osgi-runtime-pom</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <type>pom</type>

-        </dependency> 

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency> 

-        

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-              

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-

-       <plugins>

-         

-       </plugins>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>sample-launcher-embedded-osgi</artifactId>
+    <name>Apache Tuscany SCA Sample Launcher Embedded OSGi</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-base-runtime-pom</artifactId>
+            <version>2.0-Beta1</version>
+            <type>pom</type>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-osgi-runtime-pom</artifactId>
+            <version>2.0-Beta1</version>
+            <type>pom</type>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency> 
+        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+              
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+
+       <plugins>
+         
+       </plugins>
+    </build>
+</project>
diff --git a/samples/running-tuscany/maven-junit/calculator-contribution/pom.xml b/samples/running-tuscany/maven-junit/calculator-contribution/pom.xml
index 313d183..ab76aa9 100644
--- a/samples/running-tuscany/maven-junit/calculator-contribution/pom.xml
+++ b/samples/running-tuscany/maven-junit/calculator-contribution/pom.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-maven-junit-calculator-contribution</artifactId>

-    <name>Apache Tuscany SCA Sample Maven JUnit Calculator Contribution</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-base-runtime-pom</artifactId>

-            <type>pom</type>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency> 

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-       <plugins>

-          <plugin>

-             <groupId>org.apache.tuscany.maven.plugins</groupId>

-             <artifactId>maven-tuscany-plugin</artifactId>

-             <version>2.0-Beta1-SNAPSHOT</version>

-          </plugin>

-       </plugins>

-   </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>sample-maven-junit-calculator-contribution</artifactId>
+    <name>Apache Tuscany SCA Sample Maven JUnit Calculator Contribution</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-base-runtime-pom</artifactId>
+            <type>pom</type>
+            <version>2.0-Beta1</version>
+        </dependency> 
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+       <plugins>
+          <plugin>
+             <groupId>org.apache.tuscany.maven.plugins</groupId>
+             <artifactId>maven-tuscany-plugin</artifactId>
+             <version>2.0-Beta1</version>
+          </plugin>
+       </plugins>
+   </build>
+</project>
diff --git a/samples/running-tuscany/maven-junit/pom.xml b/samples/running-tuscany/maven-junit/pom.xml
index f1bbd6c..1996533 100644
--- a/samples/running-tuscany/maven-junit/pom.xml
+++ b/samples/running-tuscany/maven-junit/pom.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>tuscany-sample-maven-junit</artifactId>

-    <packaging>pom</packaging>

-    <name>Apache Tuscany SCA Sample Maven Junit</name>

-

-    <profiles>

-        <profile>

-            <id>default</id>

-            <activation>

-                <activeByDefault>true</activeByDefault>

-            </activation>

-            <modules>

-                <module>calculator-contribution</module>

-            </modules>

-        </profile>

-    </profiles>    

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-sample-maven-junit</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Tuscany SCA Sample Maven Junit</name>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>calculator-contribution</module>
+            </modules>
+        </profile>
+    </profiles>    
+</project>
diff --git a/samples/running-tuscany/maven-osgi-junit/calculator-osgi/pom.xml b/samples/running-tuscany/maven-osgi-junit/calculator-osgi/pom.xml
index c535600..d48de56 100644
--- a/samples/running-tuscany/maven-osgi-junit/calculator-osgi/pom.xml
+++ b/samples/running-tuscany/maven-osgi-junit/calculator-osgi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-maven-osgi-junit-calculator-osgi</artifactId>
@@ -32,14 +32,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-all</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
         </dependency>
 
diff --git a/samples/running-tuscany/maven-osgi-junit/pom.xml b/samples/running-tuscany/maven-osgi-junit/pom.xml
index 1836ec2..473270b 100644
--- a/samples/running-tuscany/maven-osgi-junit/pom.xml
+++ b/samples/running-tuscany/maven-osgi-junit/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-maven-osgi-junit</artifactId>
     <groupId>org.apache.tuscany.sca</groupId>
-    <version>2.0-Beta1-SNAPSHOT</version>
+    <version>2.0-Beta1</version>
     <packaging>pom</packaging>
     <name>Apache Tuscany SCA Maven OSGI Junit plugin Samples</name>
 
diff --git a/samples/running-tuscany/pom.xml b/samples/running-tuscany/pom.xml
index 889307e..9d4ec8c 100644
--- a/samples/running-tuscany/pom.xml
+++ b/samples/running-tuscany/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-samples</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-samples-running-tuscany</artifactId>
diff --git a/samples/running-tuscany/shell/pom.xml b/samples/running-tuscany/shell/pom.xml
index 94926a7..a5659b5 100644
--- a/samples/running-tuscany/shell/pom.xml
+++ b/samples/running-tuscany/shell/pom.xml
@@ -1,92 +1,92 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-samples</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-launcher-shell</artifactId>

-    <name>Apache Tuscany SCA Sample Launcher Shell</name>

-    <packaging>war</packaging>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-api</artifactId>

-            <type>pom</type>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>  

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-core</artifactId>

-            <type>pom</type>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency> 

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-webservice</artifactId>

-            <type>pom</type>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-web20</artifactId>

-            <type>pom</type>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-webapp</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>scashell</finalName>

-       <plugins>

-           <plugin>

-               <groupId>org.codehaus.mojo</groupId>

-               <artifactId>tomcat-maven-plugin</artifactId>

-               <version>1.0</version>

-               <configuration>

-                   <!-- Key used for configuring access to server in settings.xml-->

-                   <server>tomcat</server>

-                   <!-- context for the webapp, as finalName is not being honored -->

-                   <path>/scashell</path>

-                </configuration>

-           </plugin>

-       </plugins>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>sample-launcher-shell</artifactId>
+    <name>Apache Tuscany SCA Sample Launcher Shell</name>
+    <packaging>war</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-api</artifactId>
+            <type>pom</type>
+            <version>2.0-Beta1</version>
+        </dependency>  
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-core</artifactId>
+            <type>pom</type>
+            <version>2.0-Beta1</version>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-webservice</artifactId>
+            <type>pom</type>
+            <version>2.0-Beta1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-web20</artifactId>
+            <type>pom</type>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-webapp</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>scashell</finalName>
+       <plugins>
+           <plugin>
+               <groupId>org.codehaus.mojo</groupId>
+               <artifactId>tomcat-maven-plugin</artifactId>
+               <version>1.0</version>
+               <configuration>
+                   <!-- Key used for configuring access to server in settings.xml-->
+                   <server>tomcat</server>
+                   <!-- context for the webapp, as finalName is not being honored -->
+                   <path>/scashell</path>
+                </configuration>
+           </plugin>
+       </plugins>
+    </build>
+</project>
diff --git a/testing/compliance-tests/assembly/pom.xml b/testing/compliance-tests/assembly/pom.xml
index 9e37e6a..132926b 100644
--- a/testing/compliance-tests/assembly/pom.xml
+++ b/testing/compliance-tests/assembly/pom.xml
@@ -1,153 +1,153 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-compliance-tests</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>tuscany-compliance-test-assembly</artifactId>

-    <name>Apache Tuscany SCA Specification Compliance Tests Assembly</name>

-

-    <dependencies>

-

-        <!-- This is only needed to get the module working in Eclipse which doesn't pick it up from the dependency plugin unpack -->

-        <!-- The dependency plugin unpack is needed as presently the surefire plugin wont run tests in a dependency jar -->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-otests-asm-tests</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-core-runtime-pom</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <type>pom</type>

-        </dependency> 

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-base-runtime-pom</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <type>pom</type>

-        </dependency> 

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-osgi-runtime-pom</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <type>pom</type>

-        </dependency> 

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency> 

-

-        <!-- Not sure why this is required for ASM. But ASM_6039 & ASM_6036 fail without it --> 

-        <dependency>

-            <groupId>com.sun.xml.ws</groupId>

-            <artifactId>jaxws-rt</artifactId>

-            <version>2.1.7</version>

-        </dependency> 

-

-        <!-- This is need when running with Sun JDK which gets an unsupported operation exception creating an XMLStreamReader from a DOMSource

-             when Tuscany is writing a property value  -->

-<!--

-        <dependency>

-            <groupId>org.codehaus.woodstox</groupId>

-            <artifactId>wstx-asl</artifactId>

-            <version>3.2.4</version>

-            <scope>runtime</scope>

-            <exclusions>

-                <exclusion>

-                    <groupId>stax</groupId>

-                    <artifactId>stax-api</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

--->

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-  <build>

-    <finalName>${artifactId}</finalName>

-    <plugins>

-                        

-      <plugin>

-         <groupId>org.apache.maven.plugins</groupId>

-         <artifactId>maven-surefire-plugin</artifactId>

-         <configuration>

-           <excludes>

-           </excludes>

-         </configuration>

-      </plugin>

-      <plugin>

-        <groupId>org.apache.maven.plugins</groupId>

-        <artifactId>maven-dependency-plugin</artifactId>

-        <executions>

-          <execution>

-            <id>unpack</id>

-            <phase>process-classes</phase>

-            <goals>

-              <goal>unpack</goal>

-            </goals>

-            <configuration>

-               <artifactItems>

-                 <artifactItem>

-                   <groupId>org.apache.tuscany.sca</groupId>

-                   <artifactId>oasis-assembly-contributions</artifactId>

-                   <version>2.0-SNAPSHOT</version>

-                   <type>zip</type>

-                   <outputDirectory>${project.build.directory}/oasis-contributions</outputDirectory>

-                 </artifactItem>

-                 <artifactItem>

-                   <groupId>org.apache.tuscany.sca</groupId>

-                   <artifactId>tuscany-otests-asm-tests</artifactId>

-                   <version>2.0-SNAPSHOT</version>

-                   <type>jar</type>

-                   <excludes>commons-logging.properties,oasis-sca-tests.properties</excludes>

-                   <outputDirectory>${project.build.directory}/test-classes</outputDirectory>

-                 </artifactItem>

-               </artifactItems>

-            </configuration>

-          </execution>

-        </executions>

-      </plugin>

-    </plugins>

-  </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-compliance-tests</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-compliance-test-assembly</artifactId>
+    <name>Apache Tuscany SCA Specification Compliance Tests Assembly</name>
+
+    <dependencies>
+
+        <!-- This is only needed to get the module working in Eclipse which doesn't pick it up from the dependency plugin unpack -->
+        <!-- The dependency plugin unpack is needed as presently the surefire plugin wont run tests in a dependency jar -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-asm-tests</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-runtime-pom</artifactId>
+            <version>2.0-Beta1</version>
+            <type>pom</type>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-base-runtime-pom</artifactId>
+            <version>2.0-Beta1</version>
+            <type>pom</type>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-osgi-runtime-pom</artifactId>
+            <version>2.0-Beta1</version>
+            <type>pom</type>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency> 
+
+        <!-- Not sure why this is required for ASM. But ASM_6039 & ASM_6036 fail without it --> 
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>jaxws-rt</artifactId>
+            <version>2.1.7</version>
+        </dependency> 
+
+        <!-- This is need when running with Sun JDK which gets an unsupported operation exception creating an XMLStreamReader from a DOMSource
+             when Tuscany is writing a property value  -->
+<!--
+        <dependency>
+            <groupId>org.codehaus.woodstox</groupId>
+            <artifactId>wstx-asl</artifactId>
+            <version>3.2.4</version>
+            <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+-->
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+  <build>
+    <finalName>${artifactId}</finalName>
+    <plugins>
+                        
+      <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-surefire-plugin</artifactId>
+         <configuration>
+           <excludes>
+           </excludes>
+         </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>unpack</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+               <artifactItems>
+                 <artifactItem>
+                   <groupId>org.apache.tuscany.sca</groupId>
+                   <artifactId>oasis-assembly-contributions</artifactId>
+                   <version>2.0-SNAPSHOT</version>
+                   <type>zip</type>
+                   <outputDirectory>${project.build.directory}/oasis-contributions</outputDirectory>
+                 </artifactItem>
+                 <artifactItem>
+                   <groupId>org.apache.tuscany.sca</groupId>
+                   <artifactId>tuscany-otests-asm-tests</artifactId>
+                   <version>2.0-SNAPSHOT</version>
+                   <type>jar</type>
+                   <excludes>commons-logging.properties,oasis-sca-tests.properties</excludes>
+                   <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+                 </artifactItem>
+               </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/testing/compliance-tests/binding-jms/pom.xml b/testing/compliance-tests/binding-jms/pom.xml
index 4a58629..1ae121b 100644
--- a/testing/compliance-tests/binding-jms/pom.xml
+++ b/testing/compliance-tests/binding-jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-compliance-tests</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-compliance-test-binding-jms</artifactId>
@@ -41,21 +41,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
@@ -124,7 +124,7 @@
                  <artifactItem>
                    <groupId>org.apache.tuscany.sca</groupId>
                    <artifactId>tuscany-otests-sca-jms-tests</artifactId>
-                   <version>2.0-Beta1-SNAPSHOT</version>
+                   <version>2.0-Beta1</version>
                    <type>jar</type>
                    <excludes>commons-logging.properties,oasis-sca-tests.properties,tuscany-oasis-sca-tests-errors.properties</excludes>
                    <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
diff --git a/testing/compliance-tests/binding-ws/pom.xml b/testing/compliance-tests/binding-ws/pom.xml
index 3a19632..52f582f 100644
--- a/testing/compliance-tests/binding-ws/pom.xml
+++ b/testing/compliance-tests/binding-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-compliance-tests</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-compliance-test-binding-ws</artifactId>
@@ -41,40 +41,40 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
         </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-osgi-runtime-pom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
         </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency> 
 
          <!-- This is need when running with Sun JDK which gets an unsupported operation exception creating an XMLStreamReader from a DOMSource
diff --git a/testing/compliance-tests/java-caa/pom.xml b/testing/compliance-tests/java-caa/pom.xml
index 3e86b2b..cae2696 100644
--- a/testing/compliance-tests/java-caa/pom.xml
+++ b/testing/compliance-tests/java-caa/pom.xml
@@ -1,149 +1,149 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-compliance-tests</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>tuscany-compliance-test-java-caa</artifactId>

-    <name>Apache Tuscany SCA Specification Compliance Tests Java CAA</name>

-

-    <dependencies>

-

-        <dependency>

-            <!-- This is only needed to get the module working in Eclipse which doesn't pick it up from the dependency plugin unpack -->

-            <!-- The dependency plugin unpack is needed as presently the surefire plugin wont run tests in a dependency jar -->

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-otests-sca-j-caa-tests</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-core-runtime-pom</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <type>pom</type>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-base-runtime-pom</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <type>pom</type>

-        </dependency> 

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-osgi-runtime-pom</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <type>pom</type>

-        </dependency> 

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency> 

-

-        <!-- This is need when running with Sun JDK which gets an unsupported operation exception creating an XMLStreamReader from a DOMSource

-             when Tuscany is writing a property value  -->

-        <dependency>

-            <groupId>org.codehaus.woodstox</groupId>

-            <artifactId>wstx-asl</artifactId>

-            <version>3.2.4</version>

-            <scope>runtime</scope>

-            <exclusions>

-                <exclusion>

-                    <groupId>stax</groupId>

-                    <artifactId>stax-api</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-

-

-  <build>

-    <finalName>${artifactId}</finalName>

-    <plugins>

-

-      <plugin>

-         <groupId>org.apache.maven.plugins</groupId>

-         <artifactId>maven-surefire-plugin</artifactId>

-         <configuration>

-           <excludes>

-            <exclude>**/JCA_11021_TestCase.java</exclude><!-- TUSCANY-3664 -->

-           </excludes>

-         </configuration>

-      </plugin>

-

-      <plugin>

-        <groupId>org.apache.maven.plugins</groupId>

-        <artifactId>maven-dependency-plugin</artifactId>

-        <executions>

-          <execution>

-            <id>unpack</id>

-            <phase>process-test-resources</phase>

-            <goals>

-              <goal>unpack</goal>

-            </goals>

-            <configuration>

-               <artifactItems>

-                 <artifactItem>

-                   <groupId>org.apache.tuscany.sca</groupId>

-                   <artifactId>oasis-javacaa-contributions</artifactId>

-                   <version>2.0-SNAPSHOT</version>

-                   <type>zip</type>

-                   <outputDirectory>${project.build.directory}/oasis-contributions</outputDirectory>

-                 </artifactItem>

-                 <artifactItem>

-                   <groupId>org.apache.tuscany.sca</groupId>

-                   <artifactId>tuscany-otests-sca-j-caa-tests</artifactId>

-                   <version>2.0-SNAPSHOT</version>

-                   <type>jar</type>

-                   <excludes>commons-logging.properties,oasis-sca-tests.properties,tuscany-oasis-sca-tests-errors.properties</excludes>

-                   <outputDirectory>${project.build.directory}/test-classes</outputDirectory>

-                 </artifactItem>

-               </artifactItems>

-            </configuration>

-          </execution>

-        </executions>

-      </plugin>

-

-    </plugins>

-  </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-compliance-tests</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-compliance-test-java-caa</artifactId>
+    <name>Apache Tuscany SCA Specification Compliance Tests Java CAA</name>
+
+    <dependencies>
+
+        <dependency>
+            <!-- This is only needed to get the module working in Eclipse which doesn't pick it up from the dependency plugin unpack -->
+            <!-- The dependency plugin unpack is needed as presently the surefire plugin wont run tests in a dependency jar -->
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-sca-j-caa-tests</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-runtime-pom</artifactId>
+            <version>2.0-Beta1</version>
+            <type>pom</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-base-runtime-pom</artifactId>
+            <version>2.0-Beta1</version>
+            <type>pom</type>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-osgi-runtime-pom</artifactId>
+            <version>2.0-Beta1</version>
+            <type>pom</type>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency> 
+
+        <!-- This is need when running with Sun JDK which gets an unsupported operation exception creating an XMLStreamReader from a DOMSource
+             when Tuscany is writing a property value  -->
+        <dependency>
+            <groupId>org.codehaus.woodstox</groupId>
+            <artifactId>wstx-asl</artifactId>
+            <version>3.2.4</version>
+            <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+
+
+  <build>
+    <finalName>${artifactId}</finalName>
+    <plugins>
+
+      <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-surefire-plugin</artifactId>
+         <configuration>
+           <excludes>
+            <exclude>**/JCA_11021_TestCase.java</exclude><!-- TUSCANY-3664 -->
+           </excludes>
+         </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>unpack</id>
+            <phase>process-test-resources</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+               <artifactItems>
+                 <artifactItem>
+                   <groupId>org.apache.tuscany.sca</groupId>
+                   <artifactId>oasis-javacaa-contributions</artifactId>
+                   <version>2.0-SNAPSHOT</version>
+                   <type>zip</type>
+                   <outputDirectory>${project.build.directory}/oasis-contributions</outputDirectory>
+                 </artifactItem>
+                 <artifactItem>
+                   <groupId>org.apache.tuscany.sca</groupId>
+                   <artifactId>tuscany-otests-sca-j-caa-tests</artifactId>
+                   <version>2.0-SNAPSHOT</version>
+                   <type>jar</type>
+                   <excludes>commons-logging.properties,oasis-sca-tests.properties,tuscany-oasis-sca-tests-errors.properties</excludes>
+                   <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+                 </artifactItem>
+               </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+    </plugins>
+  </build>
+</project>
diff --git a/testing/compliance-tests/java-ci/pom.xml b/testing/compliance-tests/java-ci/pom.xml
index 06e18f3..a2c1295 100644
--- a/testing/compliance-tests/java-ci/pom.xml
+++ b/testing/compliance-tests/java-ci/pom.xml
@@ -1,146 +1,146 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-compliance-tests</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>tuscany-compliance-test-java-ci</artifactId>

-    <name>Apache Tuscany SCA Specification Compliance Tests Java CI</name>

-

-    <dependencies>

-

-        <dependency>

-            <!-- This is only needed to get the module working in Eclipse which doesn't pick it up from the dependency plugin unpack -->

-            <!-- The dependency plugin unpack is needed as presently the surefire plugin wont run tests in a dependency jar -->

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-otests-sca-j-ci-tests</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-core-runtime-pom</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <type>pom</type>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-base-runtime-pom</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <type>pom</type>

-        </dependency> 

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-osgi-runtime-pom</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <type>pom</type>

-        </dependency> 

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency> 

-

-         <!-- This is need when running with Sun JDK which gets an unsupported operation exception creating an XMLStreamReader from a DOMSource

-             when Tuscany is writing a property value  -->

-         <dependency>

-            <groupId>org.codehaus.woodstox</groupId>

-            <artifactId>wstx-asl</artifactId>

-            <version>3.2.4</version>

-            <scope>runtime</scope>

-            <exclusions>

-                <exclusion>

-                    <groupId>stax</groupId>

-                    <artifactId>stax-api</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-  <build>

-    <finalName>${artifactId}</finalName>

-    <plugins>

-                        

-      <plugin>

-         <groupId>org.apache.maven.plugins</groupId>

-         <artifactId>maven-surefire-plugin</artifactId>

-         <configuration>

-           <excludes>

-           </excludes>

-         </configuration>

-      </plugin>

-

-      <plugin>

-        <groupId>org.apache.maven.plugins</groupId>

-        <artifactId>maven-dependency-plugin</artifactId>

-        <executions>

-          <execution>

-            <id>unpack</id>

-            <phase>test-compile</phase>

-            <goals>

-              <goal>unpack</goal>

-            </goals>

-            <configuration>

-               <artifactItems>

-                 <artifactItem>

-                   <groupId>org.apache.tuscany.sca</groupId>

-                   <artifactId>oasis-jci-contributions</artifactId>

-                   <version>2.0-SNAPSHOT</version>

-                   <type>zip</type>

-                   <outputDirectory>${project.build.directory}/oasis-contributions</outputDirectory>

-                 </artifactItem>

-                 <artifactItem>

-                   <groupId>org.apache.tuscany.sca</groupId>

-                   <artifactId>tuscany-otests-sca-j-ci-tests</artifactId>

-                   <version>2.0-SNAPSHOT</version>

-                   <type>jar</type>

-                   <excludes>commons-logging.properties,oasis-sca-tests.properties,tuscany-oasis-sca-tests-errors.properties</excludes>

-                   <outputDirectory>${project.build.directory}/test-classes</outputDirectory>

-                 </artifactItem>

-               </artifactItems>

-            </configuration>

-          </execution>

-        </executions>

-      </plugin>

-

-    </plugins>

-  </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-compliance-tests</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-compliance-test-java-ci</artifactId>
+    <name>Apache Tuscany SCA Specification Compliance Tests Java CI</name>
+
+    <dependencies>
+
+        <dependency>
+            <!-- This is only needed to get the module working in Eclipse which doesn't pick it up from the dependency plugin unpack -->
+            <!-- The dependency plugin unpack is needed as presently the surefire plugin wont run tests in a dependency jar -->
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-sca-j-ci-tests</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-runtime-pom</artifactId>
+            <version>2.0-Beta1</version>
+            <type>pom</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-base-runtime-pom</artifactId>
+            <version>2.0-Beta1</version>
+            <type>pom</type>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-osgi-runtime-pom</artifactId>
+            <version>2.0-Beta1</version>
+            <type>pom</type>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency> 
+
+         <!-- This is need when running with Sun JDK which gets an unsupported operation exception creating an XMLStreamReader from a DOMSource
+             when Tuscany is writing a property value  -->
+         <dependency>
+            <groupId>org.codehaus.woodstox</groupId>
+            <artifactId>wstx-asl</artifactId>
+            <version>3.2.4</version>
+            <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+  <build>
+    <finalName>${artifactId}</finalName>
+    <plugins>
+                        
+      <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-surefire-plugin</artifactId>
+         <configuration>
+           <excludes>
+           </excludes>
+         </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>unpack</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+               <artifactItems>
+                 <artifactItem>
+                   <groupId>org.apache.tuscany.sca</groupId>
+                   <artifactId>oasis-jci-contributions</artifactId>
+                   <version>2.0-SNAPSHOT</version>
+                   <type>zip</type>
+                   <outputDirectory>${project.build.directory}/oasis-contributions</outputDirectory>
+                 </artifactItem>
+                 <artifactItem>
+                   <groupId>org.apache.tuscany.sca</groupId>
+                   <artifactId>tuscany-otests-sca-j-ci-tests</artifactId>
+                   <version>2.0-SNAPSHOT</version>
+                   <type>jar</type>
+                   <excludes>commons-logging.properties,oasis-sca-tests.properties,tuscany-oasis-sca-tests-errors.properties</excludes>
+                   <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+                 </artifactItem>
+               </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+    </plugins>
+  </build>
+</project>
diff --git a/testing/compliance-tests/policy/pom.xml b/testing/compliance-tests/policy/pom.xml
index 5025990..a30b1f6 100644
--- a/testing/compliance-tests/policy/pom.xml
+++ b/testing/compliance-tests/policy/pom.xml
@@ -1,151 +1,151 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-compliance-tests</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>tuscany-compliance-test-policy</artifactId>

-    <name>Apache Tuscany SCA Specification Compliance Tests Policy</name>

-

-    <dependencies>

-

-        <dependency>

-            <!-- This is only needed to get the module working in Eclipse which doesn't pick it up from the dependency plugin unpack -->

-            <!-- The dependency plugin unpack is needed as presently the surefire plugin wont run tests in a dependency jar -->

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-otests-policy-tests</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-core-runtime-pom</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <type>pom</type>

-        </dependency>

-

-       <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-base-runtime-pom</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <type>pom</type>

-        </dependency> 

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-osgi-runtime-pom</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <type>pom</type>

-        </dependency> 

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency> 

-

-        <dependency>

-            <!-- This is need for POL_4013 and POL_4028 when running with Sun JDK which 

-            gets an unsupported operation exception creating an XMLStreamReader from a DOMSource

-            when Tuscany is writing a property value  -->

-            <groupId>org.codehaus.woodstox</groupId>

-            <artifactId>wstx-asl</artifactId>

-            <version>3.2.4</version>

-            <scope>runtime</scope>

-            <exclusions>

-                <exclusion>

-                    <groupId>stax</groupId>

-                    <artifactId>stax-api</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-  <build>

-    <finalName>${artifactId}</finalName>

-    <plugins>

-                        

-      <plugin>

-         <groupId>org.apache.maven.plugins</groupId>

-         <artifactId>maven-surefire-plugin</artifactId>

-         <configuration>

-           <excludes>

-              <!-- 3002 is no longer part of the suite and 4015/4016 are tests for optional support that Tuscany doesn't provide -->

-              <exclude>**/POL_3002_TestCase.java</exclude>

-              <exclude>**/POL_4015_TestCase.java</exclude>

-              <exclude>**/POL_4016_TestCase.java</exclude>

-           </excludes>

-         </configuration>

-      </plugin>

-

-      <plugin>

-        <groupId>org.apache.maven.plugins</groupId>

-        <artifactId>maven-dependency-plugin</artifactId>

-        <executions>

-          <execution>

-            <id>unpack</id>

-            <phase>test-compile</phase>

-            <goals>

-              <goal>unpack</goal>

-            </goals>

-            <configuration>

-               <artifactItems>

-                 <artifactItem>

-                   <groupId>org.apache.tuscany.sca</groupId>

-                   <artifactId>oasis-policy-contributions</artifactId>

-                   <version>2.0-SNAPSHOT</version>

-                   <type>zip</type>

-                   <outputDirectory>${project.build.directory}/oasis-contributions</outputDirectory>

-                 </artifactItem>

-                 <artifactItem>

-                   <groupId>org.apache.tuscany.sca</groupId>

-                   <artifactId>tuscany-otests-policy-tests</artifactId>

-                   <version>2.0-SNAPSHOT</version>

-                   <type>jar</type>

-                   <excludes>commons-logging.properties,oasis-sca-tests.properties,tuscany-oasis-sca-tests-errors.properties</excludes>

-                   <outputDirectory>${project.build.directory}/test-classes</outputDirectory>

-                 </artifactItem>

-               </artifactItems>

-            </configuration>

-          </execution>

-        </executions>

-      </plugin>

-

-    </plugins>

-  </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-compliance-tests</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-compliance-test-policy</artifactId>
+    <name>Apache Tuscany SCA Specification Compliance Tests Policy</name>
+
+    <dependencies>
+
+        <dependency>
+            <!-- This is only needed to get the module working in Eclipse which doesn't pick it up from the dependency plugin unpack -->
+            <!-- The dependency plugin unpack is needed as presently the surefire plugin wont run tests in a dependency jar -->
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-otests-policy-tests</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-runtime-pom</artifactId>
+            <version>2.0-Beta1</version>
+            <type>pom</type>
+        </dependency>
+
+       <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-base-runtime-pom</artifactId>
+            <version>2.0-Beta1</version>
+            <type>pom</type>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-osgi-runtime-pom</artifactId>
+            <version>2.0-Beta1</version>
+            <type>pom</type>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency> 
+
+        <dependency>
+            <!-- This is need for POL_4013 and POL_4028 when running with Sun JDK which 
+            gets an unsupported operation exception creating an XMLStreamReader from a DOMSource
+            when Tuscany is writing a property value  -->
+            <groupId>org.codehaus.woodstox</groupId>
+            <artifactId>wstx-asl</artifactId>
+            <version>3.2.4</version>
+            <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+  <build>
+    <finalName>${artifactId}</finalName>
+    <plugins>
+                        
+      <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-surefire-plugin</artifactId>
+         <configuration>
+           <excludes>
+              <!-- 3002 is no longer part of the suite and 4015/4016 are tests for optional support that Tuscany doesn't provide -->
+              <exclude>**/POL_3002_TestCase.java</exclude>
+              <exclude>**/POL_4015_TestCase.java</exclude>
+              <exclude>**/POL_4016_TestCase.java</exclude>
+           </excludes>
+         </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>unpack</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+               <artifactItems>
+                 <artifactItem>
+                   <groupId>org.apache.tuscany.sca</groupId>
+                   <artifactId>oasis-policy-contributions</artifactId>
+                   <version>2.0-SNAPSHOT</version>
+                   <type>zip</type>
+                   <outputDirectory>${project.build.directory}/oasis-contributions</outputDirectory>
+                 </artifactItem>
+                 <artifactItem>
+                   <groupId>org.apache.tuscany.sca</groupId>
+                   <artifactId>tuscany-otests-policy-tests</artifactId>
+                   <version>2.0-SNAPSHOT</version>
+                   <type>jar</type>
+                   <excludes>commons-logging.properties,oasis-sca-tests.properties,tuscany-oasis-sca-tests-errors.properties</excludes>
+                   <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+                 </artifactItem>
+               </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+    </plugins>
+  </build>
+</project>
diff --git a/testing/compliance-tests/pom.xml b/testing/compliance-tests/pom.xml
index a891499..a385f3e 100644
--- a/testing/compliance-tests/pom.xml
+++ b/testing/compliance-tests/pom.xml
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-

-    <packaging>pom</packaging>

-    <artifactId>tuscany-compliance-tests</artifactId>

-    <name>Apache Tuscany SCA Compliance Tests</name>

-

-    <repositories>

-        <repository>

-            <!-- OASIS will eventually publish these themselves but for now they're in the Tuscany svn -->

-            <id>oasis.contributions</id>

-            <url>http://svn.apache.org/repos/asf/tuscany/maven</url>

-        </repository>

-    </repositories>

-

-    <modules>

-<!-- TUSCANY-3748 - comment out the tests for the Beta1 Release as OASIS haven't

-     released the test resources anywhere yet. 

-       <module>assembly</module>

-       <module>java-caa</module>

-       <module>java-ci</module>

-       <module>policy</module>

-       <module>binding-ws</module>

--->

-<!-- Tuscany snapshot test artifacts not up to date for JMS

-       <module>binding-jms</module>

--->

-    </modules>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <packaging>pom</packaging>
+    <artifactId>tuscany-compliance-tests</artifactId>
+    <name>Apache Tuscany SCA Compliance Tests</name>
+
+    <repositories>
+        <repository>
+            <!-- OASIS will eventually publish these themselves but for now they're in the Tuscany svn -->
+            <id>oasis.contributions</id>
+            <url>http://svn.apache.org/repos/asf/tuscany/maven</url>
+        </repository>
+    </repositories>
+
+    <modules>
+<!-- TUSCANY-3748 - comment out the tests for the Beta1 Release as OASIS haven't
+     released the test resources anywhere yet. 
+       <module>assembly</module>
+       <module>java-caa</module>
+       <module>java-ci</module>
+       <module>policy</module>
+       <module>binding-ws</module>
+-->
+<!-- Tuscany snapshot test artifacts not up to date for JMS
+       <module>binding-jms</module>
+-->
+    </modules>
+
+</project>
diff --git a/testing/itest/T3558/pom.xml b/testing/itest/T3558/pom.xml
index 6e55bf2..ee363da 100644
--- a/testing/itest/T3558/pom.xml
+++ b/testing/itest/T3558/pom.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-t3558</artifactId>

-    <name>Apache Tuscany SCA iTest T3558</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-base-runtime</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-data-api</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-    </dependencies>

-    

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-t3558</artifactId>
+    <name>Apache Tuscany SCA iTest T3558</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-base-runtime</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-data-api</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+    </dependencies>
+    
+</project>
diff --git a/testing/itest/async-interactions/pom.xml b/testing/itest/async-interactions/pom.xml
index db76429..d2c4e0c 100644
--- a/testing/itest/async-interactions/pom.xml
+++ b/testing/itest/async-interactions/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,19 +34,19 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/testing/itest/base/dependencies/pom.xml b/testing/itest/base/dependencies/pom.xml
index f439a57..17caf72 100644
--- a/testing/itest/base/dependencies/pom.xml
+++ b/testing/itest/base/dependencies/pom.xml
@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-base-dependencies</artifactId>

-    <name>Apache Tuscany SCA iTest Base Dependencies</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-base-runtime</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-    </dependencies>

-    

-    <build>

-       <plugins>

-          <!-- Copy all the dependencies so the test can verify only the expected ones get dragged in -->

-          <plugin>

-             <groupId>org.apache.maven.plugins</groupId>

-             <artifactId>maven-dependency-plugin</artifactId>

-             <executions>

-                <execution>

-                   <id>copy</id>

-                   <phase>compile</phase>

-                   <goals>

-                      <goal>copy-dependencies</goal>

-                   </goals>

-                </execution>

-             </executions>

-          </plugin>

-       </plugins>

-  </build>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-base-dependencies</artifactId>
+    <name>Apache Tuscany SCA iTest Base Dependencies</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-base-runtime</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+    </dependencies>
+    
+    <build>
+       <plugins>
+          <!-- Copy all the dependencies so the test can verify only the expected ones get dragged in -->
+          <plugin>
+             <groupId>org.apache.maven.plugins</groupId>
+             <artifactId>maven-dependency-plugin</artifactId>
+             <executions>
+                <execution>
+                   <id>copy</id>
+                   <phase>compile</phase>
+                   <goals>
+                      <goal>copy-dependencies</goal>
+                   </goals>
+                </execution>
+             </executions>
+          </plugin>
+       </plugins>
+  </build>
+
+</project>
diff --git a/testing/itest/base/pom.xml b/testing/itest/base/pom.xml
index 25e6b85..de4eac6 100644
--- a/testing/itest/base/pom.xml
+++ b/testing/itest/base/pom.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <packaging>pom</packaging>

-    <artifactId>itest-base</artifactId>

-    <name>Apache Tuscany SCA iTest Base</name>

-    

-  <modules>

-    <module>dependencies</module>

-  </modules>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <packaging>pom</packaging>
+    <artifactId>itest-base</artifactId>
+    <name>Apache Tuscany SCA iTest Base</name>
+    
+  <modules>
+    <module>dependencies</module>
+  </modules>
+
+</project>
diff --git a/testing/itest/bpel/helloworld-reference/pom.xml b/testing/itest/bpel/helloworld-reference/pom.xml
index 07bcf7b..35c75f8 100644
--- a/testing/itest/bpel/helloworld-reference/pom.xml
+++ b/testing/itest/bpel/helloworld-reference/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-bpel</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>itest-bpel-helloworld-reference</artifactId>
@@ -39,34 +39,34 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/testing/itest/bpel/helloworld-ws/pom.xml b/testing/itest/bpel/helloworld-ws/pom.xml
index f214559..0b492de 100644
--- a/testing/itest/bpel/helloworld-ws/pom.xml
+++ b/testing/itest/bpel/helloworld-ws/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>itest-bpel</artifactId>
-		<version>2.0-Beta1-SNAPSHOT</version>
+		<version>2.0-Beta1</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>itest-bpel-helloworld-ws
@@ -37,27 +37,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>2.0-Beta1-SNAPSHOT</version>
+			<version>2.0-Beta1</version>
 			<scope>runtime</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-implementation-bpel-runtime</artifactId>
-			<version>2.0-Beta1-SNAPSHOT</version>
+			<version>2.0-Beta1</version>
 			<scope>runtime</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-			<version>2.0-Beta1-SNAPSHOT</version>
+			<version>2.0-Beta1</version>
 			<scope>runtime</scope>
 		</dependency>
 
diff --git a/testing/itest/bpel/helloworld/pom.xml b/testing/itest/bpel/helloworld/pom.xml
index 3671d61..e9a67b0 100644
--- a/testing/itest/bpel/helloworld/pom.xml
+++ b/testing/itest/bpel/helloworld/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>itest-bpel</artifactId>
-		<version>2.0-Beta1-SNAPSHOT</version>
+		<version>2.0-Beta1</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>itest-bpel-helloworld</artifactId>
@@ -40,27 +40,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>2.0-Beta1-SNAPSHOT</version>
+			<version>2.0-Beta1</version>
 			<scope>runtime</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-implementation-bpel-runtime</artifactId>
-			<version>2.0-Beta1-SNAPSHOT</version>
+			<version>2.0-Beta1</version>
 			<scope>runtime</scope>
 		</dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency> 		
 
 		<dependency>
diff --git a/testing/itest/bpel/pom.xml b/testing/itest/bpel/pom.xml
index 0cb762b..5891df1 100644
--- a/testing/itest/bpel/pom.xml
+++ b/testing/itest/bpel/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-bpel</artifactId>
diff --git a/testing/itest/builder/pom.xml b/testing/itest/builder/pom.xml
index 4c517c5..147a694 100644
--- a/testing/itest/builder/pom.xml
+++ b/testing/itest/builder/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-builder</artifactId>
@@ -33,19 +33,19 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>    
 
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>     
         
         <dependency>
diff --git a/testing/itest/callback-api/pom.xml b/testing/itest/callback-api/pom.xml
index c22d714..9d2e22b 100644
--- a/testing/itest/callback-api/pom.xml
+++ b/testing/itest/callback-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/testing/itest/callback-basic/pom.xml b/testing/itest/callback-basic/pom.xml
index b6b7955..29353f8 100644
--- a/testing/itest/callback-basic/pom.xml
+++ b/testing/itest/callback-basic/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/testing/itest/callback-complex-type/pom.xml b/testing/itest/callback-complex-type/pom.xml
index 1ec4518..08b1056 100644
--- a/testing/itest/callback-complex-type/pom.xml
+++ b/testing/itest/callback-complex-type/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/testing/itest/callback-multiple-wires/pom.xml b/testing/itest/callback-multiple-wires/pom.xml
index b05d642..b79d68f 100644
--- a/testing/itest/callback-multiple-wires/pom.xml
+++ b/testing/itest/callback-multiple-wires/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/testing/itest/callback-separatethread/pom.xml b/testing/itest/callback-separatethread/pom.xml
index 2af4034..b83ede0 100644
--- a/testing/itest/callback-separatethread/pom.xml
+++ b/testing/itest/callback-separatethread/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/testing/itest/callback-two-composites/pom.xml b/testing/itest/callback-two-composites/pom.xml
index c55cbbf..fa84df6 100644
--- a/testing/itest/callback-two-composites/pom.xml
+++ b/testing/itest/callback-two-composites/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-two-composites</artifactId>
@@ -32,14 +32,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
             <scope>test</scope>
         </dependency>
@@ -47,14 +47,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/testing/itest/callback-two-nodes/pom.xml b/testing/itest/callback-two-nodes/pom.xml
index 69cc0c3..1282697 100644
--- a/testing/itest/callback-two-nodes/pom.xml
+++ b/testing/itest/callback-two-nodes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-two-nodes</artifactId>
@@ -32,14 +32,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
             <scope>test</scope>
         </dependency>
@@ -47,21 +47,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-hazelcast</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/testing/itest/component-type/pom.xml b/testing/itest/component-type/pom.xml
index f45aacc..823afbb 100644
--- a/testing/itest/component-type/pom.xml
+++ b/testing/itest/component-type/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/testing/itest/contribution-folder/pom.xml b/testing/itest/contribution-folder/pom.xml
index dfb8b1f..35d1f9c 100644
--- a/testing/itest/contribution-folder/pom.xml
+++ b/testing/itest/contribution-folder/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-contribution-folder</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/testing/itest/contribution-zip/pom.xml b/testing/itest/contribution-zip/pom.xml
index c046f17..37cf4da 100644
--- a/testing/itest/contribution-zip/pom.xml
+++ b/testing/itest/contribution-zip/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-contribution-zip</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/testing/itest/corba/pom.xml b/testing/itest/corba/pom.xml
index 114242e..534b727 100644
--- a/testing/itest/corba/pom.xml
+++ b/testing/itest/corba/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-itest</artifactId>
-		<version>2.0-Beta1-SNAPSHOT</version>
+		<version>2.0-Beta1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>itest-corba-binding</artifactId>
@@ -32,55 +32,55 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-node-impl</artifactId>
-			<version>2.0-Beta1-SNAPSHOT</version>
+			<version>2.0-Beta1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>2.0-Beta1-SNAPSHOT</version>
+			<version>2.0-Beta1</version>
 			<scope>runtime</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-corba-runtime</artifactId>
-			<version>2.0-Beta1-SNAPSHOT</version>
+			<version>2.0-Beta1</version>
 			<scope>runtime</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-corba-jse</artifactId>
-			<version>2.0-Beta1-SNAPSHOT</version>
+			<version>2.0-Beta1</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-host-corba-jse-tns</artifactId>
-			<version>2.0-Beta1-SNAPSHOT</version>
+			<version>2.0-Beta1</version>
 			<scope>test</scope>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-sca-runtime</artifactId>
-			<version>2.0-Beta1-SNAPSHOT</version>
+			<version>2.0-Beta1</version>
 			<scope>runtime</scope>
 		</dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding-sdo</artifactId>
-			<version>2.0-Beta1-SNAPSHOT</version>
+			<version>2.0-Beta1</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/testing/itest/databindings/jaxb-bottom-up/pom.xml b/testing/itest/databindings/jaxb-bottom-up/pom.xml
index 9e06f0e..0f3a9ae 100644
--- a/testing/itest/databindings/jaxb-bottom-up/pom.xml
+++ b/testing/itest/databindings/jaxb-bottom-up/pom.xml
@@ -21,14 +21,14 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-databindings</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>itest-databindings-jaxb-bottom-up</artifactId>
-    <version>2.0-Beta1-SNAPSHOT</version>
+    <version>2.0-Beta1</version>
     <name>Apache Tuscany SCA iTest Databinding - JAXB Bottom Up</name>
 
     <repositories>
@@ -60,14 +60,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
             <scope>test</scope>
         </dependency>
@@ -75,14 +75,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
             
diff --git a/testing/itest/databindings/jaxb-top-down/pom.xml b/testing/itest/databindings/jaxb-top-down/pom.xml
index 6d124be..72f6698 100644
--- a/testing/itest/databindings/jaxb-top-down/pom.xml
+++ b/testing/itest/databindings/jaxb-top-down/pom.xml
@@ -24,12 +24,12 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-databindings</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>itest-databindings-jaxb-top-down</artifactId>
-    <version>2.0-Beta1-SNAPSHOT</version>
+    <version>2.0-Beta1</version>
     <name>Apache Tuscany SCA iTest Databinding - JAXB Top Down</name>
 
     <repositories>
@@ -61,14 +61,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
             <scope>test</scope>
         </dependency>
@@ -76,32 +76,32 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>    
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/testing/itest/databindings/pom.xml b/testing/itest/databindings/pom.xml
index ebc7888..23d00c1 100644
--- a/testing/itest/databindings/pom.xml
+++ b/testing/itest/databindings/pom.xml
@@ -22,13 +22,13 @@
   <parent>
       <groupId>org.apache.tuscany.sca</groupId>
       <artifactId>tuscany-itest</artifactId>
-      <version>2.0-Beta1-SNAPSHOT</version>
+      <version>2.0-Beta1</version>
       <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.tuscany.sca</groupId>
   <artifactId>itest-databindings</artifactId>
   <name>Apache Tuscany SCA Databindings Integration Tests</name>
-  <version>2.0-Beta1-SNAPSHOT</version>  
+  <version>2.0-Beta1</version>  
   
   <packaging>pom</packaging>
   <build>
diff --git a/testing/itest/distribution/bin-distro-unzip/pom.xml b/testing/itest/distribution/bin-distro-unzip/pom.xml
index 5de9ccf..691f8fe 100644
--- a/testing/itest/distribution/bin-distro-unzip/pom.xml
+++ b/testing/itest/distribution/bin-distro-unzip/pom.xml
@@ -1,128 +1,128 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-distribution</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-bin-distro-unzip</artifactId>

-    <name>Apache Tuscany SCA iTest Distribution Bin Distro Unzip</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-distribution-all</artifactId>

-            <type>pom</type>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-    </dependencies>

-

-    <!-- HACK: use profile to control if we need to add tools.jar  -->

-    <!-- Mac OS doesn't have tools.jar -->

-    <profiles>

-        <profile>

-            <id>not-sun-jdk</id>

-            <activation>

-                <file>

-                    <missing>${java.home}/../lib/tools.jar</missing>

-                </file>

-            </activation>

-            <build>

-                <plugins>

-                    <plugin>

-                        <groupId>org.apache.maven.plugins</groupId>

-                        <artifactId>maven-antrun-plugin</artifactId>

-                        <executions>

-                            <execution>

-                                <id>run-samples</id>

-                                <phase>verify</phase>

-                                <goals>

-                                    <goal>run</goal>

-                                </goals>

-                                <configuration>

-                                    <tasks>

-                                        <property name="java.home" value="${java.home}"/>

-                                        <property name="tuscany.version" value="${version}" />

-                                        <ant antfile="./build.xml" />

-                                    </tasks>

-                                </configuration>

-                            </execution>

-                        </executions>

-                    </plugin>

-                </plugins>

-            </build>

-        </profile>

-

-        <profile>

-            <id>sun-jdk</id>

-            <activation>

-                <file>

-                    <exists>${java.home}/../lib/tools.jar</exists>

-                </file>

-            </activation>

-            <build>

-                <plugins>

-                    <plugin>

-                        <groupId>org.apache.maven.plugins</groupId>

-                        <artifactId>maven-antrun-plugin</artifactId>

-                        <version>1.3</version>

-

-                        <dependencies>

-                            <dependency>

-                                <groupId>ant</groupId>

-                                <artifactId>ant-trax</artifactId>

-                                <version>1.6.5</version>

-                            </dependency>

-                            <!-- this JDk dependency is a workaround for Maven bug - http://jira.codehaus.org/browse/MNG-1323  -->

-                            <dependency>

-                                <groupId>sun.jdk</groupId>

-                                <artifactId>tools</artifactId>

-                                <version>1.6</version>

-                                <scope>system</scope>

-                                <systemPath>${java.home}/../lib/tools.jar</systemPath>

-                            </dependency>

-                        </dependencies>

-

-                        <executions>

-                            <execution>

-                                <id>run-samples</id>

-                                <phase>verify</phase>

-                                <goals>

-                                    <goal>run</goal>

-                                </goals>

-                                <configuration>

-                                    <tasks>

-                                        <property name="java.home" value="${java.home}"/>

-                                        <property name="tuscany.version" value="${version}" />

-                                        <ant antfile="./build.xml" />

-                                    </tasks>

-                                </configuration>

-                            </execution>

-                        </executions>

-                    </plugin>

-                </plugins>

-            </build>

-        </profile>

-    </profiles>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-distribution</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-bin-distro-unzip</artifactId>
+    <name>Apache Tuscany SCA iTest Distribution Bin Distro Unzip</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distribution-all</artifactId>
+            <type>pom</type>
+            <version>2.0-Beta1</version>
+        </dependency>
+    </dependencies>
+
+    <!-- HACK: use profile to control if we need to add tools.jar  -->
+    <!-- Mac OS doesn't have tools.jar -->
+    <profiles>
+        <profile>
+            <id>not-sun-jdk</id>
+            <activation>
+                <file>
+                    <missing>${java.home}/../lib/tools.jar</missing>
+                </file>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>run-samples</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <tasks>
+                                        <property name="java.home" value="${java.home}"/>
+                                        <property name="tuscany.version" value="${version}" />
+                                        <ant antfile="./build.xml" />
+                                    </tasks>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>sun-jdk</id>
+            <activation>
+                <file>
+                    <exists>${java.home}/../lib/tools.jar</exists>
+                </file>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.3</version>
+
+                        <dependencies>
+                            <dependency>
+                                <groupId>ant</groupId>
+                                <artifactId>ant-trax</artifactId>
+                                <version>1.6.5</version>
+                            </dependency>
+                            <!-- this JDk dependency is a workaround for Maven bug - http://jira.codehaus.org/browse/MNG-1323  -->
+                            <dependency>
+                                <groupId>sun.jdk</groupId>
+                                <artifactId>tools</artifactId>
+                                <version>1.6</version>
+                                <scope>system</scope>
+                                <systemPath>${java.home}/../lib/tools.jar</systemPath>
+                            </dependency>
+                        </dependencies>
+
+                        <executions>
+                            <execution>
+                                <id>run-samples</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <tasks>
+                                        <property name="java.home" value="${java.home}"/>
+                                        <property name="tuscany.version" value="${version}" />
+                                        <ant antfile="./build.xml" />
+                                    </tasks>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/testing/itest/distribution/contribution-binding-jsonrpc-calculator/pom.xml b/testing/itest/distribution/contribution-binding-jsonrpc-calculator/pom.xml
index 37a6166..4689075 100644
--- a/testing/itest/distribution/contribution-binding-jsonrpc-calculator/pom.xml
+++ b/testing/itest/distribution/contribution-binding-jsonrpc-calculator/pom.xml
@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-distribution</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-distribution-contribution-binding-jsonrpc-calculator</artifactId>

-    <name>Apache Tuscany SCA iTest Distribution Contribution binding-jsonrpc Calculator</name>

-

-    <profiles>

-        <profile>

-            <id>distribution</id>

-            <dependencies>

-                <dependency>

-                    <groupId>org.apache.tuscany.sca</groupId>

-                    <artifactId>itest-bin-distro-unzip</artifactId>

-                    <type>pom</type>

-                    <version>2.0-Beta1-SNAPSHOT</version>

-                </dependency>        

-            </dependencies>

-        </profile>

-    </profiles>

-    

-    <build>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-antrun-plugin</artifactId>

-                <version>1.3</version>

-

-                <dependencies>

-                    <dependency>

-                        <groupId>ant</groupId>

-                        <artifactId>ant-trax</artifactId>

-                        <version>1.6.5</version>

-                    </dependency>

-                    <!-- this JDk dependency is a workaround for Maven bug - http://jira.codehaus.org/browse/MNG-1323  -->

-                    <dependency>

-                        <groupId>sun.jdk</groupId>

-                        <artifactId>tools</artifactId>

-                        <version>1.6</version>

-                        <scope>system</scope>

-                        <systemPath>${java.home}/../lib/tools.jar</systemPath>

-                    </dependency>

-                </dependencies>

-

-                <executions>

-                    <execution>

-                        <id>run-samples</id>

-                        <phase>verify</phase>

-                        <goals>

-                            <goal>run</goal>

-                        </goals>

-                        <configuration>

-                            <tasks> 

-                                <property name="tuscany.version" value="${version}" />

-                                <property name="java.home" value="${java.home}"/>

-                                <ant antfile="./build.xml" target="run"/>

-                            </tasks>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-        </plugins>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-distribution</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-distribution-contribution-binding-jsonrpc-calculator</artifactId>
+    <name>Apache Tuscany SCA iTest Distribution Contribution binding-jsonrpc Calculator</name>
+
+    <profiles>
+        <profile>
+            <id>distribution</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.tuscany.sca</groupId>
+                    <artifactId>itest-bin-distro-unzip</artifactId>
+                    <type>pom</type>
+                    <version>2.0-Beta1</version>
+                </dependency>        
+            </dependencies>
+        </profile>
+    </profiles>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.3</version>
+
+                <dependencies>
+                    <dependency>
+                        <groupId>ant</groupId>
+                        <artifactId>ant-trax</artifactId>
+                        <version>1.6.5</version>
+                    </dependency>
+                    <!-- this JDk dependency is a workaround for Maven bug - http://jira.codehaus.org/browse/MNG-1323  -->
+                    <dependency>
+                        <groupId>sun.jdk</groupId>
+                        <artifactId>tools</artifactId>
+                        <version>1.6</version>
+                        <scope>system</scope>
+                        <systemPath>${java.home}/../lib/tools.jar</systemPath>
+                    </dependency>
+                </dependencies>
+
+                <executions>
+                    <execution>
+                        <id>run-samples</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks> 
+                                <property name="tuscany.version" value="${version}" />
+                                <property name="java.home" value="${java.home}"/>
+                                <ant antfile="./build.xml" target="run"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/testing/itest/distribution/contribution-binding-rmi-calculator/pom.xml b/testing/itest/distribution/contribution-binding-rmi-calculator/pom.xml
index 191a52d..0c9de69 100644
--- a/testing/itest/distribution/contribution-binding-rmi-calculator/pom.xml
+++ b/testing/itest/distribution/contribution-binding-rmi-calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distribution-contribution-binding-rmi-calculator</artifactId>
@@ -36,7 +36,7 @@
                     <groupId>org.apache.tuscany.sca</groupId>
                     <artifactId>itest-bin-distro-unzip</artifactId>
                     <type>pom</type>
-                    <version>2.0-Beta1-SNAPSHOT</version>
+                    <version>2.0-Beta1</version>
                 </dependency>        
             </dependencies>
         </profile>
diff --git a/testing/itest/distribution/contribution-binding-sca-calculator/pom.xml b/testing/itest/distribution/contribution-binding-sca-calculator/pom.xml
index 06348f1..ce11250 100644
--- a/testing/itest/distribution/contribution-binding-sca-calculator/pom.xml
+++ b/testing/itest/distribution/contribution-binding-sca-calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distribution-contribution-binding-sca-calculator</artifactId>
@@ -36,7 +36,7 @@
                     <groupId>org.apache.tuscany.sca</groupId>
                     <artifactId>itest-bin-distro-unzip</artifactId>
                     <type>pom</type>
-                    <version>2.0-Beta1-SNAPSHOT</version>
+                    <version>2.0-Beta1</version>
                 </dependency>        
             </dependencies>
         </profile>
diff --git a/testing/itest/distribution/contribution-binding-ws-calculator/pom.xml b/testing/itest/distribution/contribution-binding-ws-calculator/pom.xml
index 4639333..16be1e0 100644
--- a/testing/itest/distribution/contribution-binding-ws-calculator/pom.xml
+++ b/testing/itest/distribution/contribution-binding-ws-calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distribution-contribution-binding-ws-calculator</artifactId>
@@ -36,7 +36,7 @@
                     <groupId>org.apache.tuscany.sca</groupId>
                     <artifactId>itest-bin-distro-unzip</artifactId>
                     <type>pom</type>
-                    <version>2.0-Beta1-SNAPSHOT</version>
+                    <version>2.0-Beta1</version>
                 </dependency>        
             </dependencies>
         </profile>
diff --git a/testing/itest/distribution/contribution-implementation-java-calculator/pom.xml b/testing/itest/distribution/contribution-implementation-java-calculator/pom.xml
index fad466f..47d37ff 100644
--- a/testing/itest/distribution/contribution-implementation-java-calculator/pom.xml
+++ b/testing/itest/distribution/contribution-implementation-java-calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distribution-contribution-implementation-java-calculator</artifactId>
@@ -36,7 +36,7 @@
                     <groupId>org.apache.tuscany.sca</groupId>
                     <artifactId>itest-bin-distro-unzip</artifactId>
                     <type>pom</type>
-                    <version>2.0-Beta1-SNAPSHOT</version>
+                    <version>2.0-Beta1</version>
                 </dependency>        
             </dependencies>
         </profile>
diff --git a/testing/itest/distribution/launcher-embedded-jse/pom.xml b/testing/itest/distribution/launcher-embedded-jse/pom.xml
index fc85954..dcc607e 100644
--- a/testing/itest/distribution/launcher-embedded-jse/pom.xml
+++ b/testing/itest/distribution/launcher-embedded-jse/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distribution-launcher-embedded-jse</artifactId>
@@ -36,7 +36,7 @@
                     <groupId>org.apache.tuscany.sca</groupId>
                     <artifactId>itest-bin-distro-unzip</artifactId>
                     <type>pom</type>
-                    <version>2.0-Beta1-SNAPSHOT</version>
+                    <version>2.0-Beta1</version>
                 </dependency>        
             </dependencies>
         </profile>
diff --git a/testing/itest/distribution/launcher-embedded-osgi/pom.xml b/testing/itest/distribution/launcher-embedded-osgi/pom.xml
index b837c48..53bc2a5 100644
--- a/testing/itest/distribution/launcher-embedded-osgi/pom.xml
+++ b/testing/itest/distribution/launcher-embedded-osgi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distribution-launcher-embedded-osgi</artifactId>
@@ -36,7 +36,7 @@
                     <groupId>org.apache.tuscany.sca</groupId>
                     <artifactId>itest-bin-distro-unzip</artifactId>
                     <type>pom</type>
-                    <version>2.0-Beta1-SNAPSHOT</version>
+                    <version>2.0-Beta1</version>
                 </dependency>        
             </dependencies>
         </profile>
diff --git a/testing/itest/distribution/legal-checks/pom.xml b/testing/itest/distribution/legal-checks/pom.xml
index 0606590..f23efa8 100644
--- a/testing/itest/distribution/legal-checks/pom.xml
+++ b/testing/itest/distribution/legal-checks/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distribution-legal-checks</artifactId>
@@ -36,7 +36,7 @@
                     <groupId>org.apache.tuscany.sca</groupId>
                     <artifactId>itest-bin-distro-unzip</artifactId>
                     <type>pom</type>
-                    <version>2.0-Beta1-SNAPSHOT</version>
+                    <version>2.0-Beta1</version>
                 </dependency>        
             </dependencies>
         </profile>
@@ -56,15 +56,15 @@
                             </execution>
                         </executions>
                         <configuration>
-                           <basedir>../../../../distribution/all/target/apache-tuscany-sca-all-2.0-Beta1-SNAPSHOT.dir</basedir>
+                           <basedir>../../../../distribution/all/target/apache-tuscany-sca-all-2.0-Beta1.dir</basedir>
                            <excludeSubProjects>false</excludeSubProjects>
                            <excludes> 
-                              <exclude>tuscany-sca-2.0-Beta1-SNAPSHOT/CHANGES</exclude>
+                              <exclude>tuscany-sca-2.0-Beta1/CHANGES</exclude>
                               <exclude>**/MANIFEST.MF</exclude>
                               <exclude>**/DEPENDENCIES</exclude>
                               <exclude>**/target/**/*.log</exclude>
                               <exclude>**/config.ini</exclude>
-                              <exclude>tuscany-sca-2.0-Beta1-SNAPSHOT/features/configuration/config.ini</exclude>
+                              <exclude>tuscany-sca-2.0-Beta1/features/configuration/config.ini</exclude>
                            </excludes>
                         </configuration>
                     </plugin>
diff --git a/testing/itest/distribution/pom.xml b/testing/itest/distribution/pom.xml
index 15f5e50..33dc25a 100644
--- a/testing/itest/distribution/pom.xml
+++ b/testing/itest/distribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
@@ -34,7 +34,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-distribution-all</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
     </dependencies>
 
diff --git a/testing/itest/distribution/src-distro-rat/pom.xml b/testing/itest/distribution/src-distro-rat/pom.xml
index f1503e9..ba61b06 100644
--- a/testing/itest/distribution/src-distro-rat/pom.xml
+++ b/testing/itest/distribution/src-distro-rat/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distribution-src-dsitro-rat</artifactId>
@@ -36,7 +36,7 @@
                     <groupId>org.apache.tuscany.sca</groupId>
                     <artifactId>itest-src-distro-unzip</artifactId>
                     <type>pom</type>
-                    <version>2.0-Beta1-SNAPSHOT</version>
+                    <version>2.0-Beta1</version>
                 </dependency>        
             </dependencies>
         </profile>
@@ -56,32 +56,32 @@
                             </execution>
                         </executions>
                         <configuration>
-                           <basedir>../../../../distribution/all/target/apache-tuscany-sca-all-2.0-Beta1-SNAPSHOT-src.dir</basedir>
+                           <basedir>../../../../distribution/all/target/apache-tuscany-sca-all-2.0-Beta1-src.dir</basedir>
                            <excludeSubProjects>false</excludeSubProjects>
                            <excludes> 
-                              <exclude>tuscany-sca-2.0-Beta1-SNAPSHOT-src/CHANGES</exclude>
+                              <exclude>tuscany-sca-2.0-Beta1-src/CHANGES</exclude>
                               <exclude>**/*.MF</exclude>
-                              <exclude>tuscany-sca-2.0-Beta1-SNAPSHOT-src/testing/compliance-tests/binding-ws/sca_variables.dtd</exclude>
-                              <exclude>tuscany-sca-2.0-Beta1-SNAPSHOT-src/testing/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config</exclude>
-                              <exclude>tuscany-sca-2.0-Beta1-SNAPSHOT-src/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/repository/modules/modules.list</exclude>
-                              <exclude>tuscany-sca-2.0-Beta1-SNAPSHOT-src/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/repository/services/services.list</exclude>
-                              <exclude>tuscany-sca-2.0-Beta1-SNAPSHOT-src/modules/implementation-spring-tie/src/main/resources/META-INF/spring.handlers</exclude>
-                              <exclude>tuscany-sca-2.0-Beta1-SNAPSHOT-src/modules/implementation-spring-tie/src/main/resources/META-INF/spring.schemas</exclude>
-                              <exclude>tuscany-sca-2.0-Beta1-SNAPSHOT-src/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.handlers</exclude>
-                              <exclude>tuscany-sca-2.0-Beta1-SNAPSHOT-src/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.schemas</exclude>
-                              <exclude>tuscany-sca-2.0-Beta1-SNAPSHOT-src/maven/archetypes/binding/src/test/resources/projects/basic/goal.txt</exclude>
-                              <exclude>tuscany-sca-2.0-Beta1-SNAPSHOT-src/modules/implementation-python-runtime/src/main/resources/django/__init__.py</exclude>
-                              <exclude>tuscany-sca-2.0-Beta1-SNAPSHOT-src/modules/implementation-python-runtime/src/main/resources/django/utils/__init__.py</exclude>
+                              <exclude>tuscany-sca-2.0-Beta1-src/testing/compliance-tests/binding-ws/sca_variables.dtd</exclude>
+                              <exclude>tuscany-sca-2.0-Beta1-src/testing/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config</exclude>
+                              <exclude>tuscany-sca-2.0-Beta1-src/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/repository/modules/modules.list</exclude>
+                              <exclude>tuscany-sca-2.0-Beta1-src/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/repository/services/services.list</exclude>
+                              <exclude>tuscany-sca-2.0-Beta1-src/modules/implementation-spring-tie/src/main/resources/META-INF/spring.handlers</exclude>
+                              <exclude>tuscany-sca-2.0-Beta1-src/modules/implementation-spring-tie/src/main/resources/META-INF/spring.schemas</exclude>
+                              <exclude>tuscany-sca-2.0-Beta1-src/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.handlers</exclude>
+                              <exclude>tuscany-sca-2.0-Beta1-src/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.schemas</exclude>
+                              <exclude>tuscany-sca-2.0-Beta1-src/maven/archetypes/binding/src/test/resources/projects/basic/goal.txt</exclude>
+                              <exclude>tuscany-sca-2.0-Beta1-src/modules/implementation-python-runtime/src/main/resources/django/__init__.py</exclude>
+                              <exclude>tuscany-sca-2.0-Beta1-src/modules/implementation-python-runtime/src/main/resources/django/utils/__init__.py</exclude>
 
                               <!-- these ones we need to implement RAT license processors to handle the non-AL headers, just exclude for now -->
-                              <exclude>tuscany-sca-2.0-Beta1-SNAPSHOT-src/modules/assembly-xsd/**/*.*</exclude>
-                              <exclude>tuscany-sca-2.0-Beta1-SNAPSHOT-src/modules/sca-api/**/*.*</exclude>
-                              <exclude>tuscany-sca-2.0-Beta1-SNAPSHOT-src/modules/implementation-web-runtime/src/main/resources/META-INF/sca.tld</exclude>
-                              <exclude>tuscany-sca-2.0-Beta1-SNAPSHOT-src/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml</exclude>
-                              <exclude>tuscany-sca-2.0-Beta1-SNAPSHOT-src/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryFinderImpl.java</exclude>
-                              <exclude>tuscany-sca-2.0-Beta1-SNAPSHOT-src/modules/binding-comet-runtime/src/main/resources/jquery.json-2.2.min.js</exclude>
-                              <exclude>tuscany-sca-2.0-Beta1-SNAPSHOT-src/modules/implementation-python-runtime/src/main/resources/django/utils/simplejson/*</exclude>
-                              <exclude>tuscany-sca-2.0-Beta1-SNAPSHOT-src/testing/compliance-tests/binding-jms/src/test/resources/tuscany-oasis-sca-tests-errors.properties</exclude>
+                              <exclude>tuscany-sca-2.0-Beta1-src/modules/assembly-xsd/**/*.*</exclude>
+                              <exclude>tuscany-sca-2.0-Beta1-src/modules/sca-api/**/*.*</exclude>
+                              <exclude>tuscany-sca-2.0-Beta1-src/modules/implementation-web-runtime/src/main/resources/META-INF/sca.tld</exclude>
+                              <exclude>tuscany-sca-2.0-Beta1-src/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml</exclude>
+                              <exclude>tuscany-sca-2.0-Beta1-src/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryFinderImpl.java</exclude>
+                              <exclude>tuscany-sca-2.0-Beta1-src/modules/binding-comet-runtime/src/main/resources/jquery.json-2.2.min.js</exclude>
+                              <exclude>tuscany-sca-2.0-Beta1-src/modules/implementation-python-runtime/src/main/resources/django/utils/simplejson/*</exclude>
+                              <exclude>tuscany-sca-2.0-Beta1-src/testing/compliance-tests/binding-jms/src/test/resources/tuscany-oasis-sca-tests-errors.properties</exclude>
                            </excludes>
                         </configuration>
                     </plugin>
diff --git a/testing/itest/distribution/src-distro-unzip/pom.xml b/testing/itest/distribution/src-distro-unzip/pom.xml
index efbab58..3acf4cd 100644
--- a/testing/itest/distribution/src-distro-unzip/pom.xml
+++ b/testing/itest/distribution/src-distro-unzip/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-src-distro-unzip</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-distribution-all</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
     </dependencies>
 
diff --git a/testing/itest/domains/distributed/pom.xml b/testing/itest/domains/distributed/pom.xml
index fe39415..65fc4fd 100644
--- a/testing/itest/domains/distributed/pom.xml
+++ b/testing/itest/domains/distributed/pom.xml
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-domains-distributed</artifactId>

-    <name>Apache Tuscany SCA itest domain distributed</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-base-runtime-nodep</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-   </build>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-domains-distributed</artifactId>
+    <name>Apache Tuscany SCA itest domain distributed</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-base-runtime-nodep</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+   </build>
+
+</project>
diff --git a/testing/itest/domains/helloworld/pom.xml b/testing/itest/domains/helloworld/pom.xml
index 7e97bae..37b8502 100644
--- a/testing/itest/domains/helloworld/pom.xml
+++ b/testing/itest/domains/helloworld/pom.xml
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-domains-helloworld</artifactId>

-    <name>Apache Tuscany SCA itest domain helloworld</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>provided</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>itest-domains-interfaces</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-

-    <build>

-        <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <artifactId>maven-assembly-plugin</artifactId>

-                <version>2.2-beta-3</version>

-                <dependencies>

-                    <dependency>

-                        <groupId>org.apache.tuscany.sca</groupId>

-                        <artifactId>tuscany-zip-contribution-descriptor</artifactId>

-                        <version>2.0-Beta1-SNAPSHOT</version>

-                    </dependency>

-                </dependencies>

-                <executions>

-                    <execution>

-                        <id>make-assembly</id>

-                        <phase>package</phase>

-                        <goals>

-                            <goal>single</goal>

-                        </goals>

-                        <configuration>

-                            <appendAssemblyId>false</appendAssemblyId>

-                            <descriptors>

-                                <descriptor>tuscany-zip-contribution.xml</descriptor>

-                            </descriptors>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-        </plugins>

-   </build>

-</project>

-

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-domains-helloworld</artifactId>
+    <name>Apache Tuscany SCA itest domain helloworld</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-domains-interfaces</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.2-beta-3</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.tuscany.sca</groupId>
+                        <artifactId>tuscany-zip-contribution-descriptor</artifactId>
+                        <version>2.0-Beta1</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <descriptors>
+                                <descriptor>tuscany-zip-contribution.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+   </build>
+</project>
+
diff --git a/testing/itest/domains/interfaces/pom.xml b/testing/itest/domains/interfaces/pom.xml
index 9dcbd34..a1f13ff 100644
--- a/testing/itest/domains/interfaces/pom.xml
+++ b/testing/itest/domains/interfaces/pom.xml
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-domains-interfaces</artifactId>

-    <name>Apache Tuscany SCA itest domain interfaces</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-   </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-domains-interfaces</artifactId>
+    <name>Apache Tuscany SCA itest domain interfaces</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+   </build>
+</project>
diff --git a/testing/itest/domains/pom.xml b/testing/itest/domains/pom.xml
index d3f9126..3c43621 100644
--- a/testing/itest/domains/pom.xml
+++ b/testing/itest/domains/pom.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-domains</artifactId>

-    <packaging>pom</packaging>

-    <name>Apache Tuscany SCA Domians Integration Tests</name>

-

-    <modules>

-       <module>interfaces</module>

-       <module>helloworld</module>

-       <module>standalone</module>

-       <module>distributed</module>

-    </modules>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-domains</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Tuscany SCA Domians Integration Tests</name>
+
+    <modules>
+       <module>interfaces</module>
+       <module>helloworld</module>
+       <module>standalone</module>
+       <module>distributed</module>
+    </modules>
+</project>
diff --git a/testing/itest/domains/standalone/pom.xml b/testing/itest/domains/standalone/pom.xml
index 7efa969..0b038b4 100644
--- a/testing/itest/domains/standalone/pom.xml
+++ b/testing/itest/domains/standalone/pom.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-sca</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-domains-standalone</artifactId>

-    <name>Apache Tuscany SCA itest domain standalone</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-domain-node</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        

-        <!-- TODO: shouldnt need to have this dependency, should be in DomainNode -->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-client-impl</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-   </build>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-domains-standalone</artifactId>
+    <name>Apache Tuscany SCA itest domain standalone</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-domain-node</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        
+        <!-- TODO: shouldnt need to have this dependency, should be in DomainNode -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-client-impl</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+   </build>
+
+</project>
diff --git a/testing/itest/endpoints/pom.xml b/testing/itest/endpoints/pom.xml
index cb446d2..5ce9027 100644
--- a/testing/itest/endpoints/pom.xml
+++ b/testing/itest/endpoints/pom.xml
@@ -1,68 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-endpoints</artifactId>

-    <name>Apache Tuscany SCA iTest Endpoints</name>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-jsonp-runtime</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-rmi-runtime</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-    </dependencies>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-endpoints</artifactId>
+    <name>Apache Tuscany SCA iTest Endpoints</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jsonp-runtime</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-rmi-runtime</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/testing/itest/exceptions/pom.xml b/testing/itest/exceptions/pom.xml
index 2f418f1..8f31692 100644
--- a/testing/itest/exceptions/pom.xml
+++ b/testing/itest/exceptions/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/testing/itest/implementation-spring/pom.xml b/testing/itest/implementation-spring/pom.xml
index 71cb82e..098bad7 100644
--- a/testing/itest/implementation-spring/pom.xml
+++ b/testing/itest/implementation-spring/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-implementation-spring</artifactId>
@@ -32,19 +32,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
diff --git a/testing/itest/import-export/exports/pom.xml b/testing/itest/import-export/exports/pom.xml
index dd3853c..ffa6db7 100644
--- a/testing/itest/import-export/exports/pom.xml
+++ b/testing/itest/import-export/exports/pom.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-import-export-export</artifactId>

-    <name>Apache Tuscany SCA iTest Import Export Exports</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-    </dependencies>

-    

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-import-export-export</artifactId>
+    <name>Apache Tuscany SCA iTest Import Export Exports</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+    </dependencies>
+    
+</project>
diff --git a/testing/itest/import-export/imports/pom.xml b/testing/itest/import-export/imports/pom.xml
index 893cf20..a1f2de1 100644
--- a/testing/itest/import-export/imports/pom.xml
+++ b/testing/itest/import-export/imports/pom.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-import-export-imports</artifactId>

-    <name>Apache Tuscany SCA iTest Import Export Imports</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>itest-import-export-export</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>provided</scope>

-        </dependency>

-    </dependencies>

-    

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-import-export-imports</artifactId>
+    <name>Apache Tuscany SCA iTest Import Export Imports</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-import-export-export</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    
+</project>
diff --git a/testing/itest/import-export/pom.xml b/testing/itest/import-export/pom.xml
index 2b9bd4a..bbbdcde 100644
--- a/testing/itest/import-export/pom.xml
+++ b/testing/itest/import-export/pom.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <packaging>pom</packaging>

-    <artifactId>itest-import-export</artifactId>

-    <name>Apache Tuscany SCA iTest Import Export</name>

-    

-  <modules>

-    <module>imports</module>

-    <module>exports</module>

-    <module>tests</module>

-  </modules>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <packaging>pom</packaging>
+    <artifactId>itest-import-export</artifactId>
+    <name>Apache Tuscany SCA iTest Import Export</name>
+    
+  <modules>
+    <module>imports</module>
+    <module>exports</module>
+    <module>tests</module>
+  </modules>
+
+</project>
diff --git a/testing/itest/import-export/tests/pom.xml b/testing/itest/import-export/tests/pom.xml
index f6c8d35..ebe67e1 100644
--- a/testing/itest/import-export/tests/pom.xml
+++ b/testing/itest/import-export/tests/pom.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-import-export-tests</artifactId>

-    <name>Apache Tuscany SCA iTest Import Export Tests</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-base-runtime</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-    </dependencies>

-    

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-import-export-tests</artifactId>
+    <name>Apache Tuscany SCA iTest Import Export Tests</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-base-runtime</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+    </dependencies>
+    
+</project>
diff --git a/testing/itest/interfaces/pom.xml b/testing/itest/interfaces/pom.xml
index 8b78c87..cd8f81b 100644
--- a/testing/itest/interfaces/pom.xml
+++ b/testing/itest/interfaces/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/testing/itest/jaxws-asyncclient/pom.xml b/testing/itest/jaxws-asyncclient/pom.xml
index bcd067c..14523b9 100644
--- a/testing/itest/jaxws-asyncclient/pom.xml
+++ b/testing/itest/jaxws-asyncclient/pom.xml
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    

-    <artifactId>itest-jaxws-asyncclient</artifactId>

-    <name>Apache Tuscany JAX-WS Integration Tests</name>

-    

-	<dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-		<dependency>

-			<groupId>org.apache.tuscany.sca</groupId>

-			<artifactId>tuscany-implementation-java-runtime</artifactId>

-			<version>2.0-Beta1-SNAPSHOT</version>

-			<scope>runtime</scope>

-		</dependency>

-

-		<dependency>

-			<groupId>junit</groupId>

-			<artifactId>junit</artifactId>

-			<version>4.8.1</version>

-			<scope>test</scope>

-		</dependency>

-	</dependencies>    

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    
+    <artifactId>itest-jaxws-asyncclient</artifactId>
+    <name>Apache Tuscany JAX-WS Integration Tests</name>
+    
+	<dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-implementation-java-runtime</artifactId>
+			<version>2.0-Beta1</version>
+			<scope>runtime</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.8.1</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>    
+</project>
diff --git a/testing/itest/jaxws/pom.xml b/testing/itest/jaxws/pom.xml
index 38fe604..5cf08ad 100644
--- a/testing/itest/jaxws/pom.xml
+++ b/testing/itest/jaxws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>2.0-Beta1-SNAPSHOT</version>
+			<version>2.0-Beta1</version>
 			<scope>runtime</scope>
 		</dependency>
 
diff --git a/testing/itest/jms/DynamicReplyQ/pom.xml b/testing/itest/jms/DynamicReplyQ/pom.xml
index 83aae0a..b5c297b 100644
--- a/testing/itest/jms/DynamicReplyQ/pom.xml
+++ b/testing/itest/jms/DynamicReplyQ/pom.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-jms-dynamic-replyq</artifactId>

-    <name>Apache Tuscany SCA iTest JMS with dynamic replyq</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-jms-dynamic-replyq</artifactId>
+    <name>Apache Tuscany SCA iTest JMS with dynamic replyq</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/jms/args/pom.xml b/testing/itest/jms/args/pom.xml
index bfbaf84..0ec63f6 100644
--- a/testing/itest/jms/args/pom.xml
+++ b/testing/itest/jms/args/pom.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-jms-args</artifactId>

-    <name>Apache Tuscany SCA iTest JMS Args</name>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-jms-args</artifactId>
+    <name>Apache Tuscany SCA iTest JMS Args</name>
+
+</project>
diff --git a/testing/itest/jms/callbacks/pom.xml b/testing/itest/jms/callbacks/pom.xml
index a8cc782..a6f3d1a 100644
--- a/testing/itest/jms/callbacks/pom.xml
+++ b/testing/itest/jms/callbacks/pom.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-jms-callbacks</artifactId>

-    <name>Apache Tuscany SCA iTest JMS Tests For Callbacks</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-jms-callbacks</artifactId>
+    <name>Apache Tuscany SCA iTest JMS Tests For Callbacks</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/jms/defaults/pom.xml b/testing/itest/jms/defaults/pom.xml
index 1aefc48..c783c8f 100644
--- a/testing/itest/jms/defaults/pom.xml
+++ b/testing/itest/jms/defaults/pom.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-jms-defaults</artifactId>

-    <name>Apache Tuscany SCA iTest JMS with Defaults</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-jms-defaults</artifactId>
+    <name>Apache Tuscany SCA iTest JMS with Defaults</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/jms/definitions/pom.xml b/testing/itest/jms/definitions/pom.xml
index c7e91f9..d34a844 100644
--- a/testing/itest/jms/definitions/pom.xml
+++ b/testing/itest/jms/definitions/pom.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-jms-definitions</artifactId>

-    <name>Apache Tuscany SCA iTest JMS Tests For Properties</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-jms-definitions</artifactId>
+    <name>Apache Tuscany SCA iTest JMS Tests For Properties</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/jms/exceptions/pom.xml b/testing/itest/jms/exceptions/pom.xml
index 6efbfd7..d238679 100644
--- a/testing/itest/jms/exceptions/pom.xml
+++ b/testing/itest/jms/exceptions/pom.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-jms-nonscaclient-exceptions</artifactId>

-    <name>Apache Tuscany SCA iTest JMS NonSCA Client Exceptions</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-jms-nonscaclient-exceptions</artifactId>
+    <name>Apache Tuscany SCA iTest JMS NonSCA Client Exceptions</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/jms/exceptions1/pom.xml b/testing/itest/jms/exceptions1/pom.xml
index ebcac60..2ae0db9 100644
--- a/testing/itest/jms/exceptions1/pom.xml
+++ b/testing/itest/jms/exceptions1/pom.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-jms-exceptions1</artifactId>

-    <name>Apache Tuscany SCA iTest JMS with Exceptions1</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-jms-exceptions1</artifactId>
+    <name>Apache Tuscany SCA iTest JMS with Exceptions1</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/jms/externalBroker/pom.xml b/testing/itest/jms/externalBroker/pom.xml
index d143001..a402ba2 100644
--- a/testing/itest/jms/externalBroker/pom.xml
+++ b/testing/itest/jms/externalBroker/pom.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-jms-external-broker</artifactId>

-    <name>Apache Tuscany SCA iTest JMS with External JMS Broker</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-jms-external-broker</artifactId>
+    <name>Apache Tuscany SCA iTest JMS with External JMS Broker</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/jms/format-jmsbytes/pom.xml b/testing/itest/jms/format-jmsbytes/pom.xml
index 5b21419..e4e3763 100644
--- a/testing/itest/jms/format-jmsbytes/pom.xml
+++ b/testing/itest/jms/format-jmsbytes/pom.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-jms-format-jmsbytes</artifactId>

-    <name>Apache Tuscany SCA iTest JMS Message Format jmsbytes</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-jms-format-jmsbytes</artifactId>
+    <name>Apache Tuscany SCA iTest JMS Message Format jmsbytes</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/jms/format-jmsbytesxml/pom.xml b/testing/itest/jms/format-jmsbytesxml/pom.xml
index 91afad9..5a24048 100644
--- a/testing/itest/jms/format-jmsbytesxml/pom.xml
+++ b/testing/itest/jms/format-jmsbytesxml/pom.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-jms-format-jmsbytesxml</artifactId>

-    <name>Apache Tuscany SCA iTest JMS Message Format jmsbytesxml</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-jms-format-jmsbytesxml</artifactId>
+    <name>Apache Tuscany SCA iTest JMS Message Format jmsbytesxml</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/jms/format-jmsdefault/pom.xml b/testing/itest/jms/format-jmsdefault/pom.xml
index d7a18f0..349942b 100644
--- a/testing/itest/jms/format-jmsdefault/pom.xml
+++ b/testing/itest/jms/format-jmsdefault/pom.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-jms-format-jmsdefault</artifactId>

-    <name>Apache Tuscany SCA iTest JMS Message Format jmsdefault</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-jms-format-jmsdefault</artifactId>
+    <name>Apache Tuscany SCA iTest JMS Message Format jmsdefault</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/jms/format-jmsmessage/pom.xml b/testing/itest/jms/format-jmsmessage/pom.xml
index 9a824d0..5509c68 100644
--- a/testing/itest/jms/format-jmsmessage/pom.xml
+++ b/testing/itest/jms/format-jmsmessage/pom.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-jms-format-jmsmessage</artifactId>

-    <name>Apache Tuscany SCA iTest JMS Message Format jmsmessage</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-jms-format-jmsmessage</artifactId>
+    <name>Apache Tuscany SCA iTest JMS Message Format jmsmessage</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/jms/format-jmsobject/pom.xml b/testing/itest/jms/format-jmsobject/pom.xml
index 0daebda..39b56b7 100644
--- a/testing/itest/jms/format-jmsobject/pom.xml
+++ b/testing/itest/jms/format-jmsobject/pom.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-jms-format-jmsobject</artifactId>

-    <name>Apache Tuscany SCA iTest JMS Message Format jmsobject</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-jms-format-jmsobject</artifactId>
+    <name>Apache Tuscany SCA iTest JMS Message Format jmsobject</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/jms/format-jmstext/pom.xml b/testing/itest/jms/format-jmstext/pom.xml
index 48ebd9f..653529a 100644
--- a/testing/itest/jms/format-jmstext/pom.xml
+++ b/testing/itest/jms/format-jmstext/pom.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-jms-format-jmstext</artifactId>

-    <name>Apache Tuscany SCA iTest JMS Message Format jmstext</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-jms-format-jmstext</artifactId>
+    <name>Apache Tuscany SCA iTest JMS Message Format jmstext</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/jms/format-jmstextxml/pom.xml b/testing/itest/jms/format-jmstextxml/pom.xml
index f1f6335..f8046af 100644
--- a/testing/itest/jms/format-jmstextxml/pom.xml
+++ b/testing/itest/jms/format-jmstextxml/pom.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-jms-format-jmstextxml</artifactId>

-    <name>Apache Tuscany SCA iTest JMS Message Format jmstextxml</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-jms-format-jmstextxml</artifactId>
+    <name>Apache Tuscany SCA iTest JMS Message Format jmstextxml</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml b/testing/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml
index e2f2a4e..9e6fcb9 100644
--- a/testing/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml
+++ b/testing/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-jms-format-jmstextxmlinjmsobjectout</artifactId>

-    <name>Apache Tuscany SCA iTest JMS Message Format jmstextxmlinjmsobjectout</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-jms-format-jmstextxmlinjmsobjectout</artifactId>
+    <name>Apache Tuscany SCA iTest JMS Message Format jmstextxmlinjmsobjectout</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/jms/non-sca-client/pom.xml b/testing/itest/jms/non-sca-client/pom.xml
index c7c86d2..945d62a 100644
--- a/testing/itest/jms/non-sca-client/pom.xml
+++ b/testing/itest/jms/non-sca-client/pom.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-jms-non-sca-client-broker</artifactId>

-    <name>Apache Tuscany SCA iTest JMS with Non SCA Client</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-jms-non-sca-client-broker</artifactId>
+    <name>Apache Tuscany SCA iTest JMS with Non SCA Client</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/jms/noreplyto/pom.xml b/testing/itest/jms/noreplyto/pom.xml
index c2fc1e0..006291b 100644
--- a/testing/itest/jms/noreplyto/pom.xml
+++ b/testing/itest/jms/noreplyto/pom.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-jms-noreplyto</artifactId>

-    <name>Apache Tuscany SCA iTest JMS No replyTo</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-jms-noreplyto</artifactId>
+    <name>Apache Tuscany SCA iTest JMS No replyTo</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/jms/nulls/pom.xml b/testing/itest/jms/nulls/pom.xml
index e7c4cd3..3825e43 100644
--- a/testing/itest/jms/nulls/pom.xml
+++ b/testing/itest/jms/nulls/pom.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-jms-nulls</artifactId>

-    <name>Apache Tuscany SCA iTest JMS Nulls</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-jms-nulls</artifactId>
+    <name>Apache Tuscany SCA iTest JMS Nulls</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/jms/oneway-nocf/pom.xml b/testing/itest/jms/oneway-nocf/pom.xml
index a6a05f9..2d81c0a 100644
--- a/testing/itest/jms/oneway-nocf/pom.xml
+++ b/testing/itest/jms/oneway-nocf/pom.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-jms-oneway-nocf</artifactId>

-    <name>Apache Tuscany SCA iTest JMS for a oneway service</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-jms-oneway-nocf</artifactId>
+    <name>Apache Tuscany SCA iTest JMS for a oneway service</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/jms/oneway/pom.xml b/testing/itest/jms/oneway/pom.xml
index a852f6e..91f8cb2 100644
--- a/testing/itest/jms/oneway/pom.xml
+++ b/testing/itest/jms/oneway/pom.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-jms-oneway</artifactId>

-    <name>Apache Tuscany SCA iTest JMS with Oneway</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-jms-oneway</artifactId>
+    <name>Apache Tuscany SCA iTest JMS with Oneway</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/jms/policy-headers/pom.xml b/testing/itest/jms/policy-headers/pom.xml
index eba4c17..925c151 100644
--- a/testing/itest/jms/policy-headers/pom.xml
+++ b/testing/itest/jms/policy-headers/pom.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-jms-policy-headers</artifactId>

-    <name>Apache Tuscany SCA iTest JMS with Policy Headers</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-jms-policy-headers</artifactId>
+    <name>Apache Tuscany SCA iTest JMS with Policy Headers</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/jms/pom.xml b/testing/itest/jms/pom.xml
index 18ab973..446fe46 100644
--- a/testing/itest/jms/pom.xml
+++ b/testing/itest/jms/pom.xml
@@ -1,98 +1,98 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <packaging>pom</packaging>

-    <artifactId>itest-jms</artifactId>

-    <name>Apache Tuscany SCA iTest JMS</name>

-    

-

-    <dependencies>

-            

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-base-runtime</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency> 

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-jms-runtime</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.activemq</groupId>

-            <artifactId>activemq-core</artifactId>

-            <version>5.2.0</version>

-        </dependency>

-

-        <dependency>

-            <groupId>xmlunit</groupId>

-            <artifactId>xmlunit</artifactId>

-            <version>1.2</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-  <modules>

-    <module>args</module>

-    <module>callbacks</module>

-    <module>defaults</module>

-    <module>DynamicReplyQ</module>

-    <module>exceptions</module>

-    <module>exceptions1</module>

-    <module>externalBroker</module>

-    <module>format-jmsbytes</module>

-    <module>format-jmsbytesxml</module>

-    <module>format-jmsdefault</module>

-    <module>format-jmsmessage</module>

-    <module>format-jmsobject</module>

-    <module>format-jmstext</module>

-    <module>format-jmstextxml</module>

-    <module>format-jmstextxmlinjmsobjectout</module>

-    <module>non-sca-client</module>

-    <module>noreplyto</module>

-    <module>nulls</module>

-    <module>oneway</module>

-    <module>oneway-nocf</module>

-    <module>policy-headers</module>

-    <module>properties</module>

-    <module>responsecf</module>

-    <module>rpc</module>

-    <module>selectors</module>

-    <module>topics</module>

-    <module>ttl</module>

-    <module>uri-rpc</module>

-

-<!-- still to bring up in 2.x

-    <module>definitions</module>

--->

-

-  </modules>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <packaging>pom</packaging>
+    <artifactId>itest-jms</artifactId>
+    <name>Apache Tuscany SCA iTest JMS</name>
+    
+
+    <dependencies>
+            
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-base-runtime</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency> 
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms-runtime</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>5.2.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>xmlunit</groupId>
+            <artifactId>xmlunit</artifactId>
+            <version>1.2</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+  <modules>
+    <module>args</module>
+    <module>callbacks</module>
+    <module>defaults</module>
+    <module>DynamicReplyQ</module>
+    <module>exceptions</module>
+    <module>exceptions1</module>
+    <module>externalBroker</module>
+    <module>format-jmsbytes</module>
+    <module>format-jmsbytesxml</module>
+    <module>format-jmsdefault</module>
+    <module>format-jmsmessage</module>
+    <module>format-jmsobject</module>
+    <module>format-jmstext</module>
+    <module>format-jmstextxml</module>
+    <module>format-jmstextxmlinjmsobjectout</module>
+    <module>non-sca-client</module>
+    <module>noreplyto</module>
+    <module>nulls</module>
+    <module>oneway</module>
+    <module>oneway-nocf</module>
+    <module>policy-headers</module>
+    <module>properties</module>
+    <module>responsecf</module>
+    <module>rpc</module>
+    <module>selectors</module>
+    <module>topics</module>
+    <module>ttl</module>
+    <module>uri-rpc</module>
+
+<!-- still to bring up in 2.x
+    <module>definitions</module>
+-->
+
+  </modules>
+
+</project>
diff --git a/testing/itest/jms/properties/pom.xml b/testing/itest/jms/properties/pom.xml
index 6e762bb..f6e1ee4 100644
--- a/testing/itest/jms/properties/pom.xml
+++ b/testing/itest/jms/properties/pom.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-jms-properties</artifactId>

-    <name>Apache Tuscany SCA iTest JMS with Properties</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-jms-properties</artifactId>
+    <name>Apache Tuscany SCA iTest JMS with Properties</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/jms/responsecf/pom.xml b/testing/itest/jms/responsecf/pom.xml
index 0fe8a31..26a82cb 100644
--- a/testing/itest/jms/responsecf/pom.xml
+++ b/testing/itest/jms/responsecf/pom.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-jms-responsecf</artifactId>

-    <name>Apache Tuscany SCA iTest JMS Response ConnectionFactory</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-jms-responsecf</artifactId>
+    <name>Apache Tuscany SCA iTest JMS Response ConnectionFactory</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/jms/rpc/pom.xml b/testing/itest/jms/rpc/pom.xml
index 83ddb0d..0d44c17 100644
--- a/testing/itest/jms/rpc/pom.xml
+++ b/testing/itest/jms/rpc/pom.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-jms-rpc</artifactId>

-    <name>Apache Tuscany SCA iTest JMS with RPC</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-jms-rpc</artifactId>
+    <name>Apache Tuscany SCA iTest JMS with RPC</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/jms/selectors/pom.xml b/testing/itest/jms/selectors/pom.xml
index 1ff172d..0fea6cd 100644
--- a/testing/itest/jms/selectors/pom.xml
+++ b/testing/itest/jms/selectors/pom.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-jms-selectors</artifactId>

-    <name>Apache Tuscany SCA iTest JMS Tests For Selectors</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-jms-selectors</artifactId>
+    <name>Apache Tuscany SCA iTest JMS Tests For Selectors</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/jms/topics/pom.xml b/testing/itest/jms/topics/pom.xml
index c9bd5ba..b5375a6 100644
--- a/testing/itest/jms/topics/pom.xml
+++ b/testing/itest/jms/topics/pom.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-jms-topics</artifactId>

-    <name>Apache Tuscany SCA iTest JMS Tests for topics</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-jms-topics</artifactId>
+    <name>Apache Tuscany SCA iTest JMS Tests for topics</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/jms/ttl/pom.xml b/testing/itest/jms/ttl/pom.xml
index 8df5225..caed47b 100644
--- a/testing/itest/jms/ttl/pom.xml
+++ b/testing/itest/jms/ttl/pom.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-jms-ttl</artifactId>

-    <name>Apache Tuscany SCA iTest JMS Time To Live</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-jms-ttl</artifactId>
+    <name>Apache Tuscany SCA iTest JMS Time To Live</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/jms/uri-rpc/pom.xml b/testing/itest/jms/uri-rpc/pom.xml
index c1b5a6a..9364f3d 100644
--- a/testing/itest/jms/uri-rpc/pom.xml
+++ b/testing/itest/jms/uri-rpc/pom.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>itest-jms</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-jms-uri-rpc</artifactId>

-    <name>Apache Tuscany SCA iTest JMS with URI RPC</name>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-jms</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-jms-uri-rpc</artifactId>
+    <name>Apache Tuscany SCA iTest JMS with URI RPC</name>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/node-launcher-equinox/pom.xml b/testing/itest/node-launcher-equinox/pom.xml
index a4ae255..bdb2e10 100644
--- a/testing/itest/node-launcher-equinox/pom.xml
+++ b/testing/itest/node-launcher-equinox/pom.xml
@@ -1,76 +1,76 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-node-launcher-equinox</artifactId>

-    <name>Apache Tuscany SCA iTest Node Launcher Exuinox</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-launcher-equinox</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-extensibility-equinox</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-

-        <!-- dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-http-runtime</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency-->

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-node-launcher-equinox</artifactId>
+    <name>Apache Tuscany SCA iTest Node Launcher Exuinox</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-launcher-equinox</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-api</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-extensibility-equinox</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-http-runtime</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>test</scope>
+        </dependency-->
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/testing/itest/nodes/binding-sca-hazelcast/pom.xml b/testing/itest/nodes/binding-sca-hazelcast/pom.xml
index 9c2f835..009a351 100644
--- a/testing/itest/nodes/binding-sca-hazelcast/pom.xml
+++ b/testing/itest/nodes/binding-sca-hazelcast/pom.xml
@@ -1,73 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-nodes-binding-sca-hazelcast</artifactId>

-    <name>Apache Tuscany SCA iTest Nodes binding.sca Using Hazelcast Registry</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-base-runtime</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-domain-hazelcast</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>        

-    </dependencies>

-    <build>

-            <plugins>

-                <plugin>

-                    <groupId>org.apache.maven.plugins</groupId>

-                    <artifactId>maven-surefire-plugin</artifactId>

-                    <version>2.5</version>

-                    <configuration>

-                        <includes>

-                            <include>**/*TestCase.java</include>

-                        </includes>

-                        <reportFormat>brief</reportFormat>

-                        <useFile>true</useFile>

-                        <forkMode>once</forkMode>

-                        <argLine>-ea -Xmx256m</argLine>

-                        <parallel>off</parallel>

-                    </configuration>

-                </plugin>

-            </plugins>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-nodes-binding-sca-hazelcast</artifactId>
+    <name>Apache Tuscany SCA iTest Nodes binding.sca Using Hazelcast Registry</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-base-runtime</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-domain-hazelcast</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>runtime</scope>
+        </dependency>        
+    </dependencies>
+    <build>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.5</version>
+                    <configuration>
+                        <includes>
+                            <include>**/*TestCase.java</include>
+                        </includes>
+                        <reportFormat>brief</reportFormat>
+                        <useFile>true</useFile>
+                        <forkMode>once</forkMode>
+                        <argLine>-ea -Xmx256m</argLine>
+                        <parallel>off</parallel>
+                    </configuration>
+                </plugin>
+            </plugins>
+    </build>
+</project>
diff --git a/testing/itest/nodes/binding-sca-tribes/pom.xml b/testing/itest/nodes/binding-sca-tribes/pom.xml
index 4a55531..a0abfad 100644
--- a/testing/itest/nodes/binding-sca-tribes/pom.xml
+++ b/testing/itest/nodes/binding-sca-tribes/pom.xml
@@ -1,70 +1,70 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-nodes-binding-sca-tribes</artifactId>

-    <name>Apache Tuscany SCA iTest Nodes binding.sca Using Tribes Registry</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-client-impl</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-endpoint-tribes</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-rmi-runtime</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-    </dependencies>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-nodes-binding-sca-tribes</artifactId>
+    <name>Apache Tuscany SCA iTest Nodes binding.sca Using Tribes Registry</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-client-impl</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-endpoint-tribes</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-rmi-runtime</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>2.0-Beta1</version>
+            <scope>runtime</scope>
+        </dependency>        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/testing/itest/nodes/helloworld-client/pom.xml b/testing/itest/nodes/helloworld-client/pom.xml
index 819404f..8fe211f 100644
--- a/testing/itest/nodes/helloworld-client/pom.xml
+++ b/testing/itest/nodes/helloworld-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-helloworld-client</artifactId>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-nodes-helloworld-iface</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/testing/itest/nodes/helloworld-iface/pom.xml b/testing/itest/nodes/helloworld-iface/pom.xml
index d717a6e..089c6dc 100644
--- a/testing/itest/nodes/helloworld-iface/pom.xml
+++ b/testing/itest/nodes/helloworld-iface/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-helloworld-iface</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/testing/itest/nodes/helloworld-service-a/pom.xml b/testing/itest/nodes/helloworld-service-a/pom.xml
index 68eec04..5407045 100644
--- a/testing/itest/nodes/helloworld-service-a/pom.xml
+++ b/testing/itest/nodes/helloworld-service-a/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-helloworld-service-a</artifactId>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-nodes-helloworld-iface</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/testing/itest/nodes/helloworld-service-and-client/pom.xml b/testing/itest/nodes/helloworld-service-and-client/pom.xml
index 07b4bb9..686f4cc 100644
--- a/testing/itest/nodes/helloworld-service-and-client/pom.xml
+++ b/testing/itest/nodes/helloworld-service-and-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-helloworld-service-and-client</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/testing/itest/nodes/helloworld-service-b/pom.xml b/testing/itest/nodes/helloworld-service-b/pom.xml
index cf0def3..f008688 100644
--- a/testing/itest/nodes/helloworld-service-b/pom.xml
+++ b/testing/itest/nodes/helloworld-service-b/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-helloworld-service-b</artifactId>
@@ -32,18 +32,18 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-nodes-helloworld-iface</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/testing/itest/nodes/helloworld-service-c/pom.xml b/testing/itest/nodes/helloworld-service-c/pom.xml
index 19639cf..069ca1e 100644
--- a/testing/itest/nodes/helloworld-service-c/pom.xml
+++ b/testing/itest/nodes/helloworld-service-c/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-helloworld-Serivce-c</artifactId>
@@ -32,18 +32,18 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-nodes-helloworld-iface</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/testing/itest/nodes/helloworld-service/pom.xml b/testing/itest/nodes/helloworld-service/pom.xml
index f0546cc..83b5a93 100644
--- a/testing/itest/nodes/helloworld-service/pom.xml
+++ b/testing/itest/nodes/helloworld-service/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-helloworld-service</artifactId>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-nodes-helloworld-iface</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/testing/itest/nodes/one-jvm-hazelcast-client/pom.xml b/testing/itest/nodes/one-jvm-hazelcast-client/pom.xml
index 9faca9a..62ede09 100644
--- a/testing/itest/nodes/one-jvm-hazelcast-client/pom.xml
+++ b/testing/itest/nodes/one-jvm-hazelcast-client/pom.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-nodes-one-jvm-hazelcast-client</artifactId>

-    <name>Apache Tuscany SCA iTest Nodes One JVM Using Hazelcast and client</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>itest-nodes-helloworld-iface</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-base-runtime</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-domain-hazelcast</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-    </dependencies>

-    <build>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-nodes-one-jvm-hazelcast-client</artifactId>
+    <name>Apache Tuscany SCA iTest Nodes One JVM Using Hazelcast and client</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-nodes-helloworld-iface</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-base-runtime</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-domain-hazelcast</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+    </dependencies>
+    <build>
+    </build>
+</project>
diff --git a/testing/itest/nodes/one-jvm-hazelcast/pom.xml b/testing/itest/nodes/one-jvm-hazelcast/pom.xml
index 2737fbb..c979b91 100644
--- a/testing/itest/nodes/one-jvm-hazelcast/pom.xml
+++ b/testing/itest/nodes/one-jvm-hazelcast/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-one-jvm-hazelcast</artifactId>
@@ -32,22 +32,22 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-nodes-helloworld-service-and-client</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>    
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-nodes-helloworld-iface</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-hazelcast</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/testing/itest/nodes/one-jvm-tribes/pom.xml b/testing/itest/nodes/one-jvm-tribes/pom.xml
index 4c3efc9..df4aa77 100644
--- a/testing/itest/nodes/one-jvm-tribes/pom.xml
+++ b/testing/itest/nodes/one-jvm-tribes/pom.xml
@@ -1,82 +1,82 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-nodes-one-jvm-tribes</artifactId>

-    <name>Apache Tuscany SCA iTest Nodes One JVM Using Tribes Registry</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>itest-nodes-helloworld-iface</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-client-impl</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-endpoint-tribes</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-rmi-runtime</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-    </dependencies>

-    <build>

-            <plugins>

-                <plugin>

-                    <groupId>org.apache.maven.plugins</groupId>

-                    <artifactId>maven-surefire-plugin</artifactId>

-                    <version>2.5</version>

-                    <configuration>

-                        <includes>

-                            <include>**/*TestCase.java</include>

-                        </includes>

-                        <reportFormat>brief</reportFormat>

-                        <useFile>false</useFile>

-                        <forkMode>once</forkMode>

-                        <argLine>-ea -Xmx256m</argLine>

-                        <parallel>off</parallel>

-                    </configuration>

-                </plugin>

-            </plugins>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-nodes-one-jvm-tribes</artifactId>
+    <name>Apache Tuscany SCA iTest Nodes One JVM Using Tribes Registry</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-nodes-helloworld-iface</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-client-impl</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-endpoint-tribes</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-rmi-runtime</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+    </dependencies>
+    <build>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.5</version>
+                    <configuration>
+                        <includes>
+                            <include>**/*TestCase.java</include>
+                        </includes>
+                        <reportFormat>brief</reportFormat>
+                        <useFile>false</useFile>
+                        <forkMode>once</forkMode>
+                        <argLine>-ea -Xmx256m</argLine>
+                        <parallel>off</parallel>
+                    </configuration>
+                </plugin>
+            </plugins>
+    </build>
+</project>
diff --git a/testing/itest/nodes/one-jvm/pom.xml b/testing/itest/nodes/one-jvm/pom.xml
index ef5c30a..a01fe4a 100644
--- a/testing/itest/nodes/one-jvm/pom.xml
+++ b/testing/itest/nodes/one-jvm/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-one-jvm</artifactId>
@@ -32,22 +32,22 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-nodes-helloworld-iface</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-client-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/testing/itest/nodes/one-node-test/pom.xml b/testing/itest/nodes/one-node-test/pom.xml
index 549c78a..185aa36 100644
--- a/testing/itest/nodes/one-node-test/pom.xml
+++ b/testing/itest/nodes/one-node-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-one-node-test</artifactId>
@@ -32,17 +32,17 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-nodes-helloworld-iface</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/testing/itest/nodes/pom.xml b/testing/itest/nodes/pom.xml
index 9944619..6a599c9 100644
--- a/testing/itest/nodes/pom.xml
+++ b/testing/itest/nodes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/testing/itest/nodes/three-nodes-three-vms-test/pom.xml b/testing/itest/nodes/three-nodes-three-vms-test/pom.xml
index 69f1ebe..dcaae71 100644
--- a/testing/itest/nodes/three-nodes-three-vms-test/pom.xml
+++ b/testing/itest/nodes/three-nodes-three-vms-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-three-nodes-three-vms-test</artifactId>
@@ -32,47 +32,47 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-node</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>    
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-endpoint-tribes</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>    
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-nodes-helloworld-iface</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-client-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-runtime-rmi</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>   
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>   
                             
     </dependencies>
diff --git a/testing/itest/nodes/three-nodes-three-vms-test/service-a-config.xml b/testing/itest/nodes/three-nodes-three-vms-test/service-a-config.xml
index e54c755..1317276 100644
--- a/testing/itest/nodes/three-nodes-three-vms-test/service-a-config.xml
+++ b/testing/itest/nodes/three-nodes-three-vms-test/service-a-config.xml
@@ -30,8 +30,8 @@
     <binding name="sca:binding.ws" baseURIs="http://localhost:8082/ws https://localhost:8082/ws"/>
 
     <!-- Configure a list of contributions -->
-    <contribution uri="iface" location="../helloworld-iface/target/itest-nodes-helloworld-iface-2.0-Beta1-SNAPSHOT.jar"/>
-    <contribution uri="client" location="../helloworld-service-a/target/itest-nodes-helloworld-service-a-2.0-Beta1-SNAPSHOT.jar">
+    <contribution uri="iface" location="../helloworld-iface/target/itest-nodes-helloworld-iface-2.0-Beta1.jar"/>
+    <contribution uri="client" location="../helloworld-service-a/target/itest-nodes-helloworld-service-a-2.0-Beta1.jar">
         <!-- doesn't pick up the deployable composite properly without this?-->
         <deploymentComposite location="service-a.composite"/>
     </contribution>
diff --git a/testing/itest/nodes/two-nodes-test/pom.xml b/testing/itest/nodes/two-nodes-test/pom.xml
index 94a872d..d49a5b4 100644
--- a/testing/itest/nodes/two-nodes-test/pom.xml
+++ b/testing/itest/nodes/two-nodes-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-two-nodes-test</artifactId>
@@ -32,27 +32,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-nodes-helloworld-iface</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-client-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>    
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>             
     </dependencies>
 
diff --git a/testing/itest/nodes/two-nodes-two-vms-hazelcast/client-config.xml b/testing/itest/nodes/two-nodes-two-vms-hazelcast/client-config.xml
index 0aeedb1..654a28d 100644
--- a/testing/itest/nodes/two-nodes-two-vms-hazelcast/client-config.xml
+++ b/testing/itest/nodes/two-nodes-two-vms-hazelcast/client-config.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    *

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    *

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.

--->

-<node xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-    xmlns="http://tuscany.apache.org/xmlns/sca/1.1"

-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

-    uri="http://sample/nodes/TestNode1"

-    domain="default"

-    domainRegistry="tuscany:default">

-

-    <!-- Configure the base URIs for a given binding -->

-    <!-- Each base URI is for a protocol supported by the binding -->

-    <binding name="sca:binding.sca" baseURIs="http://localhost:8081/sca https://localhost:8081/sca"/>

-    <binding name="sca:binding.ws" baseURIs="http://localhost:8082/ws https://localhost:8082/ws"/>

-

-    <!-- Configure a list of contributions -->

-    <contribution uri="iface" location="../helloworld-iface/target/itest-nodes-helloworld-iface-2.0-Beta1-SNAPSHOT.jar"/>

-    <contribution uri="client" location="../helloworld-client/target/itest-nodes-helloworld-client-2.0-Beta1-SNAPSHOT.jar">

-        <!-- doesn't pick up the deployable composite properly without this?-->

-        <deploymentComposite location="helloworld-client.composite"/>

-    </contribution>

-

-</node>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.
+-->
+<node xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+    xmlns="http://tuscany.apache.org/xmlns/sca/1.1"
+    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
+    uri="http://sample/nodes/TestNode1"
+    domain="default"
+    domainRegistry="tuscany:default">
+
+    <!-- Configure the base URIs for a given binding -->
+    <!-- Each base URI is for a protocol supported by the binding -->
+    <binding name="sca:binding.sca" baseURIs="http://localhost:8081/sca https://localhost:8081/sca"/>
+    <binding name="sca:binding.ws" baseURIs="http://localhost:8082/ws https://localhost:8082/ws"/>
+
+    <!-- Configure a list of contributions -->
+    <contribution uri="iface" location="../helloworld-iface/target/itest-nodes-helloworld-iface-2.0-Beta1.jar"/>
+    <contribution uri="client" location="../helloworld-client/target/itest-nodes-helloworld-client-2.0-Beta1.jar">
+        <!-- doesn't pick up the deployable composite properly without this?-->
+        <deploymentComposite location="helloworld-client.composite"/>
+    </contribution>
+
+</node>
diff --git a/testing/itest/nodes/two-nodes-two-vms-hazelcast/client.xml b/testing/itest/nodes/two-nodes-two-vms-hazelcast/client.xml
index 7d9aac7..34b634b 100644
--- a/testing/itest/nodes/two-nodes-two-vms-hazelcast/client.xml
+++ b/testing/itest/nodes/two-nodes-two-vms-hazelcast/client.xml
@@ -1,55 +1,55 @@
-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-<project name="client" default="run">

-

-	<!--echo>${runtime_classpath}</echo-->

-

-	<target name="run">

-	    <java classpath="${runtime_classpath};./target/test-classes" 

-			  classname="itest.Client" 

-			  fork="true"

-			  failonerror="true">

-		</java>	

-	</target>

-

-	

-	<target name="run-cmdline">

-		<java classpath="../../../distribution/all/target/apache-tuscany-sca-all-2.0-Beta1-SNAPSHOT.dir/tuscany-sca-2.0-Beta1-SNAPSHOT/features/tuscany-sca-manifest.jar:./target/test-classes:../helloworld-iface/target/classes" 

-			  classname="itest.Client"

-			  fork="true"

-			  failonerror="true">

-		</java>	

-	</target>

-		

-	<target name="run-cmdline-seq">

-		<sequential>

-            <antcall target="run-cmdline"/>

-			<antcall target="run-cmdline"/>

-            <antcall target="run-cmdline"/>

-		</sequential>

-	</target>	

-	

-	<target name="run-cmdline-par">

-		<parallel>

-            <antcall target="run-cmdline"/>

-			<antcall target="run-cmdline"/>

-            <antcall target="run-cmdline"/>

-		</parallel>

-	</target>	

-</project>

+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project name="client" default="run">
+
+	<!--echo>${runtime_classpath}</echo-->
+
+	<target name="run">
+	    <java classpath="${runtime_classpath};./target/test-classes" 
+			  classname="itest.Client" 
+			  fork="true"
+			  failonerror="true">
+		</java>	
+	</target>
+
+	
+	<target name="run-cmdline">
+		<java classpath="../../../distribution/all/target/apache-tuscany-sca-all-2.0-Beta1.dir/tuscany-sca-2.0-Beta1/features/tuscany-sca-manifest.jar:./target/test-classes:../helloworld-iface/target/classes" 
+			  classname="itest.Client"
+			  fork="true"
+			  failonerror="true">
+		</java>	
+	</target>
+		
+	<target name="run-cmdline-seq">
+		<sequential>
+            <antcall target="run-cmdline"/>
+			<antcall target="run-cmdline"/>
+            <antcall target="run-cmdline"/>
+		</sequential>
+	</target>	
+	
+	<target name="run-cmdline-par">
+		<parallel>
+            <antcall target="run-cmdline"/>
+			<antcall target="run-cmdline"/>
+            <antcall target="run-cmdline"/>
+		</parallel>
+	</target>	
+</project>
diff --git a/testing/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml b/testing/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml
index 0dd715b..258e9f6 100644
--- a/testing/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml
+++ b/testing/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml
@@ -1,109 +1,109 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-nodes-two-nodes-two-vms-hazelcast</artifactId>

-    <name>Apache Tuscany SCA iTest Nodes Two Nodes Two VMs Test using Hazelcast registry</name>

-

-    <dependencies>

-        <!--dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-domain-node</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency-->    

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-domain-hazelcast</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency> 

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>itest-nodes-helloworld-iface</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-launcher</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-client-impl</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-sca-runtime</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency> 

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-rmi-runtime</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>   

-                            

-    </dependencies>

-    

-    <build>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-antrun-plugin</artifactId>

-                <executions>

-                    <execution>

-                        <id>run-samples</id>

-                        <phase>test</phase>

-                        <goals>

-                            <goal>run</goal>

-                        </goals>

-                        <configuration>

-                            <tasks unless="maven.test.skip"> 

-                                <property name="tuscany.version" value="${version}" />

-                                <property name="runtime_classpath" refid="maven.runtime.classpath"/>

-                                <ant antfile="./build.xml" target="run"/>

-                            </tasks>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-        </plugins>

-    </build>    

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-nodes-two-nodes-two-vms-hazelcast</artifactId>
+    <name>Apache Tuscany SCA iTest Nodes Two Nodes Two VMs Test using Hazelcast registry</name>
+
+    <dependencies>
+        <!--dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-domain-node</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency-->    
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-domain-hazelcast</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency> 
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-nodes-helloworld-iface</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-launcher</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-client-impl</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-sca-runtime</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency> 
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-rmi-runtime</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>   
+                            
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>run-samples</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks unless="maven.test.skip"> 
+                                <property name="tuscany.version" value="${version}" />
+                                <property name="runtime_classpath" refid="maven.runtime.classpath"/>
+                                <ant antfile="./build.xml" target="run"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>    
+</project>
diff --git a/testing/itest/nodes/two-nodes-two-vms-hazelcast/scaclient.xml b/testing/itest/nodes/two-nodes-two-vms-hazelcast/scaclient.xml
index f2292af..e26600a 100644
--- a/testing/itest/nodes/two-nodes-two-vms-hazelcast/scaclient.xml
+++ b/testing/itest/nodes/two-nodes-two-vms-hazelcast/scaclient.xml
@@ -29,7 +29,7 @@
 	</target>
 
 	<target name="run-cmdline">
-		<java classpath="../../../distribution/all/target/apache-tuscany-sca-all-2.0-Beta1-SNAPSHOT.dir/tuscany-sca-2.0-Beta1-SNAPSHOT/features/tuscany-sca-manifest.jar:./target/test-classes:../helloworld-iface/target/classes" 
+		<java classpath="../../../distribution/all/target/apache-tuscany-sca-all-2.0-Beta1.dir/tuscany-sca-2.0-Beta1/features/tuscany-sca-manifest.jar:./target/test-classes:../helloworld-iface/target/classes" 
 			  classname="itest.SCAClient"
 			  fork="true"
 			  failonerror="true">
diff --git a/testing/itest/nodes/two-nodes-two-vms-hazelcast/server.xml b/testing/itest/nodes/two-nodes-two-vms-hazelcast/server.xml
index d10a82d..b6f5787 100644
--- a/testing/itest/nodes/two-nodes-two-vms-hazelcast/server.xml
+++ b/testing/itest/nodes/two-nodes-two-vms-hazelcast/server.xml
@@ -1,42 +1,42 @@
-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-<project name="server" default="run">

-

-	<!--echo>${runtime_classpath}</echo-->

-

-	<target name="run">

-		<java classpath="${runtime_classpath}" classname="org.apache.tuscany.sca.node.launcher.NodeMain" fork="true">

-			<sysproperty key="org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding" value="{http://tuscany.apache.org/xmlns/sca/1.1}binding.rmi"/>

-			<arg value="-node"/>

-			<arg value="./server-config.xml"/>

-			<!-- Give the server 60 seconds to stay -->

-	        <arg value="-ttl"/>

-	        <arg value="60000"/>

-		</java>

-	</target>

-	

-	<target name="run-cmdline">

-		<java classpath="../../../distribution/all/target/apache-tuscany-sca-all-2.0-Beta1-SNAPSHOT.dir/tuscany-sca-2.0-Beta1-SNAPSHOT/features/tuscany-sca-manifest.jar:./target/test-classes:../helloworld-iface/target/classes" 

-			  classname="itest.Service" 

-			  fork="true"

-			  failonerror="true">	

-		</java>		

-	</target>	

-

-</project>

+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project name="server" default="run">
+
+	<!--echo>${runtime_classpath}</echo-->
+
+	<target name="run">
+		<java classpath="${runtime_classpath}" classname="org.apache.tuscany.sca.node.launcher.NodeMain" fork="true">
+			<sysproperty key="org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding" value="{http://tuscany.apache.org/xmlns/sca/1.1}binding.rmi"/>
+			<arg value="-node"/>
+			<arg value="./server-config.xml"/>
+			<!-- Give the server 60 seconds to stay -->
+	        <arg value="-ttl"/>
+	        <arg value="60000"/>
+		</java>
+	</target>
+	
+	<target name="run-cmdline">
+		<java classpath="../../../distribution/all/target/apache-tuscany-sca-all-2.0-Beta1.dir/tuscany-sca-2.0-Beta1/features/tuscany-sca-manifest.jar:./target/test-classes:../helloworld-iface/target/classes" 
+			  classname="itest.Service" 
+			  fork="true"
+			  failonerror="true">	
+		</java>		
+	</target>	
+
+</project>
diff --git a/testing/itest/nodes/two-nodes-two-vms-test/client-config.xml b/testing/itest/nodes/two-nodes-two-vms-test/client-config.xml
index 3175406..a7f38e9 100644
--- a/testing/itest/nodes/two-nodes-two-vms-test/client-config.xml
+++ b/testing/itest/nodes/two-nodes-two-vms-test/client-config.xml
@@ -30,8 +30,8 @@
     <binding name="sca:binding.ws" baseURIs="http://localhost:8082/ws https://localhost:8082/ws"/>
 
     <!-- Configure a list of contributions -->
-    <contribution uri="iface" location="../helloworld-iface/target/itest-nodes-helloworld-iface-2.0-Beta1-SNAPSHOT.jar"/>
-    <contribution uri="client" location="../helloworld-client/target/itest-nodes-helloworld-client-2.0-Beta1-SNAPSHOT.jar">
+    <contribution uri="iface" location="../helloworld-iface/target/itest-nodes-helloworld-iface-2.0-Beta1.jar"/>
+    <contribution uri="client" location="../helloworld-client/target/itest-nodes-helloworld-client-2.0-Beta1.jar">
         <!-- doesn't pick up the deployable composite properly without this?-->
         <deploymentComposite location="helloworld-client.composite"/>
     </contribution>
diff --git a/testing/itest/nodes/two-nodes-two-vms-test/pom.xml b/testing/itest/nodes/two-nodes-two-vms-test/pom.xml
index 7dbbda6..283efdb 100644
--- a/testing/itest/nodes/two-nodes-two-vms-test/pom.xml
+++ b/testing/itest/nodes/two-nodes-two-vms-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-nodes-two-nodes-two-vms-test</artifactId>
@@ -32,47 +32,47 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-node</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>    
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-endpoint-tribes</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>    
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-nodes-helloworld-iface</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-client-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>   
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>   
                             
     </dependencies>
diff --git a/testing/itest/oneway/build.xml b/testing/itest/oneway/build.xml
index bedda9e..8103339 100644
--- a/testing/itest/oneway/build.xml
+++ b/testing/itest/oneway/build.xml
@@ -22,96 +22,96 @@
 	
     <path id="repo.classpath">   	
     	<pathelement location="target/classes"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\2.0-Beta1-SNAPSHOT\tuscany-core-spi-2.0-Beta1-SNAPSHOT.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\2.0-Beta1-SNAPSHOT\tuscany-host-http-2.0-Beta1-SNAPSHOT.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\2.0-Beta1-SNAPSHOT\tuscany-binding-ws-axis2-2.0-Beta1-SNAPSHOT.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\2.0-Beta1-SNAPSHOT\tuscany-policy-2.0-Beta1-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\2.0-Beta1\tuscany-core-spi-2.0-Beta1.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\2.0-Beta1\tuscany-host-http-2.0-Beta1.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\2.0-Beta1\tuscany-binding-ws-axis2-2.0-Beta1.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\2.0-Beta1\tuscany-policy-2.0-Beta1.jar"/>
     	<pathelement location="${m2.repo}\xerces\xercesImpl\2.8.1\xercesImpl-2.8.1.jar"/>
     	<pathelement location="${m2.repo}\org\mortbay\jetty\jetty-util\6.1.3\jetty-util-6.1.3.jar"/>
     	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-jms_1.1_spec\1.1\geronimo-jms_1.1_spec-1.1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-runtime\2.0-Beta1-SNAPSHOT\tuscany-implementation-java-runtime-2.0-Beta1-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-runtime\2.0-Beta1\tuscany-implementation-java-runtime-2.0-Beta1.jar"/>
     	<pathelement location="${m2.repo}\wsdl4j\wsdl4j\1.6.2\wsdl4j-1.6.2.jar"/>
     	<pathelement location="${m2.repo}\commons-codec\commons-codec\1.3\commons-codec-1.3.jar"/>
     	<pathelement location="${m2.repo}\xml-apis\xml-apis\1.3.03\xml-apis-1.3.03.jar"/>
     	<pathelement location="${m2.repo}\org\apache\ws\security\wss4j\1.5.3\wss4j-1.5.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\2.0-Beta1-SNAPSHOT\tuscany-contribution-namespace-2.0-Beta1-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\2.0-Beta1\tuscany-contribution-namespace-2.0-Beta1.jar"/>
     	<pathelement location="${m2.repo}\jdom\jdom\1.0\jdom-1.0.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xsd\2.0-Beta1-SNAPSHOT\tuscany-assembly-xsd-2.0-Beta1-SNAPSHOT.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\2.0-Beta1-SNAPSHOT\tuscany-assembly-2.0-Beta1-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xsd\2.0-Beta1\tuscany-assembly-xsd-2.0-Beta1.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\2.0-Beta1\tuscany-assembly-2.0-Beta1.jar"/>
     	<pathelement location="${m2.repo}\org\apache\rampart\rampart-trust\1.3\rampart-trust-1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\2.0-Beta1-SNAPSHOT\tuscany-core-databinding-2.0-Beta1-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\2.0-Beta1\tuscany-core-databinding-2.0-Beta1.jar"/>
     	<pathelement location="${m2.repo}\dom4j\dom4j\1.6.1\dom4j-1.6.1.jar"/>
     	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-api\1.2.5\axiom-api-1.2.5.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\2.0-Beta1-SNAPSHOT\tuscany-policy-xml-2.0-Beta1-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\2.0-Beta1\tuscany-policy-xml-2.0-Beta1.jar"/>
     	<pathelement location="${m2.repo}\org\apache\axis2\axis2-kernel\1.3\axis2-kernel-1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-sca-api\2.0-Beta1-SNAPSHOT\tuscany-sca-api-2.0-Beta1-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-sca-api\2.0-Beta1\tuscany-sca-api-2.0-Beta1.jar"/>
     	<pathelement location="${m2.repo}\cglib\cglib-nodep\2.1_3\cglib-nodep-2.1_3.jar"/>
     	<pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore\4.0-alpha5\httpcore-4.0-alpha5.jar"/>
     	<pathelement location="${m2.repo}\backport-util-concurrent\backport-util-concurrent\2.2\backport-util-concurrent-2.2.jar"/>
     	<pathelement location="${m2.repo}\commons-logging\commons-logging\1.1\commons-logging-1.1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\2.0-Beta1-SNAPSHOT\tuscany-contribution-java-2.0-Beta1-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\2.0-Beta1\tuscany-contribution-java-2.0-Beta1.jar"/>
     	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-activation_1.1_spec\1.0-M1\geronimo-activation_1.1_spec-1.0-M1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\2.0-Beta1-SNAPSHOT\tuscany-databinding-2.0-Beta1-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\2.0-Beta1\tuscany-databinding-2.0-Beta1.jar"/>
     	<pathelement location="${m2.repo}\logkit\logkit\1.0.1\logkit-1.0.1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\2.0-Beta1-SNAPSHOT\tuscany-binding-ws-xml-2.0-Beta1-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\2.0-Beta1\tuscany-binding-ws-xml-2.0-Beta1.jar"/>
     	<pathelement location="${m2.repo}\commons-fileupload\commons-fileupload\1.1.1\commons-fileupload-1.1.1.jar"/>
     	<pathelement location="${m2.repo}\annogen\annogen\0.1.0\annogen-0.1.0.jar"/>
     	<pathelement location="${m2.repo}\javax\servlet\servlet-api\2.5\servlet-api-2.5.jar"/>
     	<pathelement location="${m2.repo}\org\apache\axis2\axis2-adb\1.3\axis2-adb-1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-security\2.0-Beta1-SNAPSHOT\tuscany-policy-security-2.0-Beta1-SNAPSHOT.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\2.0-Beta1-SNAPSHOT\tuscany-assembly-xml-2.0-Beta1-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-security\2.0-Beta1\tuscany-policy-security-2.0-Beta1.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\2.0-Beta1\tuscany-assembly-xml-2.0-Beta1.jar"/>
     	<pathelement location="${m2.repo}\org\apache\axis2\axis2-mtompolicy\1.3\axis2-mtompolicy-1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain\2.0-Beta1-SNAPSHOT\tuscany-domain-2.0-Beta1-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain\2.0-Beta1\tuscany-domain-2.0-Beta1.jar"/>
     	<pathelement location="${m2.repo}\commons-httpclient\commons-httpclient\3.0.1\commons-httpclient-3.0.1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\2.0-Beta1-SNAPSHOT\tuscany-interface-java-2.0-Beta1-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\2.0-Beta1\tuscany-interface-java-2.0-Beta1.jar"/>
     	<pathelement location="${m2.repo}\org\apache\axis2\axis2-java2wsdl\1.3\axis2-java2wsdl-1.3.jar"/>
     	<pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore-nio\4.0-alpha5\httpcore-nio-4.0-alpha5.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\2.0-Beta1-SNAPSHOT\tuscany-contribution-2.0-Beta1-SNAPSHOT.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java\2.0-Beta1-SNAPSHOT\tuscany-implementation-java-2.0-Beta1-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\2.0-Beta1\tuscany-contribution-2.0-Beta1.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java\2.0-Beta1\tuscany-implementation-java-2.0-Beta1.jar"/>
     	<pathelement location="${m2.repo}\xalan\xalan\2.7.0\xalan-2.7.0.jar"/>
     	<pathelement location="${m2.repo}\com\ibm\icu\icu4j\2.6.1\icu4j-2.6.1.jar"/>
     	<pathelement location="${m2.repo}\org\apache\rampart\rampart-core\1.3\rampart-core-1.3.jar"/>
     	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-commonj_1.1_spec\1.0\geronimo-commonj_1.1_spec-1.0.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain-api\2.0-Beta1-SNAPSHOT\tuscany-domain-api-2.0-Beta1-SNAPSHOT.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\2.0-Beta1-SNAPSHOT\tuscany-binding-sca-2.0-Beta1-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain-api\2.0-Beta1\tuscany-domain-api-2.0-Beta1.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\2.0-Beta1\tuscany-binding-sca-2.0-Beta1.jar"/>
     	<pathelement location="${m2.repo}\xom\xom\1.0\xom-1.0.jar"/>
     	<pathelement location="${m2.repo}\org\apache\ant\ant-launcher\1.7.0\ant-launcher-1.7.0.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-jetty\2.0-Beta1-SNAPSHOT\tuscany-host-jetty-2.0-Beta1-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-jetty\2.0-Beta1\tuscany-host-jetty-2.0-Beta1.jar"/>
     	<pathelement location="${m2.repo}\org\apache\rampart\rampart-policy\1.3\rampart-policy-1.3.jar"/>
     	<pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore-niossl\4.0-alpha5\httpcore-niossl-4.0-alpha5.jar"/>
     	<pathelement location="${m2.repo}\junit\junit\4.2\junit-4.2.jar"/>
     	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-impl\1.2.5\axiom-impl-1.2.5.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-xml\2.0-Beta1-SNAPSHOT\tuscany-implementation-java-xml-2.0-Beta1-SNAPSHOT.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\2.0-Beta1-SNAPSHOT\tuscany-binding-sca-xml-2.0-Beta1-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-xml\2.0-Beta1\tuscany-implementation-java-xml-2.0-Beta1.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\2.0-Beta1\tuscany-binding-sca-xml-2.0-Beta1.jar"/>
     	<pathelement location="${m2.repo}\org\apache\neethi\neethi\2.0.2\neethi-2.0.2.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\2.0-Beta1-SNAPSHOT\tuscany-interface-wsdl-2.0-Beta1-SNAPSHOT.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\2.0-Beta1-SNAPSHOT\tuscany-binding-ws-2.0-Beta1-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\2.0-Beta1\tuscany-interface-wsdl-2.0-Beta1.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\2.0-Beta1\tuscany-binding-ws-2.0-Beta1.jar"/>
     	<pathelement location="${m2.repo}\javax\activation\activation\1.1\activation-1.1.jar"/>
     	<pathelement location="${m2.repo}\org\apache\ant\ant\1.7.0\ant-1.7.0.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\2.0-Beta1-SNAPSHOT\tuscany-databinding-axiom-2.0-Beta1-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\2.0-Beta1\tuscany-databinding-axiom-2.0-Beta1.jar"/>
     	<pathelement location="${m2.repo}\org\mortbay\jetty\jetty\6.1.3\jetty-6.1.3.jar"/>
     	<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-javamail_1.4_spec\1.0-M1\geronimo-javamail_1.4_spec-1.0-M1.jar"/>
     	<pathelement location="${m2.repo}\avalon-framework\avalon-framework\4.1.3\avalon-framework-4.1.3.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\2.0-Beta1-SNAPSHOT\tuscany-core-2.0-Beta1-SNAPSHOT.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\2.0-Beta1-SNAPSHOT\tuscany-interface-wsdl-xml-2.0-Beta1-SNAPSHOT.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\2.0-Beta1-SNAPSHOT\tuscany-contribution-impl-2.0-Beta1-SNAPSHOT.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-node\2.0-Beta1-SNAPSHOT\tuscany-node-2.0-Beta1-SNAPSHOT.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-definitions\2.0-Beta1-SNAPSHOT\tuscany-definitions-2.0-Beta1-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\2.0-Beta1\tuscany-core-2.0-Beta1.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\2.0-Beta1\tuscany-interface-wsdl-xml-2.0-Beta1.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\2.0-Beta1\tuscany-contribution-impl-2.0-Beta1.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-node\2.0-Beta1\tuscany-node-2.0-Beta1.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-definitions\2.0-Beta1\tuscany-definitions-2.0-Beta1.jar"/>
     	<pathelement location="${m2.repo}\org\apache\santuario\xmlsec\1.4.0\xmlsec-1.4.0.jar"/>
     	<pathelement location="${m2.repo}\jaxen\jaxen\1.1.1\jaxen-1.1.1.jar"/>
     	<pathelement location="${m2.repo}\commons-io\commons-io\1.2\commons-io-1.2.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\2.0-Beta1-SNAPSHOT\tuscany-host-embedded-2.0-Beta1-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\2.0-Beta1\tuscany-host-embedded-2.0-Beta1.jar"/>
     	<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-dom\1.2.5\axiom-dom-1.2.5.jar"/>
     	<pathelement location="${m2.repo}\log4j\log4j\1.2.12\log4j-1.2.12.jar"/>
     	<pathelement location="${m2.repo}\javax\mail\mail\1.4\mail-1.4.jar"/>
     	<pathelement location="${m2.repo}\org\apache\axis2\axis2-codegen\1.3\axis2-codegen-1.3.jar"/>
     	<pathelement location="${m2.repo}\org\codehaus\woodstox\wstx-asl\3.2.1\wstx-asl-3.2.1.jar"/>
     	<pathelement location="${m2.repo}\stax\stax-api\1.0.1\stax-api-1.0.1.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\2.0-Beta1-SNAPSHOT\tuscany-interface-java-xml-2.0-Beta1-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\2.0-Beta1\tuscany-interface-java-xml-2.0-Beta1.jar"/>
     	<pathelement location="${m2.repo}\org\apache\ws\commons\schema\XmlSchema\1.3.2\XmlSchema-1.3.2.jar"/>
     	<pathelement location="${m2.repo}\xerces\xmlParserAPIs\2.6.2\xmlParserAPIs-2.6.2.jar"/>
     	<pathelement location="${m2.repo}\org\apache\woden\woden\1.0-incubating-M7b\woden-1.0-incubating-M7b.jar"/>
-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\2.0-Beta1-SNAPSHOT\tuscany-interface-2.0-Beta1-SNAPSHOT.jar"/>
+    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\2.0-Beta1\tuscany-interface-2.0-Beta1.jar"/>
     	<pathelement location="${m2.repo}\org\easymock\easymock\2.2\easymock-2.2.jar"/>  	
    </path>	
     	
diff --git a/testing/itest/oneway/pom.xml b/testing/itest/oneway/pom.xml
index a988464..b895264 100644
--- a/testing/itest/oneway/pom.xml
+++ b/testing/itest/oneway/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-oneway</artifactId>
     <name>Apache Tuscany SCA iTest OneWay</name>
-    <version>2.0-Beta1-SNAPSHOT</version>
+    <version>2.0-Beta1</version>
 
     <dependencies>
          <dependency>
@@ -39,14 +39,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
             <scope>test</scope>
         </dependency>
@@ -54,14 +54,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>       
     </dependencies>
diff --git a/testing/itest/operation-overloading/pom.xml b/testing/itest/operation-overloading/pom.xml
index 8bd00b4..05cb814 100644
--- a/testing/itest/operation-overloading/pom.xml
+++ b/testing/itest/operation-overloading/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-operation-overloading</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/testing/itest/policies/pom.xml b/testing/itest/policies/pom.xml
index cff7269..768803f 100644
--- a/testing/itest/policies/pom.xml
+++ b/testing/itest/policies/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-policies</artifactId>
@@ -32,26 +32,26 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-logging</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/testing/itest/policy-transaction/pom.xml b/testing/itest/policy-transaction/pom.xml
index 1bc96ec..bb75c59 100644
--- a/testing/itest/policy-transaction/pom.xml
+++ b/testing/itest/policy-transaction/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-policy-transaction</artifactId>
@@ -32,26 +32,26 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-transaction-runtime-geronimo</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>        
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/testing/itest/policy/matching/pom.xml b/testing/itest/policy/matching/pom.xml
index 42f23bc..a9db1f4 100644
--- a/testing/itest/policy/matching/pom.xml
+++ b/testing/itest/policy/matching/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,20 +34,20 @@
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webservice</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
        </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-wspolicy</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
        </dependency>
        
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-logging</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
        </dependency>       
              
     </dependencies>
diff --git a/testing/itest/policy/pom.xml b/testing/itest/policy/pom.xml
index 76da931..9961e10 100644
--- a/testing/itest/policy/pom.xml
+++ b/testing/itest/policy/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/testing/itest/policy/wspolicy/pom.xml b/testing/itest/policy/wspolicy/pom.xml
index 548d0dd..c43a4b2 100644
--- a/testing/itest/policy/wspolicy/pom.xml
+++ b/testing/itest/policy/wspolicy/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,20 +34,20 @@
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webservice</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
        </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-wspolicy</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
        </dependency>
        
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-logging</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
        </dependency>       
              
     </dependencies>
diff --git a/testing/itest/pom.xml b/testing/itest/pom.xml
index e2d8af0..b6352aa 100644
--- a/testing/itest/pom.xml
+++ b/testing/itest/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-itest</artifactId>
diff --git a/testing/itest/properties/pom.xml b/testing/itest/properties/pom.xml
index a9f5650..3538983 100644
--- a/testing/itest/properties/pom.xml
+++ b/testing/itest/properties/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-properties</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
@@ -60,14 +60,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/testing/itest/recursive-multi-level/pom.xml b/testing/itest/recursive-multi-level/pom.xml
index 3df7a4f..ed63915 100644
--- a/testing/itest/recursive-multi-level/pom.xml
+++ b/testing/itest/recursive-multi-level/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/testing/itest/recursive-ws/pom.xml b/testing/itest/recursive-ws/pom.xml
index bdd43df..8a9ef9d 100644
--- a/testing/itest/recursive-ws/pom.xml
+++ b/testing/itest/recursive-ws/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-recursive-ws</artifactId>
     <name>Apache Tuscany SCA iTest Recursive WS</name>
-    <version>2.0-Beta1-SNAPSHOT</version>
+    <version>2.0-Beta1</version>
 
     <dependencies>
         <dependency>
@@ -82,7 +82,7 @@
                 <dependency>
                     <groupId>org.apache.tuscany.sca</groupId>
                     <artifactId>tuscany-host-jetty</artifactId>
-                    <version>2.0-Beta1-SNAPSHOT</version>
+                    <version>2.0-Beta1</version>
                     <scope>runtime</scope>
                 </dependency>
             </dependencies>
diff --git a/testing/itest/references/pom.xml b/testing/itest/references/pom.xml
index 272327f..b76294f 100644
--- a/testing/itest/references/pom.xml
+++ b/testing/itest/references/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/testing/itest/samples/helloworld/pom.xml b/testing/itest/samples/helloworld/pom.xml
index 9ba2c26..2a11f4f 100644
--- a/testing/itest/samples/helloworld/pom.xml
+++ b/testing/itest/samples/helloworld/pom.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-samples-helloworld</artifactId>

-    <name>Apache Tuscany SCA iTest Samples Helloworld</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-domain-node</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-    </dependencies>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-samples-helloworld</artifactId>
+    <name>Apache Tuscany SCA iTest Samples Helloworld</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-domain-node</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/testing/itest/scaclient-api-jse-osgi/pom.xml b/testing/itest/scaclient-api-jse-osgi/pom.xml
index d82d2cb..168179a 100644
--- a/testing/itest/scaclient-api-jse-osgi/pom.xml
+++ b/testing/itest/scaclient-api-jse-osgi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-scaclient-api-jse-osgi</artifactId>
@@ -32,19 +32,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
diff --git a/testing/itest/scaclient-api-osgi/pom.xml b/testing/itest/scaclient-api-osgi/pom.xml
index 5d80dca..5026fe7 100644
--- a/testing/itest/scaclient-api-osgi/pom.xml
+++ b/testing/itest/scaclient-api-osgi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-scaclient-api-osgi</artifactId>
@@ -32,14 +32,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
         </dependency>    
 
diff --git a/testing/itest/scaclient-api-remote/pom.xml b/testing/itest/scaclient-api-remote/pom.xml
index b20f28d..8a2f832 100644
--- a/testing/itest/scaclient-api-remote/pom.xml
+++ b/testing/itest/scaclient-api-remote/pom.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>itest-scaclient-api-remote</artifactId>

-    <name>Apache Tuscany SCA iTest SCAClient API with Hazelcast client</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-base-runtime</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-domain-hazelcast</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-

-    </dependencies>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-scaclient-api-remote</artifactId>
+    <name>Apache Tuscany SCA iTest SCAClient API with Hazelcast client</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-base-runtime</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-domain-hazelcast</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/testing/itest/scaclient-api/pom.xml b/testing/itest/scaclient-api/pom.xml
index fa2f860..9a1b1ad 100644
--- a/testing/itest/scaclient-api/pom.xml
+++ b/testing/itest/scaclient-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-scaclient-api</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-client-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/testing/itest/scdl/pom.xml b/testing/itest/scdl/pom.xml
index d5183a2..679d617 100644
--- a/testing/itest/scdl/pom.xml
+++ b/testing/itest/scdl/pom.xml
@@ -1,79 +1,79 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-scdl</artifactId>

-    <name>Apache Tuscany SCA iTest SCDL</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-deployment</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-jsonp</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-rmi</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>                

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-jms</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>        

-    </dependencies>

-    

-    <build>

-       <plugins>

-          <!-- Copy all the dependencies so the test can verify only the expected ones get dragged in -->

-          <plugin>

-             <groupId>org.apache.maven.plugins</groupId>

-             <artifactId>maven-dependency-plugin</artifactId>

-             <executions>

-                <execution>

-                   <id>copy</id>

-                   <phase>compile</phase>

-                   <goals>

-                      <goal>copy-dependencies</goal>

-                   </goals>

-                </execution>

-             </executions>

-          </plugin>

-       </plugins>

-  </build>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-scdl</artifactId>
+    <name>Apache Tuscany SCA iTest SCDL</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-deployment</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jsonp</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-rmi</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>                
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>        
+    </dependencies>
+    
+    <build>
+       <plugins>
+          <!-- Copy all the dependencies so the test can verify only the expected ones get dragged in -->
+          <plugin>
+             <groupId>org.apache.maven.plugins</groupId>
+             <artifactId>maven-dependency-plugin</artifactId>
+             <executions>
+                <execution>
+                   <id>copy</id>
+                   <phase>compile</phase>
+                   <goals>
+                      <goal>copy-dependencies</goal>
+                   </goals>
+                </execution>
+             </executions>
+          </plugin>
+       </plugins>
+  </build>
+
+</project>
diff --git a/testing/itest/scopes/pom.xml b/testing/itest/scopes/pom.xml
index be527df..90692d8 100644
--- a/testing/itest/scopes/pom.xml
+++ b/testing/itest/scopes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <name>Apache Tuscany SCA iTest Scopes</name>
@@ -32,20 +32,20 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/testing/itest/service-reference/pom.xml b/testing/itest/service-reference/pom.xml
index 75de786..dba4538 100644
--- a/testing/itest/service-reference/pom.xml
+++ b/testing/itest/service-reference/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-service-reference</artifactId>
@@ -32,14 +32,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-runtime-pom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
             <scope>test</scope>
         </dependency>
@@ -47,14 +47,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/testing/itest/services/pom.xml b/testing/itest/services/pom.xml
index d957c1d..5cbc555 100644
--- a/testing/itest/services/pom.xml
+++ b/testing/itest/services/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/testing/itest/wires/pom.xml b/testing/itest/wires/pom.xml
index db500b4..1c4a20c 100644
--- a/testing/itest/wires/pom.xml
+++ b/testing/itest/wires/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</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-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/testing/itest/ws-jaxws/contribution-java-first/pom.xml b/testing/itest/ws-jaxws/contribution-java-first/pom.xml
index 471e868..a70d8b7 100644
--- a/testing/itest/ws-jaxws/contribution-java-first/pom.xml
+++ b/testing/itest/ws-jaxws/contribution-java-first/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,7 +35,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>      
                 
     </dependencies>
diff --git a/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml b/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml
index f824a2e..29a8cff 100644
--- a/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml
+++ b/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,7 +35,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>       
                 
     </dependencies>
diff --git a/testing/itest/ws-jaxws/external-client/pom.xml b/testing/itest/ws-jaxws/external-client/pom.xml
index 5ca9974..b776754 100644
--- a/testing/itest/ws-jaxws/external-client/pom.xml
+++ b/testing/itest/ws-jaxws/external-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -36,14 +36,14 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Bindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-jaxws-ri</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
                 
diff --git a/testing/itest/ws-jaxws/external-service/pom.xml b/testing/itest/ws-jaxws/external-service/pom.xml
index 5302965..24b19d5 100644
--- a/testing/itest/ws-jaxws/external-service/pom.xml
+++ b/testing/itest/ws-jaxws/external-service/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/testing/itest/ws-jaxws/launcher-ri/pom.xml b/testing/itest/ws-jaxws/launcher-ri/pom.xml
index f89b927..4e0fe38 100644
--- a/testing/itest/ws-jaxws/launcher-ri/pom.xml
+++ b/testing/itest/ws-jaxws/launcher-ri/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,7 +35,7 @@
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webservice</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
         </dependency>
 -->
@@ -45,42 +45,42 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Bindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-jaxws-ri</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Databindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <!--
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo-axiom</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         -->
 
@@ -88,20 +88,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <!-- Test resources -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-ws-jaxws-external-client</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-ws-jaxws-external-service</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>        
                 
     </dependencies>
diff --git a/testing/itest/ws-jaxws/pom.xml b/testing/itest/ws-jaxws/pom.xml
index 73d6841..3921a63 100644
--- a/testing/itest/ws-jaxws/pom.xml
+++ b/testing/itest/ws-jaxws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/testing/itest/ws/authentication-basic/pom.xml b/testing/itest/ws/authentication-basic/pom.xml
index beebdd7..116294d 100644
--- a/testing/itest/ws/authentication-basic/pom.xml
+++ b/testing/itest/ws/authentication-basic/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webservice</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
         </dependency>
       
diff --git a/testing/itest/ws/contribution-callback-forwardspec/pom.xml b/testing/itest/ws/contribution-callback-forwardspec/pom.xml
index 081f62d..6d6d478 100644
--- a/testing/itest/ws/contribution-callback-forwardspec/pom.xml
+++ b/testing/itest/ws/contribution-callback-forwardspec/pom.xml
@@ -1,123 +1,123 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-ws-contribution-callback-forwardspec</artifactId>

-    <name>Apache Tuscany SCA iTest WS Contribution Callback Forward Bindings Specified</name>

-

-    <dependencies>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-core</artifactId>

-            <type>pom</type>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>      

-                

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>build-helper-maven-plugin</artifactId>

-                <version>1.0</version>

-                <executions>

-                    <execution>

-                        <id>add-source</id>

-                        <phase>generate-sources</phase>

-                        <goals>

-                            <goal>add-test-source</goal>

-                        </goals>

-                        <configuration>

-                            <sources>

-                                <source>target/jaxws-source</source>

-                            </sources>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>jaxws-maven-plugin</artifactId>

-                <version>1.12</version>

-                <!-- Explicitly add the transitive dependencies for jaxws-api

-                     http://jira.codehaus.org/browse/MEV-498

-                -->

-                <dependencies>

-                    <dependency>

-                        <groupId>javax.jws</groupId>

-                        <artifactId>jsr181-api</artifactId>

-                        <version>1.0-MR1</version>

-                    </dependency>

-                    <dependency>

-                        <groupId>javax.annotation</groupId>

-                        <artifactId>jsr250-api</artifactId>

-                        <version>1.0</version>

-                    </dependency>

-                </dependencies>

-                <executions>

-                    <execution>

-                        <id>wsgen1</id>

-                        <phase>process-classes</phase>

-                        <goals>

-                            <goal>wsgen</goal>

-                        </goals>

-                        <configuration>

-                            <sei>org.apache.tuscany.sca.binding.ws.HelloWorldImpl</sei>

-                            <genWsdl>true</genWsdl>

-                            <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>

-                        </configuration>

-                    </execution>                  

-                    <execution>

-                        <id>wsimport1</id>

-                        <phase>process-resources</phase>

-                        <goals>

-                            <goal>wsimport</goal>

-                        </goals>

-                        <configuration>

-                            <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>

-                            <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>

-                            <wsdlFiles>

-                                <wsdlFile>helloworld-external-service.wsdl</wsdlFile>

-                            </wsdlFiles>

-                            <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>

-                        </configuration>

-                    </execution>                                      

-                </executions>

-                <configuration>

-                    <target>2.1</target>

-                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>

-                    <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>

-                    <verbose>true</verbose>

-                    <xnocompile>true</xnocompile>

-                </configuration>

-            </plugin>                     

-        </plugins>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-ws-contribution-callback-forwardspec</artifactId>
+    <name>Apache Tuscany SCA iTest WS Contribution Callback Forward Bindings Specified</name>
+
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-core</artifactId>
+            <type>pom</type>
+            <version>2.0-Beta1</version>
+        </dependency>      
+                
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>target/jaxws-source</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jaxws-maven-plugin</artifactId>
+                <version>1.12</version>
+                <!-- Explicitly add the transitive dependencies for jaxws-api
+                     http://jira.codehaus.org/browse/MEV-498
+                -->
+                <dependencies>
+                    <dependency>
+                        <groupId>javax.jws</groupId>
+                        <artifactId>jsr181-api</artifactId>
+                        <version>1.0-MR1</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>javax.annotation</groupId>
+                        <artifactId>jsr250-api</artifactId>
+                        <version>1.0</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>wsgen1</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>wsgen</goal>
+                        </goals>
+                        <configuration>
+                            <sei>org.apache.tuscany.sca.binding.ws.HelloWorldImpl</sei>
+                            <genWsdl>true</genWsdl>
+                            <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>
+                        </configuration>
+                    </execution>                  
+                    <execution>
+                        <id>wsimport1</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>wsimport</goal>
+                        </goals>
+                        <configuration>
+                            <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>
+                            <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>
+                            <wsdlFiles>
+                                <wsdlFile>helloworld-external-service.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>
+                        </configuration>
+                    </execution>                                      
+                </executions>
+                <configuration>
+                    <target>2.1</target>
+                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
+                    <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>
+                    <verbose>true</verbose>
+                    <xnocompile>true</xnocompile>
+                </configuration>
+            </plugin>                     
+        </plugins>
+    </build>
+</project>
diff --git a/testing/itest/ws/contribution-callback-fullspec/pom.xml b/testing/itest/ws/contribution-callback-fullspec/pom.xml
index 3eb2b06..8903eca 100644
--- a/testing/itest/ws/contribution-callback-fullspec/pom.xml
+++ b/testing/itest/ws/contribution-callback-fullspec/pom.xml
@@ -1,123 +1,123 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-ws-contribution-callback-fullspec</artifactId>

-    <name>Apache Tuscany SCA iTest WS Contribution Callback Fully Specified</name>

-

-    <dependencies>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-core</artifactId>

-            <type>pom</type>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>      

-                

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>build-helper-maven-plugin</artifactId>

-                <version>1.0</version>

-                <executions>

-                    <execution>

-                        <id>add-source</id>

-                        <phase>generate-sources</phase>

-                        <goals>

-                            <goal>add-test-source</goal>

-                        </goals>

-                        <configuration>

-                            <sources>

-                                <source>target/jaxws-source</source>

-                            </sources>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>jaxws-maven-plugin</artifactId>

-                <version>1.12</version>

-                <!-- Explicitly add the transitive dependencies for jaxws-api

-                     http://jira.codehaus.org/browse/MEV-498

-                -->

-                <dependencies>

-                    <dependency>

-                        <groupId>javax.jws</groupId>

-                        <artifactId>jsr181-api</artifactId>

-                        <version>1.0-MR1</version>

-                    </dependency>

-                    <dependency>

-                        <groupId>javax.annotation</groupId>

-                        <artifactId>jsr250-api</artifactId>

-                        <version>1.0</version>

-                    </dependency>

-                </dependencies>

-                <executions>

-                    <execution>

-                        <id>wsgen1</id>

-                        <phase>process-classes</phase>

-                        <goals>

-                            <goal>wsgen</goal>

-                        </goals>

-                        <configuration>

-                            <sei>org.apache.tuscany.sca.binding.ws.HelloWorldImpl</sei>

-                            <genWsdl>true</genWsdl>

-                            <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>

-                        </configuration>

-                    </execution>                  

-                    <execution>

-                        <id>wsimport1</id>

-                        <phase>process-resources</phase>

-                        <goals>

-                            <goal>wsimport</goal>

-                        </goals>

-                        <configuration>

-                            <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>

-                            <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>

-                            <wsdlFiles>

-                                <wsdlFile>helloworld-external-service.wsdl</wsdlFile>

-                            </wsdlFiles>

-                            <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>

-                        </configuration>

-                    </execution>                                      

-                </executions>

-                <configuration>

-                    <target>2.1</target>

-                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>

-                    <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>

-                    <verbose>true</verbose>

-                    <xnocompile>true</xnocompile>

-                </configuration>

-            </plugin>                     

-        </plugins>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-ws-contribution-callback-fullspec</artifactId>
+    <name>Apache Tuscany SCA iTest WS Contribution Callback Fully Specified</name>
+
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-core</artifactId>
+            <type>pom</type>
+            <version>2.0-Beta1</version>
+        </dependency>      
+                
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>target/jaxws-source</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jaxws-maven-plugin</artifactId>
+                <version>1.12</version>
+                <!-- Explicitly add the transitive dependencies for jaxws-api
+                     http://jira.codehaus.org/browse/MEV-498
+                -->
+                <dependencies>
+                    <dependency>
+                        <groupId>javax.jws</groupId>
+                        <artifactId>jsr181-api</artifactId>
+                        <version>1.0-MR1</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>javax.annotation</groupId>
+                        <artifactId>jsr250-api</artifactId>
+                        <version>1.0</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>wsgen1</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>wsgen</goal>
+                        </goals>
+                        <configuration>
+                            <sei>org.apache.tuscany.sca.binding.ws.HelloWorldImpl</sei>
+                            <genWsdl>true</genWsdl>
+                            <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>
+                        </configuration>
+                    </execution>                  
+                    <execution>
+                        <id>wsimport1</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>wsimport</goal>
+                        </goals>
+                        <configuration>
+                            <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>
+                            <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>
+                            <wsdlFiles>
+                                <wsdlFile>helloworld-external-service.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>
+                        </configuration>
+                    </execution>                                      
+                </executions>
+                <configuration>
+                    <target>2.1</target>
+                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
+                    <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>
+                    <verbose>true</verbose>
+                    <xnocompile>true</xnocompile>
+                </configuration>
+            </plugin>                     
+        </plugins>
+    </build>
+</project>
diff --git a/testing/itest/ws/contribution-callback-promotion/pom.xml b/testing/itest/ws/contribution-callback-promotion/pom.xml
index 1709f59..fe11749 100644
--- a/testing/itest/ws/contribution-callback-promotion/pom.xml
+++ b/testing/itest/ws/contribution-callback-promotion/pom.xml
@@ -1,123 +1,123 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-ws-contribution-callback-promotion</artifactId>

-    <name>Apache Tuscany SCA iTest WS Contribution Callback Promotion</name>

-

-    <dependencies>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-core</artifactId>

-            <type>pom</type>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>      

-                

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>build-helper-maven-plugin</artifactId>

-                <version>1.0</version>

-                <executions>

-                    <execution>

-                        <id>add-source</id>

-                        <phase>generate-sources</phase>

-                        <goals>

-                            <goal>add-test-source</goal>

-                        </goals>

-                        <configuration>

-                            <sources>

-                                <source>target/jaxws-source</source>

-                            </sources>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>jaxws-maven-plugin</artifactId>

-                <version>1.12</version>

-                <!-- Explicitly add the transitive dependencies for jaxws-api

-                     http://jira.codehaus.org/browse/MEV-498

-                -->

-                <dependencies>

-                    <dependency>

-                        <groupId>javax.jws</groupId>

-                        <artifactId>jsr181-api</artifactId>

-                        <version>1.0-MR1</version>

-                    </dependency>

-                    <dependency>

-                        <groupId>javax.annotation</groupId>

-                        <artifactId>jsr250-api</artifactId>

-                        <version>1.0</version>

-                    </dependency>

-                </dependencies>

-                <executions>

-                    <execution>

-                        <id>wsgen1</id>

-                        <phase>process-classes</phase>

-                        <goals>

-                            <goal>wsgen</goal>

-                        </goals>

-                        <configuration>

-                            <sei>org.apache.tuscany.sca.binding.ws.HelloWorldImpl</sei>

-                            <genWsdl>true</genWsdl>

-                            <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>

-                        </configuration>

-                    </execution>                  

-                    <execution>

-                        <id>wsimport1</id>

-                        <phase>process-resources</phase>

-                        <goals>

-                            <goal>wsimport</goal>

-                        </goals>

-                        <configuration>

-                            <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>

-                            <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>

-                            <wsdlFiles>

-                                <wsdlFile>helloworld-external-service.wsdl</wsdlFile>

-                            </wsdlFiles>

-                            <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>

-                        </configuration>

-                    </execution>                                      

-                </executions>

-                <configuration>

-                    <target>2.1</target>

-                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>

-                    <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>

-                    <verbose>true</verbose>

-                    <xnocompile>true</xnocompile>

-                </configuration>

-            </plugin>                     

-        </plugins>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-ws-contribution-callback-promotion</artifactId>
+    <name>Apache Tuscany SCA iTest WS Contribution Callback Promotion</name>
+
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-core</artifactId>
+            <type>pom</type>
+            <version>2.0-Beta1</version>
+        </dependency>      
+                
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>target/jaxws-source</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jaxws-maven-plugin</artifactId>
+                <version>1.12</version>
+                <!-- Explicitly add the transitive dependencies for jaxws-api
+                     http://jira.codehaus.org/browse/MEV-498
+                -->
+                <dependencies>
+                    <dependency>
+                        <groupId>javax.jws</groupId>
+                        <artifactId>jsr181-api</artifactId>
+                        <version>1.0-MR1</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>javax.annotation</groupId>
+                        <artifactId>jsr250-api</artifactId>
+                        <version>1.0</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>wsgen1</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>wsgen</goal>
+                        </goals>
+                        <configuration>
+                            <sei>org.apache.tuscany.sca.binding.ws.HelloWorldImpl</sei>
+                            <genWsdl>true</genWsdl>
+                            <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>
+                        </configuration>
+                    </execution>                  
+                    <execution>
+                        <id>wsimport1</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>wsimport</goal>
+                        </goals>
+                        <configuration>
+                            <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>
+                            <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>
+                            <wsdlFiles>
+                                <wsdlFile>helloworld-external-service.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>
+                        </configuration>
+                    </execution>                                      
+                </executions>
+                <configuration>
+                    <target>2.1</target>
+                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
+                    <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>
+                    <verbose>true</verbose>
+                    <xnocompile>true</xnocompile>
+                </configuration>
+            </plugin>                     
+        </plugins>
+    </build>
+</project>
diff --git a/testing/itest/ws/contribution-callback/pom.xml b/testing/itest/ws/contribution-callback/pom.xml
index 2fc43f6..a309eb8 100644
--- a/testing/itest/ws/contribution-callback/pom.xml
+++ b/testing/itest/ws/contribution-callback/pom.xml
@@ -1,123 +1,123 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-ws-contribution-callback</artifactId>

-    <name>Apache Tuscany SCA iTest WS Contribution Callback </name>

-

-    <dependencies>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-core</artifactId>

-            <type>pom</type>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>      

-                

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>build-helper-maven-plugin</artifactId>

-                <version>1.0</version>

-                <executions>

-                    <execution>

-                        <id>add-source</id>

-                        <phase>generate-sources</phase>

-                        <goals>

-                            <goal>add-test-source</goal>

-                        </goals>

-                        <configuration>

-                            <sources>

-                                <source>target/jaxws-source</source>

-                            </sources>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>jaxws-maven-plugin</artifactId>

-                <version>1.12</version>

-                <!-- Explicitly add the transitive dependencies for jaxws-api

-                     http://jira.codehaus.org/browse/MEV-498

-                -->

-                <dependencies>

-                    <dependency>

-                        <groupId>javax.jws</groupId>

-                        <artifactId>jsr181-api</artifactId>

-                        <version>1.0-MR1</version>

-                    </dependency>

-                    <dependency>

-                        <groupId>javax.annotation</groupId>

-                        <artifactId>jsr250-api</artifactId>

-                        <version>1.0</version>

-                    </dependency>

-                </dependencies>

-                <executions>

-                    <execution>

-                        <id>wsgen1</id>

-                        <phase>process-classes</phase>

-                        <goals>

-                            <goal>wsgen</goal>

-                        </goals>

-                        <configuration>

-                            <sei>org.apache.tuscany.sca.binding.ws.HelloWorldImpl</sei>

-                            <genWsdl>true</genWsdl>

-                            <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>

-                        </configuration>

-                    </execution>                  

-                    <execution>

-                        <id>wsimport1</id>

-                        <phase>process-resources</phase>

-                        <goals>

-                            <goal>wsimport</goal>

-                        </goals>

-                        <configuration>

-                            <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>

-                            <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>

-                            <wsdlFiles>

-                                <wsdlFile>helloworld-external-service.wsdl</wsdlFile>

-                            </wsdlFiles>

-                            <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>

-                        </configuration>

-                    </execution>                                      

-                </executions>

-                <configuration>

-                    <target>2.1</target>

-                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>

-                    <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>

-                    <verbose>true</verbose>

-                    <xnocompile>true</xnocompile>

-                </configuration>

-            </plugin>                     

-        </plugins>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-ws-contribution-callback</artifactId>
+    <name>Apache Tuscany SCA iTest WS Contribution Callback </name>
+
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-core</artifactId>
+            <type>pom</type>
+            <version>2.0-Beta1</version>
+        </dependency>      
+                
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>target/jaxws-source</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jaxws-maven-plugin</artifactId>
+                <version>1.12</version>
+                <!-- Explicitly add the transitive dependencies for jaxws-api
+                     http://jira.codehaus.org/browse/MEV-498
+                -->
+                <dependencies>
+                    <dependency>
+                        <groupId>javax.jws</groupId>
+                        <artifactId>jsr181-api</artifactId>
+                        <version>1.0-MR1</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>javax.annotation</groupId>
+                        <artifactId>jsr250-api</artifactId>
+                        <version>1.0</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>wsgen1</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>wsgen</goal>
+                        </goals>
+                        <configuration>
+                            <sei>org.apache.tuscany.sca.binding.ws.HelloWorldImpl</sei>
+                            <genWsdl>true</genWsdl>
+                            <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>
+                        </configuration>
+                    </execution>                  
+                    <execution>
+                        <id>wsimport1</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>wsimport</goal>
+                        </goals>
+                        <configuration>
+                            <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>
+                            <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>
+                            <wsdlFiles>
+                                <wsdlFile>helloworld-external-service.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>
+                        </configuration>
+                    </execution>                                      
+                </executions>
+                <configuration>
+                    <target>2.1</target>
+                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
+                    <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>
+                    <verbose>true</verbose>
+                    <xnocompile>true</xnocompile>
+                </configuration>
+            </plugin>                     
+        </plugins>
+    </build>
+</project>
diff --git a/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml b/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
index 992223b..5275f82 100644
--- a/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
+++ b/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
@@ -1,123 +1,123 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-ws-contribution-doc-lit-wrapped</artifactId>

-    <name>Apache Tuscany SCA iTest WS Contribution Doc Lit Wrapped </name>

-

-    <dependencies>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-core</artifactId>

-            <type>pom</type>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>      

-                

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>build-helper-maven-plugin</artifactId>

-                <version>1.0</version>

-                <executions>

-                    <execution>

-                        <id>add-source</id>

-                        <phase>generate-sources</phase>

-                        <goals>

-                            <goal>add-test-source</goal>

-                        </goals>

-                        <configuration>

-                            <sources>

-                                <source>target/jaxws-source</source>

-                            </sources>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>jaxws-maven-plugin</artifactId>

-                <version>1.12</version>

-                <!-- Explicitly add the transitive dependencies for jaxws-api

-                     http://jira.codehaus.org/browse/MEV-498

-                -->

-                <dependencies>

-                    <dependency>

-                        <groupId>javax.jws</groupId>

-                        <artifactId>jsr181-api</artifactId>

-                        <version>1.0-MR1</version>

-                    </dependency>

-                    <dependency>

-                        <groupId>javax.annotation</groupId>

-                        <artifactId>jsr250-api</artifactId>

-                        <version>1.0</version>

-                    </dependency>

-                </dependencies>

-                <executions>

-                    <execution>

-                        <id>wsgen1</id>

-                        <phase>process-classes</phase>

-                        <goals>

-                            <goal>wsgen</goal>

-                        </goals>

-                        <configuration>

-                            <sei>org.apache.tuscany.sca.binding.ws.HelloWorld1Impl</sei>

-                            <genWsdl>true</genWsdl>

-                            <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>

-                        </configuration>

-                    </execution>                  

-                    <execution>

-                        <id>wsimport1</id>

-                        <phase>process-resources</phase>

-                        <goals>

-                            <goal>wsimport</goal>

-                        </goals>

-                        <configuration>

-                            <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>

-                            <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>

-                            <wsdlFiles>

-                                <wsdlFile>helloworld-external-service.wsdl</wsdlFile>

-                            </wsdlFiles>

-                            <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>

-                        </configuration>

-                    </execution>                                      

-                </executions>

-                <configuration>

-                    <target>2.1</target>

-                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>

-                    <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>

-                    <verbose>true</verbose>

-                    <xnocompile>true</xnocompile>

-                </configuration>

-            </plugin>                     

-        </plugins>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-ws-contribution-doc-lit-wrapped</artifactId>
+    <name>Apache Tuscany SCA iTest WS Contribution Doc Lit Wrapped </name>
+
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-core</artifactId>
+            <type>pom</type>
+            <version>2.0-Beta1</version>
+        </dependency>      
+                
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>target/jaxws-source</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jaxws-maven-plugin</artifactId>
+                <version>1.12</version>
+                <!-- Explicitly add the transitive dependencies for jaxws-api
+                     http://jira.codehaus.org/browse/MEV-498
+                -->
+                <dependencies>
+                    <dependency>
+                        <groupId>javax.jws</groupId>
+                        <artifactId>jsr181-api</artifactId>
+                        <version>1.0-MR1</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>javax.annotation</groupId>
+                        <artifactId>jsr250-api</artifactId>
+                        <version>1.0</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>wsgen1</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>wsgen</goal>
+                        </goals>
+                        <configuration>
+                            <sei>org.apache.tuscany.sca.binding.ws.HelloWorld1Impl</sei>
+                            <genWsdl>true</genWsdl>
+                            <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>
+                        </configuration>
+                    </execution>                  
+                    <execution>
+                        <id>wsimport1</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>wsimport</goal>
+                        </goals>
+                        <configuration>
+                            <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>
+                            <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>
+                            <wsdlFiles>
+                                <wsdlFile>helloworld-external-service.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>
+                        </configuration>
+                    </execution>                                      
+                </executions>
+                <configuration>
+                    <target>2.1</target>
+                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
+                    <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>
+                    <verbose>true</verbose>
+                    <xnocompile>true</xnocompile>
+                </configuration>
+            </plugin>                     
+        </plugins>
+    </build>
+</project>
diff --git a/testing/itest/ws/contribution-doc-lit/pom.xml b/testing/itest/ws/contribution-doc-lit/pom.xml
index c9b2b20..b8d4c86 100644
--- a/testing/itest/ws/contribution-doc-lit/pom.xml
+++ b/testing/itest/ws/contribution-doc-lit/pom.xml
@@ -1,123 +1,123 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-ws-contribution-doc-lit</artifactId>

-    <name>Apache Tuscany SCA iTest WS Contribution Doc Lit(sometimes called Bare) </name>

-

-    <dependencies>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-core</artifactId>

-            <type>pom</type>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>      

-                

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>build-helper-maven-plugin</artifactId>

-                <version>1.0</version>

-                <executions>

-                    <execution>

-                        <id>add-source</id>

-                        <phase>generate-sources</phase>

-                        <goals>

-                            <goal>add-test-source</goal>

-                        </goals>

-                        <configuration>

-                            <sources>

-                                <source>target/jaxws-source</source>

-                            </sources>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>jaxws-maven-plugin</artifactId>

-                <version>1.12</version>

-                <!-- Explicitly add the transitive dependencies for jaxws-api

-                     http://jira.codehaus.org/browse/MEV-498

-                -->

-                <dependencies>

-                    <dependency>

-                        <groupId>javax.jws</groupId>

-                        <artifactId>jsr181-api</artifactId>

-                        <version>1.0-MR1</version>

-                    </dependency>

-                    <dependency>

-                        <groupId>javax.annotation</groupId>

-                        <artifactId>jsr250-api</artifactId>

-                        <version>1.0</version>

-                    </dependency>

-                </dependencies>

-                <executions>

-                    <execution>

-                        <id>wsgen1</id>

-                        <phase>process-classes</phase>

-                        <goals>

-                            <goal>wsgen</goal>

-                        </goals>

-                        <configuration>

-                            <sei>org.apache.tuscany.sca.binding.ws.HelloWorld1Impl</sei>

-                            <genWsdl>true</genWsdl>

-                            <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>

-                        </configuration>

-                    </execution>                  

-                    <execution>

-                        <id>wsimport1</id>

-                        <phase>process-resources</phase>

-                        <goals>

-                            <goal>wsimport</goal>

-                        </goals>

-                        <configuration>

-                            <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>

-                            <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>

-                            <wsdlFiles>

-                                <wsdlFile>helloworld-external-service.wsdl</wsdlFile>

-                            </wsdlFiles>

-                            <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>

-                        </configuration>

-                    </execution>                                      

-                </executions>

-                <configuration>

-                    <target>2.1</target>

-                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>

-                    <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>

-                    <verbose>true</verbose>

-                    <xnocompile>true</xnocompile>

-                </configuration>

-            </plugin>                     

-        </plugins>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-ws-contribution-doc-lit</artifactId>
+    <name>Apache Tuscany SCA iTest WS Contribution Doc Lit(sometimes called Bare) </name>
+
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-core</artifactId>
+            <type>pom</type>
+            <version>2.0-Beta1</version>
+        </dependency>      
+                
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>target/jaxws-source</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jaxws-maven-plugin</artifactId>
+                <version>1.12</version>
+                <!-- Explicitly add the transitive dependencies for jaxws-api
+                     http://jira.codehaus.org/browse/MEV-498
+                -->
+                <dependencies>
+                    <dependency>
+                        <groupId>javax.jws</groupId>
+                        <artifactId>jsr181-api</artifactId>
+                        <version>1.0-MR1</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>javax.annotation</groupId>
+                        <artifactId>jsr250-api</artifactId>
+                        <version>1.0</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>wsgen1</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>wsgen</goal>
+                        </goals>
+                        <configuration>
+                            <sei>org.apache.tuscany.sca.binding.ws.HelloWorld1Impl</sei>
+                            <genWsdl>true</genWsdl>
+                            <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>
+                        </configuration>
+                    </execution>                  
+                    <execution>
+                        <id>wsimport1</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>wsimport</goal>
+                        </goals>
+                        <configuration>
+                            <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>
+                            <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>
+                            <wsdlFiles>
+                                <wsdlFile>helloworld-external-service.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>
+                        </configuration>
+                    </execution>                                      
+                </executions>
+                <configuration>
+                    <target>2.1</target>
+                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
+                    <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>
+                    <verbose>true</verbose>
+                    <xnocompile>true</xnocompile>
+                </configuration>
+            </plugin>                     
+        </plugins>
+    </build>
+</project>
diff --git a/testing/itest/ws/contribution-java-first/pom.xml b/testing/itest/ws/contribution-java-first/pom.xml
index fa022b9..5dd91ba 100644
--- a/testing/itest/ws/contribution-java-first/pom.xml
+++ b/testing/itest/ws/contribution-java-first/pom.xml
@@ -1,123 +1,123 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-ws-contribution-java-first</artifactId>

-    <name>Apache Tuscany SCA iTest WS Contribution Java First </name>

-

-    <dependencies>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-core</artifactId>

-            <type>pom</type>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>      

-                

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>build-helper-maven-plugin</artifactId>

-                <version>1.0</version>

-                <executions>

-                    <execution>

-                        <id>add-source</id>

-                        <phase>generate-sources</phase>

-                        <goals>

-                            <goal>add-test-source</goal>

-                        </goals>

-                        <configuration>

-                            <sources>

-                                <source>target/jaxws-source</source>

-                            </sources>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>jaxws-maven-plugin</artifactId>

-                <version>1.12</version>

-                <!-- Explicitly add the transitive dependencies for jaxws-api

-                     http://jira.codehaus.org/browse/MEV-498

-                -->

-                <dependencies>

-                    <dependency>

-                        <groupId>javax.jws</groupId>

-                        <artifactId>jsr181-api</artifactId>

-                        <version>1.0-MR1</version>

-                    </dependency>

-                    <dependency>

-                        <groupId>javax.annotation</groupId>

-                        <artifactId>jsr250-api</artifactId>

-                        <version>1.0</version>

-                    </dependency>

-                </dependencies>

-                <executions>

-                    <execution>

-                        <id>wsgen1</id>

-                        <phase>process-classes</phase>

-                        <goals>

-                            <goal>wsgen</goal>

-                        </goals>

-                        <configuration>

-                            <sei>org.apache.tuscany.sca.binding.ws.HelloWorldImpl</sei>

-                            <genWsdl>true</genWsdl>

-                            <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>

-                        </configuration>

-                    </execution>                  

-                    <execution>

-                        <id>wsimport1</id>

-                        <phase>process-resources</phase>

-                        <goals>

-                            <goal>wsimport</goal>

-                        </goals>

-                        <configuration>

-                            <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>

-                            <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>

-                            <wsdlFiles>

-                                <wsdlFile>helloworld-external-service.wsdl</wsdlFile>

-                            </wsdlFiles>

-                            <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>

-                        </configuration>

-                    </execution>                                      

-                </executions>

-                <configuration>

-                    <target>2.1</target>

-                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>

-                    <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>

-                    <verbose>true</verbose>

-                    <xnocompile>true</xnocompile>

-                </configuration>

-            </plugin>                     

-        </plugins>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-ws-contribution-java-first</artifactId>
+    <name>Apache Tuscany SCA iTest WS Contribution Java First </name>
+
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-core</artifactId>
+            <type>pom</type>
+            <version>2.0-Beta1</version>
+        </dependency>      
+                
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>target/jaxws-source</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jaxws-maven-plugin</artifactId>
+                <version>1.12</version>
+                <!-- Explicitly add the transitive dependencies for jaxws-api
+                     http://jira.codehaus.org/browse/MEV-498
+                -->
+                <dependencies>
+                    <dependency>
+                        <groupId>javax.jws</groupId>
+                        <artifactId>jsr181-api</artifactId>
+                        <version>1.0-MR1</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>javax.annotation</groupId>
+                        <artifactId>jsr250-api</artifactId>
+                        <version>1.0</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>wsgen1</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>wsgen</goal>
+                        </goals>
+                        <configuration>
+                            <sei>org.apache.tuscany.sca.binding.ws.HelloWorldImpl</sei>
+                            <genWsdl>true</genWsdl>
+                            <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>
+                        </configuration>
+                    </execution>                  
+                    <execution>
+                        <id>wsimport1</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>wsimport</goal>
+                        </goals>
+                        <configuration>
+                            <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>
+                            <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>
+                            <wsdlFiles>
+                                <wsdlFile>helloworld-external-service.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>
+                        </configuration>
+                    </execution>                                      
+                </executions>
+                <configuration>
+                    <target>2.1</target>
+                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
+                    <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>
+                    <verbose>true</verbose>
+                    <xnocompile>true</xnocompile>
+                </configuration>
+            </plugin>                     
+        </plugins>
+    </build>
+</project>
diff --git a/testing/itest/ws/contribution-rpc-lit/pom.xml b/testing/itest/ws/contribution-rpc-lit/pom.xml
index 8392bbe..adc462d 100644
--- a/testing/itest/ws/contribution-rpc-lit/pom.xml
+++ b/testing/itest/ws/contribution-rpc-lit/pom.xml
@@ -1,123 +1,123 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-ws-contribution-rpc-lit</artifactId>

-    <name>Apache Tuscany SCA iTest WS Contribution RPC Lit</name>

-

-    <dependencies>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-core</artifactId>

-            <type>pom</type>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>      

-                

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>build-helper-maven-plugin</artifactId>

-                <version>1.0</version>

-                <executions>

-                    <execution>

-                        <id>add-source</id>

-                        <phase>generate-sources</phase>

-                        <goals>

-                            <goal>add-test-source</goal>

-                        </goals>

-                        <configuration>

-                            <sources>

-                                <source>target/jaxws-source</source>

-                            </sources>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>jaxws-maven-plugin</artifactId>

-                <version>1.12</version>

-                <!-- Explicitly add the transitive dependencies for jaxws-api

-                     http://jira.codehaus.org/browse/MEV-498

-                -->

-                <dependencies>

-                    <dependency>

-                        <groupId>javax.jws</groupId>

-                        <artifactId>jsr181-api</artifactId>

-                        <version>1.0-MR1</version>

-                    </dependency>

-                    <dependency>

-                        <groupId>javax.annotation</groupId>

-                        <artifactId>jsr250-api</artifactId>

-                        <version>1.0</version>

-                    </dependency>

-                </dependencies>

-                <executions>

-                    <execution>

-                        <id>wsgen1</id>

-                        <phase>process-classes</phase>

-                        <goals>

-                            <goal>wsgen</goal>

-                        </goals>

-                        <configuration>

-                            <sei>org.apache.tuscany.sca.binding.ws.HelloWorld1Impl</sei>

-                            <genWsdl>true</genWsdl>

-                            <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>

-                        </configuration>

-                    </execution>                  

-                    <execution>

-                        <id>wsimport1</id>

-                        <phase>process-resources</phase>

-                        <goals>

-                            <goal>wsimport</goal>

-                        </goals>

-                        <configuration>

-                            <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>

-                            <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>

-                            <wsdlFiles>

-                                <wsdlFile>helloworld-external-service.wsdl</wsdlFile>

-                            </wsdlFiles>

-                            <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>

-                        </configuration>

-                    </execution>                                      

-                </executions>

-                <configuration>

-                    <target>2.1</target>

-                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>

-                    <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>

-                    <verbose>true</verbose>

-                    <xnocompile>true</xnocompile>

-                </configuration>

-            </plugin>                     

-        </plugins>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-ws-contribution-rpc-lit</artifactId>
+    <name>Apache Tuscany SCA iTest WS Contribution RPC Lit</name>
+
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-core</artifactId>
+            <type>pom</type>
+            <version>2.0-Beta1</version>
+        </dependency>      
+                
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>target/jaxws-source</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jaxws-maven-plugin</artifactId>
+                <version>1.12</version>
+                <!-- Explicitly add the transitive dependencies for jaxws-api
+                     http://jira.codehaus.org/browse/MEV-498
+                -->
+                <dependencies>
+                    <dependency>
+                        <groupId>javax.jws</groupId>
+                        <artifactId>jsr181-api</artifactId>
+                        <version>1.0-MR1</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>javax.annotation</groupId>
+                        <artifactId>jsr250-api</artifactId>
+                        <version>1.0</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>wsgen1</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>wsgen</goal>
+                        </goals>
+                        <configuration>
+                            <sei>org.apache.tuscany.sca.binding.ws.HelloWorld1Impl</sei>
+                            <genWsdl>true</genWsdl>
+                            <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>
+                        </configuration>
+                    </execution>                  
+                    <execution>
+                        <id>wsimport1</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>wsimport</goal>
+                        </goals>
+                        <configuration>
+                            <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>
+                            <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>
+                            <wsdlFiles>
+                                <wsdlFile>helloworld-external-service.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>
+                        </configuration>
+                    </execution>                                      
+                </executions>
+                <configuration>
+                    <target>2.1</target>
+                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
+                    <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>
+                    <verbose>true</verbose>
+                    <xnocompile>true</xnocompile>
+                </configuration>
+            </plugin>                     
+        </plugins>
+    </build>
+</project>
diff --git a/testing/itest/ws/contribution-wsdl-first/pom.xml b/testing/itest/ws/contribution-wsdl-first/pom.xml
index 346387e..f00072d 100644
--- a/testing/itest/ws/contribution-wsdl-first/pom.xml
+++ b/testing/itest/ws/contribution-wsdl-first/pom.xml
@@ -1,125 +1,125 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-ws-contribution-wsdl-first</artifactId>

-    <name>Apache Tuscany SCA iTest WS Contribution WSDL First</name>

-

-    <dependencies>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-core</artifactId>

-            <type>pom</type>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>       

-                

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>build-helper-maven-plugin</artifactId>

-                <version>1.0</version>

-                <executions>

-                    <execution>

-                        <id>add-source</id>

-                        <phase>generate-sources</phase>

-                        <goals>

-                            <goal>add-test-source</goal>

-                        </goals>

-                        <configuration>

-                            <sources>

-                                <source>target/jaxws-source</source>

-                            </sources>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>jaxws-maven-plugin</artifactId>

-                <version>1.12</version>

-                <!-- Explicitly add the transitive dependencies for jaxws-api

-                     http://jira.codehaus.org/browse/MEV-498

-                -->

-                <dependencies>

-                    <dependency>

-                        <groupId>javax.jws</groupId>

-                        <artifactId>jsr181-api</artifactId>

-                        <version>1.0-MR1</version>

-                    </dependency>

-                    <dependency>

-                        <groupId>javax.annotation</groupId>

-                        <artifactId>jsr250-api</artifactId>

-                        <version>1.0</version>

-                    </dependency>

-                </dependencies>

-                <executions>

-                    <!-- execution>

-                        <id>wsimport1</id>

-                        <phase>process-resources</phase>

-                        <goals>

-                            <goal>wsimport</goal>

-                        </goals>

-                        <configuration>

-                            <packageName>org.apache.tuscany.sca.binding.ws.sca</packageName>

-                            <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>

-                            <wsdlFiles>

-                                <wsdlFile>HelloWorldImplService.wsdl</wsdlFile>

-                            </wsdlFiles>

-                            <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>

-                        </configuration>

-                    </execution-->  

-                    <execution>

-                        <id>wsimport2</id>

-                        <phase>process-resources</phase>

-                        <goals>

-                            <goal>wsimport</goal>

-                        </goals>

-                        <configuration>

-                            <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>

-                            <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>

-                            <wsdlFiles>

-                                <wsdlFile>helloworld-external-service.wsdl</wsdlFile>

-                            </wsdlFiles>

-                            <staleFile>${project.build.directory}/jaxws/stale/.wsimport2StaleFlag</staleFile>

-                        </configuration>

-                    </execution>                                                         

-                </executions>

-                <configuration>

-                    <target>2.1</target>

-                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>

-                    <verbose>true</verbose>

-                    <xnocompile>true</xnocompile>

-                </configuration>

-            </plugin>                     

-        </plugins>

-    </build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-ws-contribution-wsdl-first</artifactId>
+    <name>Apache Tuscany SCA iTest WS Contribution WSDL First</name>
+
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-core</artifactId>
+            <type>pom</type>
+            <version>2.0-Beta1</version>
+        </dependency>       
+                
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>target/jaxws-source</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jaxws-maven-plugin</artifactId>
+                <version>1.12</version>
+                <!-- Explicitly add the transitive dependencies for jaxws-api
+                     http://jira.codehaus.org/browse/MEV-498
+                -->
+                <dependencies>
+                    <dependency>
+                        <groupId>javax.jws</groupId>
+                        <artifactId>jsr181-api</artifactId>
+                        <version>1.0-MR1</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>javax.annotation</groupId>
+                        <artifactId>jsr250-api</artifactId>
+                        <version>1.0</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <!-- execution>
+                        <id>wsimport1</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>wsimport</goal>
+                        </goals>
+                        <configuration>
+                            <packageName>org.apache.tuscany.sca.binding.ws.sca</packageName>
+                            <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>
+                            <wsdlFiles>
+                                <wsdlFile>HelloWorldImplService.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>
+                        </configuration>
+                    </execution-->  
+                    <execution>
+                        <id>wsimport2</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>wsimport</goal>
+                        </goals>
+                        <configuration>
+                            <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>
+                            <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>
+                            <wsdlFiles>
+                                <wsdlFile>helloworld-external-service.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            <staleFile>${project.build.directory}/jaxws/stale/.wsimport2StaleFlag</staleFile>
+                        </configuration>
+                    </execution>                                                         
+                </executions>
+                <configuration>
+                    <target>2.1</target>
+                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
+                    <verbose>true</verbose>
+                    <xnocompile>true</xnocompile>
+                </configuration>
+            </plugin>                     
+        </plugins>
+    </build>
+</project>
diff --git a/testing/itest/ws/defaults/pom.xml b/testing/itest/ws/defaults/pom.xml
index 8732b5d..d3e35d6 100644
--- a/testing/itest/ws/defaults/pom.xml
+++ b/testing/itest/ws/defaults/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webservice</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
         </dependency>
       
diff --git a/testing/itest/ws/endpoint-references/pom.xml b/testing/itest/ws/endpoint-references/pom.xml
index 1264b9f..3d7b44e 100644
--- a/testing/itest/ws/endpoint-references/pom.xml
+++ b/testing/itest/ws/endpoint-references/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webservice</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
         </dependency>
       
diff --git a/testing/itest/ws/endpoints/pom.xml b/testing/itest/ws/endpoints/pom.xml
index f006c51..b3b8ff2 100644
--- a/testing/itest/ws/endpoints/pom.xml
+++ b/testing/itest/ws/endpoints/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webservice</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
         </dependency>
       
diff --git a/testing/itest/ws/external-client/pom.xml b/testing/itest/ws/external-client/pom.xml
index cc3c4f8..3fb19f8 100644
--- a/testing/itest/ws/external-client/pom.xml
+++ b/testing/itest/ws/external-client/pom.xml
@@ -1,112 +1,112 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-ws-external-client</artifactId>

-    <name>Apache Tuscany SCA iTest WS External Client</name>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>com.sun.xml.ws</groupId>

-            <artifactId>jaxws-rt</artifactId>

-            <version>2.1.7</version>

-        </dependency>

-                

-    </dependencies>

-

-    <build>

-        <finalName>${artifactId}</finalName>

-        

-        <plugins>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>build-helper-maven-plugin</artifactId>

-                <version>1.0</version>

-                <executions>

-                    <execution>

-                        <id>add-source</id>

-                        <phase>generate-sources</phase>

-                        <goals>

-                            <goal>add-test-source</goal>

-                        </goals>

-                        <configuration>

-                            <sources>

-                                <source>target/jaxws-source</source>

-                            </sources>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>jaxws-maven-plugin</artifactId>

-                <version>1.12</version>

-                <!-- Explicitly add the transitive dependencies for jaxws-api

-                     http://jira.codehaus.org/browse/MEV-498

-                -->

-                <dependencies>

-                    <dependency>

-                        <groupId>javax.jws</groupId>

-                        <artifactId>jsr181-api</artifactId>

-                        <version>1.0-MR1</version>

-                    </dependency>

-                    <dependency>

-                        <groupId>javax.annotation</groupId>

-                        <artifactId>jsr250-api</artifactId>

-                        <version>1.0</version>

-                    </dependency>

-                </dependencies>

-                <executions>

-                    <execution>

-                        <id>wsimport1</id>

-                        <phase>process-resources</phase>

-                        <goals>

-                            <goal>wsimport</goal>

-                        </goals>

-                        <configuration>

-                            <packageName>org.apache.tuscany.sca.binding.ws.jaxws.sca</packageName>

-                            <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>

-                            <wsdlFiles>

-                                <wsdlFile>HelloWorldImplService.wsdl</wsdlFile>

-                            </wsdlFiles>

-                            <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>

-                        </configuration>

-                    </execution>                                    

-                </executions>

-                <configuration>

-                    <target>2.1</target>

-                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>

-                    <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>

-                    <verbose>true</verbose>

-                    <xnocompile>true</xnocompile>

-                </configuration>

-            </plugin>                     

-        </plugins>

-    </build>

-    

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-ws-external-client</artifactId>
+    <name>Apache Tuscany SCA iTest WS External Client</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>jaxws-rt</artifactId>
+            <version>2.1.7</version>
+        </dependency>
+                
+    </dependencies>
+
+    <build>
+        <finalName>${artifactId}</finalName>
+        
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>target/jaxws-source</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jaxws-maven-plugin</artifactId>
+                <version>1.12</version>
+                <!-- Explicitly add the transitive dependencies for jaxws-api
+                     http://jira.codehaus.org/browse/MEV-498
+                -->
+                <dependencies>
+                    <dependency>
+                        <groupId>javax.jws</groupId>
+                        <artifactId>jsr181-api</artifactId>
+                        <version>1.0-MR1</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>javax.annotation</groupId>
+                        <artifactId>jsr250-api</artifactId>
+                        <version>1.0</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>wsimport1</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>wsimport</goal>
+                        </goals>
+                        <configuration>
+                            <packageName>org.apache.tuscany.sca.binding.ws.jaxws.sca</packageName>
+                            <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>
+                            <wsdlFiles>
+                                <wsdlFile>HelloWorldImplService.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>
+                        </configuration>
+                    </execution>                                    
+                </executions>
+                <configuration>
+                    <target>2.1</target>
+                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
+                    <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>
+                    <verbose>true</verbose>
+                    <xnocompile>true</xnocompile>
+                </configuration>
+            </plugin>                     
+        </plugins>
+    </build>
+    
+</project>
diff --git a/testing/itest/ws/external-service/pom.xml b/testing/itest/ws/external-service/pom.xml
index 6ae08e5..c26b461 100644
--- a/testing/itest/ws/external-service/pom.xml
+++ b/testing/itest/ws/external-service/pom.xml
@@ -1,104 +1,104 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-ws-external-service</artifactId>

-    <name>Apache Tuscany SCA iTest WS External Service</name>

-

-    <dependencies>

-

-               

-    </dependencies>

-

-    <build>

-        <finalName>${artifactId}</finalName>

-        

-        <plugins>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>build-helper-maven-plugin</artifactId>

-                <version>1.0</version>

-                <executions>

-                    <execution>

-                        <id>add-source</id>

-                        <phase>generate-sources</phase>

-                        <goals>

-                            <goal>add-test-source</goal>

-                        </goals>

-                        <configuration>

-                            <sources>

-                                <source>target/jaxws-source</source>

-                            </sources>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>jaxws-maven-plugin</artifactId>

-                <version>1.12</version>

-                <!-- Explicitly add the transitive dependencies for jaxws-api

-                     http://jira.codehaus.org/browse/MEV-498

-                -->

-                <dependencies>

-                    <dependency>

-                        <groupId>javax.jws</groupId>

-                        <artifactId>jsr181-api</artifactId>

-                        <version>1.0-MR1</version>

-                    </dependency>

-                    <dependency>

-                        <groupId>javax.annotation</groupId>

-                        <artifactId>jsr250-api</artifactId>

-                        <version>1.0</version>

-                    </dependency>

-                </dependencies>

-                <executions> 

-                    <execution>

-                        <id>wsgen1</id>

-                        <phase>process-classes</phase>

-                        <goals>

-                            <goal>wsgen</goal>

-                        </goals>

-                        <configuration>

-                            <sei>org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldService</sei>

-                            <genWsdl>true</genWsdl>

-                            <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>

-                        </configuration>

-                    </execution>                                    

-                </executions>

-                <configuration>

-                    <target>2.1</target>

-                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>

-                    <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>

-                    <verbose>true</verbose>

-                    <xnocompile>true</xnocompile>

-                </configuration>

-            </plugin>                     

-        </plugins>

-    </build>

-    

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-ws-external-service</artifactId>
+    <name>Apache Tuscany SCA iTest WS External Service</name>
+
+    <dependencies>
+
+               
+    </dependencies>
+
+    <build>
+        <finalName>${artifactId}</finalName>
+        
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>target/jaxws-source</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jaxws-maven-plugin</artifactId>
+                <version>1.12</version>
+                <!-- Explicitly add the transitive dependencies for jaxws-api
+                     http://jira.codehaus.org/browse/MEV-498
+                -->
+                <dependencies>
+                    <dependency>
+                        <groupId>javax.jws</groupId>
+                        <artifactId>jsr181-api</artifactId>
+                        <version>1.0-MR1</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>javax.annotation</groupId>
+                        <artifactId>jsr250-api</artifactId>
+                        <version>1.0</version>
+                    </dependency>
+                </dependencies>
+                <executions> 
+                    <execution>
+                        <id>wsgen1</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>wsgen</goal>
+                        </goals>
+                        <configuration>
+                            <sei>org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldService</sei>
+                            <genWsdl>true</genWsdl>
+                            <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>
+                        </configuration>
+                    </execution>                                    
+                </executions>
+                <configuration>
+                    <target>2.1</target>
+                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
+                    <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>
+                    <verbose>true</verbose>
+                    <xnocompile>true</xnocompile>
+                </configuration>
+            </plugin>                     
+        </plugins>
+    </build>
+    
+</project>
diff --git a/testing/itest/ws/http-ssl/pom.xml b/testing/itest/ws/http-ssl/pom.xml
index e1e3a90..53bfba4 100644
--- a/testing/itest/ws/http-ssl/pom.xml
+++ b/testing/itest/ws/http-ssl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,14 +34,14 @@
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webservice</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
        </dependency>
       
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
        </dependency>
                       
     </dependencies>
diff --git a/testing/itest/ws/launcher-axis2/pom.xml b/testing/itest/ws/launcher-axis2/pom.xml
index d74700c..bf25ba7 100644
--- a/testing/itest/ws/launcher-axis2/pom.xml
+++ b/testing/itest/ws/launcher-axis2/pom.xml
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-itest</artifactId>

-        <version>2.0-Beta1-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <artifactId>itest-ws-launcher-axis2</artifactId>

-    <name>Apache Tuscany SCA iTest WS Launcher Axis2</name>

-

-    <dependencies>

-       <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-webservice</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-            <type>pom</type>

-        </dependency>

-

-        <!-- Hosts -->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        

-        <!-- Test resources -->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>itest-ws-external-client</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>itest-ws-external-service</artifactId>

-            <version>2.0-Beta1-SNAPSHOT</version>

-        </dependency>        

-                

-    </dependencies>

-

-    <build>

-        <finalName>${artifactId}</finalName>

-        

-    </build>

-    

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-Beta1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>itest-ws-launcher-axis2</artifactId>
+    <name>Apache Tuscany SCA iTest WS Launcher Axis2</name>
+
+    <dependencies>
+       <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-webservice</artifactId>
+            <version>2.0-Beta1</version>
+            <type>pom</type>
+        </dependency>
+
+        <!-- Hosts -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        
+        <!-- Test resources -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-ws-external-client</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-ws-external-service</artifactId>
+            <version>2.0-Beta1</version>
+        </dependency>        
+                
+    </dependencies>
+
+    <build>
+        <finalName>${artifactId}</finalName>
+        
+    </build>
+    
+</project>
diff --git a/testing/itest/ws/launcher-base/pom.xml b/testing/itest/ws/launcher-base/pom.xml
index ce91677..215669b 100644
--- a/testing/itest/ws/launcher-base/pom.xml
+++ b/testing/itest/ws/launcher-base/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,20 +33,20 @@
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
 
         <!-- Test resources -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-ws-external-client</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-ws-external-service</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
         </dependency>        
                 
     </dependencies>
diff --git a/testing/itest/ws/pom.xml b/testing/itest/ws/pom.xml
index 42bdd22..7050f95 100644
--- a/testing/itest/ws/pom.xml
+++ b/testing/itest/ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/testing/itest/ws/wsdl/pom.xml b/testing/itest/ws/wsdl/pom.xml
index 3078986..1a40d51 100644
--- a/testing/itest/ws/wsdl/pom.xml
+++ b/testing/itest/ws/wsdl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
+        <version>2.0-Beta1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webservice</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
+            <version>2.0-Beta1</version>
             <type>pom</type>
         </dependency>