From dc31e1e8635951f833ffdfe22749ccc1f3caf2b9 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 17 Nov 2008 11:48:37 +0000
Subject: Change trunk version so it doesn't clash with the 1.4 branch version
 by bumping up to 2.0-SNAPSHOT as per the recent vote for 2.0

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@718223 13f79535-47bb-0310-9956-ffa450edef68
---
 java/sca/distribution/bundle-minimal/pom.xml      |   2 +-
 java/sca/distribution/bundle/pom.xml              |   2 +-
 java/sca/distribution/features/all/pom.xml        | 480 +++++++--------
 java/sca/distribution/features/core/pom.xml       | 680 +++++++++++-----------
 java/sca/distribution/features/ejava/pom.xml      | 358 ++++++------
 java/sca/distribution/features/manager/pom.xml    | 518 ++++++++--------
 java/sca/distribution/features/pom.xml            |  88 +--
 java/sca/distribution/features/process/pom.xml    | 310 +++++-----
 java/sca/distribution/features/repository/pom.xml | 360 ++++++------
 java/sca/distribution/features/web20/pom.xml      | 416 ++++++-------
 java/sca/distribution/features/webservice/pom.xml | 460 +++++++--------
 java/sca/distribution/manifest/pom.xml            |   2 +-
 java/sca/distribution/pom.xml                     |   6 +-
 java/sca/distribution/standalone/pom.xml          |   2 +-
 java/sca/distribution/tomcat/pom.xml              |   2 +-
 java/sca/distribution/war/pom.xml                 |   2 +-
 java/sca/distribution/webapp/pom.xml              |   2 +-
 17 files changed, 1845 insertions(+), 1845 deletions(-)

(limited to 'java/sca/distribution')

diff --git a/java/sca/distribution/bundle-minimal/pom.xml b/java/sca/distribution/bundle-minimal/pom.xml
index 4fec6013a5..95e017c3e9 100644
--- a/java/sca/distribution/bundle-minimal/pom.xml
+++ b/java/sca/distribution/bundle-minimal/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/java/sca/distribution/bundle/pom.xml b/java/sca/distribution/bundle/pom.xml
index cd9c147204..f83f8f9d1c 100644
--- a/java/sca/distribution/bundle/pom.xml
+++ b/java/sca/distribution/bundle/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/java/sca/distribution/features/all/pom.xml b/java/sca/distribution/features/all/pom.xml
index e720a2e331..51d51ba3a8 100644
--- a/java/sca/distribution/features/all/pom.xml
+++ b/java/sca/distribution/features/all/pom.xml
@@ -1,240 +1,240 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES 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-features</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-distribution-all</artifactId>
-    <name>Apache Tuscany SCA All-in-one Distribution</name>
-    <packaging>pom</packaging>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-core</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-ejava</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-manager</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-process</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-web20</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-webservice</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-maven-ant-generator</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-maven-java2wsdl</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-maven-wsdl2java</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-maven-incremental-build</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-    </dependencies>
-
-    <profiles>
-    
-        <!-- Default build profile that can be used to build the distro packages -->
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                                        <descriptor>src/main/assembly/src.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-all-1.4-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>    
-
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-                <module>../../../modules/assembly</module>
-                <module>../../../modules/assembly-xml</module>
-                <module>../../../modules/assembly-xsd</module>
-                <module>../../../modules/binding-atom</module>
-                <module>../../../modules/binding-atom-abdera</module>
-                <module>../../../modules/binding-corba</module>
-                <module>../../../modules/binding-corba-runtime</module>
-                <module>../../../modules/binding-ejb</module>
-                <module>../../../modules/binding-ejb-runtime</module>
-                <module>../../../modules/binding-http</module>
-                <module>../../../modules/binding-http-runtime</module>
-                <module>../../../modules/binding-jms</module>
-                <module>../../../modules/binding-jms-runtime</module>
-                <module>../../../modules/binding-jsonrpc</module>
-                <module>../../../modules/binding-jsonrpc-runtime</module>
-                <module>../../../modules/binding-rss</module>
-                <module>../../../modules/binding-rss-rome</module>
-                <module>../../../modules/binding-sca</module>
-                <module>../../../modules/binding-sca-axis2</module>
-                <module>../../../modules/binding-sca-xml</module>
-                <module>../../../modules/binding-ws</module>
-                <module>../../../modules/binding-ws-axis2</module>
-                <module>../../../modules/binding-ws-wsdlgen</module>
-                <module>../../../modules/binding-ws-xml</module>
-                <module>../../../modules/contribution</module>
-                <module>../../../modules/contribution-impl</module>
-                <module>../../../modules/contribution-java</module>
-                <module>../../../modules/contribution-namespace</module>
-                <module>../../../modules/contribution-resource</module>
-                <module>../../../modules/contribution-xml</module>
-                <module>../../../modules/core</module>
-                <module>../../../modules/core-databinding</module>
-                <module>../../../modules/core-spi</module>
-                <module>../../../modules/data-api</module>
-                <module>../../../modules/databinding</module>
-                <module>../../../modules/databinding-axiom</module>
-                <module>../../../modules/databinding-jaxb</module>
-                <module>../../../modules/databinding-jaxb-axiom</module>
-                <module>../../../modules/databinding-json</module>
-                <module>../../../modules/databinding-saxon</module>
-                <module>../../../modules/databinding-sdo</module>
-                <module>../../../modules/databinding-sdo-axiom</module>
-                <module>../../../modules/definitions</module>
-                <module>../../../modules/definitions-xml</module>
-                <module>../../../modules/domain-manager</module>
-                <module>../../../modules/endpoint</module>
-                <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-equinox</module>
-                <module>../../../modules/extension-helper</module>
-                <module>../../../modules/host-corba</module>
-                <module>../../../modules/host-corba-jse</module>
-                <module>../../../modules/host-ejb</module>
-                <module>../../../modules/host-embedded</module>
-                <module>../../../modules/host-http</module>
-                <module>../../../modules/host-jetty</module>
-                <module>../../../modules/implementation-bpel</module>
-                <module>../../../modules/implementation-bpel-ode</module>
-                <module>../../../modules/implementation-ejb</module>
-                <module>../../../modules/implementation-java</module>
-                <module>../../../modules/implementation-java-runtime</module>
-                <module>../../../modules/implementation-java-xml</module>
-                <module>../../../modules/implementation-node</module>
-                <module>../../../modules/implementation-node-runtime</module>
-                <module>../../../modules/implementation-resource</module>
-                <module>../../../modules/implementation-resource-runtime</module>
-                <module>../../../modules/implementation-script</module>
-                <module>../../../modules/implementation-spring</module>
-                <module>../../../modules/implementation-widget</module>
-                <module>../../../modules/implementation-widget-runtime</module>
-                <module>../../../modules/implementation-xquery</module>
-                <module>../../../modules/interface</module>
-                <module>../../../modules/interface-java</module>
-                <module>../../../modules/interface-java-jaxws</module>
-                <module>../../../modules/interface-java-xml</module>
-                <module>../../../modules/interface-wsdl</module>
-                <module>../../../modules/interface-wsdl-xml</module>
-                <module>../../../modules/monitor</module>
-                <module>../../../modules/monitor-logging</module>
-                <module>../../../modules/node-api</module>
-                <module>../../../modules/node-impl</module>
-                <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-equinox</module>
-                <module>../../../modules/node-launcher-webapp</module>
-                <module>../../../modules/node-manager</module>
-                <module>../../../modules/policy</module>
-                <module>../../../modules/policy-security</module>
-                <module>../../../modules/policy-security-ws</module>
-                <module>../../../modules/policy-xml</module>
-                <module>../../../modules/policy-xml-ws</module>
-                <module>../../../modules/sca-api</module>
-                <module>../../../modules/workspace</module>
-                <module>../../../modules/workspace-impl</module>
-                <module>../../../modules/workspace-xml</module>
-                <module>../../../modules/xsd</module>
-                <module>../../../modules/xsd-xml</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-distribution-features</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>tuscany-distribution-all</artifactId>
+    <name>Apache Tuscany SCA All-in-one Distribution</name>
+    <packaging>pom</packaging>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distribution-core</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distribution-ejava</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distribution-manager</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distribution-process</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distribution-web20</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distribution-webservice</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-maven-ant-generator</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-maven-java2wsdl</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-maven-wsdl2java</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-maven-incremental-build</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+    </dependencies>
+
+    <profiles>
+    
+        <!-- Default build profile that can be used to build the distro packages -->
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>distribution-package</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>src/main/assembly/bin.xml</descriptor>
+                                        <descriptor>src/main/assembly/src.xml</descriptor>
+                                    </descriptors>
+                                    <tarLongFileMode>gnu</tarLongFileMode>
+                                    <finalName>apache-tuscany-sca-all-1.4-SNAPSHOT</finalName>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>    
+
+        <!-- Profile that can be used to build the modules included in the distro -->
+        <profile>
+            <id>modules</id>
+            <modules>
+                <module>../../../modules/assembly</module>
+                <module>../../../modules/assembly-xml</module>
+                <module>../../../modules/assembly-xsd</module>
+                <module>../../../modules/binding-atom</module>
+                <module>../../../modules/binding-atom-abdera</module>
+                <module>../../../modules/binding-corba</module>
+                <module>../../../modules/binding-corba-runtime</module>
+                <module>../../../modules/binding-ejb</module>
+                <module>../../../modules/binding-ejb-runtime</module>
+                <module>../../../modules/binding-http</module>
+                <module>../../../modules/binding-http-runtime</module>
+                <module>../../../modules/binding-jms</module>
+                <module>../../../modules/binding-jms-runtime</module>
+                <module>../../../modules/binding-jsonrpc</module>
+                <module>../../../modules/binding-jsonrpc-runtime</module>
+                <module>../../../modules/binding-rss</module>
+                <module>../../../modules/binding-rss-rome</module>
+                <module>../../../modules/binding-sca</module>
+                <module>../../../modules/binding-sca-axis2</module>
+                <module>../../../modules/binding-sca-xml</module>
+                <module>../../../modules/binding-ws</module>
+                <module>../../../modules/binding-ws-axis2</module>
+                <module>../../../modules/binding-ws-wsdlgen</module>
+                <module>../../../modules/binding-ws-xml</module>
+                <module>../../../modules/contribution</module>
+                <module>../../../modules/contribution-impl</module>
+                <module>../../../modules/contribution-java</module>
+                <module>../../../modules/contribution-namespace</module>
+                <module>../../../modules/contribution-resource</module>
+                <module>../../../modules/contribution-xml</module>
+                <module>../../../modules/core</module>
+                <module>../../../modules/core-databinding</module>
+                <module>../../../modules/core-spi</module>
+                <module>../../../modules/data-api</module>
+                <module>../../../modules/databinding</module>
+                <module>../../../modules/databinding-axiom</module>
+                <module>../../../modules/databinding-jaxb</module>
+                <module>../../../modules/databinding-jaxb-axiom</module>
+                <module>../../../modules/databinding-json</module>
+                <module>../../../modules/databinding-saxon</module>
+                <module>../../../modules/databinding-sdo</module>
+                <module>../../../modules/databinding-sdo-axiom</module>
+                <module>../../../modules/definitions</module>
+                <module>../../../modules/definitions-xml</module>
+                <module>../../../modules/domain-manager</module>
+                <module>../../../modules/endpoint</module>
+                <module>../../../modules/extensibility</module>
+                <module>../../../modules/extensibility-equinox</module>
+                <module>../../../modules/extension-helper</module>
+                <module>../../../modules/host-corba</module>
+                <module>../../../modules/host-corba-jse</module>
+                <module>../../../modules/host-ejb</module>
+                <module>../../../modules/host-embedded</module>
+                <module>../../../modules/host-http</module>
+                <module>../../../modules/host-jetty</module>
+                <module>../../../modules/implementation-bpel</module>
+                <module>../../../modules/implementation-bpel-ode</module>
+                <module>../../../modules/implementation-ejb</module>
+                <module>../../../modules/implementation-java</module>
+                <module>../../../modules/implementation-java-runtime</module>
+                <module>../../../modules/implementation-java-xml</module>
+                <module>../../../modules/implementation-node</module>
+                <module>../../../modules/implementation-node-runtime</module>
+                <module>../../../modules/implementation-resource</module>
+                <module>../../../modules/implementation-resource-runtime</module>
+                <module>../../../modules/implementation-script</module>
+                <module>../../../modules/implementation-spring</module>
+                <module>../../../modules/implementation-widget</module>
+                <module>../../../modules/implementation-widget-runtime</module>
+                <module>../../../modules/implementation-xquery</module>
+                <module>../../../modules/interface</module>
+                <module>../../../modules/interface-java</module>
+                <module>../../../modules/interface-java-jaxws</module>
+                <module>../../../modules/interface-java-xml</module>
+                <module>../../../modules/interface-wsdl</module>
+                <module>../../../modules/interface-wsdl-xml</module>
+                <module>../../../modules/monitor</module>
+                <module>../../../modules/monitor-logging</module>
+                <module>../../../modules/node-api</module>
+                <module>../../../modules/node-impl</module>
+                <module>../../../modules/node-launcher</module>
+                <module>../../../modules/node-launcher-equinox</module>
+                <module>../../../modules/node-launcher-webapp</module>
+                <module>../../../modules/node-manager</module>
+                <module>../../../modules/policy</module>
+                <module>../../../modules/policy-security</module>
+                <module>../../../modules/policy-security-ws</module>
+                <module>../../../modules/policy-xml</module>
+                <module>../../../modules/policy-xml-ws</module>
+                <module>../../../modules/sca-api</module>
+                <module>../../../modules/workspace</module>
+                <module>../../../modules/workspace-impl</module>
+                <module>../../../modules/workspace-xml</module>
+                <module>../../../modules/xsd</module>
+                <module>../../../modules/xsd-xml</module>
+            </modules>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/java/sca/distribution/features/core/pom.xml b/java/sca/distribution/features/core/pom.xml
index 53f01acf49..6cf324c889 100644
--- a/java/sca/distribution/features/core/pom.xml
+++ b/java/sca/distribution/features/core/pom.xml
@@ -1,340 +1,340 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES 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-features</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-distribution-core</artifactId>
-    <name>Apache Tuscany SCA Core Distribution</name>
-    <packaging>pom</packaging>
-
-    <dependencies>
-
-        <!-- Assembly model -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Corba binding -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-corba-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Contribution model -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Core runtime -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Databindings -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Data API -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Policy definitions -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-definitions-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Domain support -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-endpoint</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Core Extensibility -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        
-        <!--  Corba host -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-corba-jse</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Implementation types -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Interface models -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-jaxws</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Node runtime -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher-webapp</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <type>war</type>
-        </dependency>
-
-        <!-- Monitoring -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-monitor</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-monitor-logging</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        
-        <!-- Policy models -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- SCA API -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- XMLSchema support -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-xsd</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-xsd-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-
-        <!-- Default build profile that can be used to build the distro packages -->
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                                        <descriptor>src/main/assembly/src.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-1.4-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-                <module>../../../modules/assembly</module>
-                <module>../../../modules/assembly-xml</module>
-                <module>../../../modules/assembly-xsd</module>
-                <module>../../../modules/binding-corba</module>
-                <module>../../../modules/binding-corba-runtime</module>
-                <module>../../../modules/binding-sca</module>
-                <module>../../../modules/binding-sca-xml</module>
-                <module>../../../modules/contribution</module>
-                <module>../../../modules/contribution-impl</module>
-                <module>../../../modules/contribution-java</module>
-                <module>../../../modules/contribution-namespace</module>
-                <module>../../../modules/contribution-xml</module>
-                <module>../../../modules/core</module>
-                <module>../../../modules/core-databinding</module>
-                <module>../../../modules/core-spi</module>
-                <module>../../../modules/data-api</module>
-                <module>../../../modules/databinding</module>
-                <module>../../../modules/databinding-jaxb</module>
-                <module>../../../modules/definitions</module>
-                <module>../../../modules/definitions-xml</module>
-                <module>../../../modules/endpoint</module>
-                <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-equinox</module>
-                <module>../../../modules/host-corba</module>
-                <module>../../../modules/host-corba-jse</module>
-                <module>../../../modules/host-embedded</module>
-                <module>../../../modules/host-http</module>
-                <module>../../../modules/implementation-java</module>
-                <module>../../../modules/implementation-java-runtime</module>
-                <module>../../../modules/implementation-java-xml</module>
-                <module>../../../modules/implementation-node</module>
-                <module>../../../modules/implementation-node-runtime</module>
-                <module>../../../modules/interface</module>
-                <module>../../../modules/interface-java</module>
-                <module>../../../modules/interface-java-jaxws</module>
-                <module>../../../modules/interface-java-xml</module>
-                <module>../../../modules/interface-wsdl</module>
-                <module>../../../modules/interface-wsdl-xml</module>
-                <module>../../../modules/monitor</module>
-                <module>../../../modules/monitor-logging</module>
-                <module>../../../modules/node-api</module>
-                <module>../../../modules/node-impl</module>
-                <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-equinox</module>
-                <module>../../../modules/node-launcher-webapp</module>
-                <module>../../../modules/policy</module>
-                <module>../../../modules/policy-security</module>
-                <module>../../../modules/policy-xml</module>
-                <module>../../../modules/sca-api</module>
-                <module>../../../modules/xsd</module>
-                <module>../../../modules/xsd-xml</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-distribution-features</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>tuscany-distribution-core</artifactId>
+    <name>Apache Tuscany SCA Core Distribution</name>
+    <packaging>pom</packaging>
+
+    <dependencies>
+
+        <!-- Assembly model -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly-xml</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly-xsd</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Corba binding -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-corba-runtime</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Contribution model -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-impl</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-namespace</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Core runtime -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-databinding</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-spi</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Databindings -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-jaxb</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Data API -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-data-api</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Policy definitions -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-definitions-xml</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Domain support -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-endpoint</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Core Extensibility -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-extensibility</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-extensibility-equinox</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        
+        <!--  Corba host -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-corba-jse</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Implementation types -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-node-runtime</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Interface models -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-interface-java-xml</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-interface-java-jaxws</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-interface-wsdl-xml</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Node runtime -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-api</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-launcher</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-launcher-equinox</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-launcher-webapp</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <type>war</type>
+        </dependency>
+
+        <!-- Monitoring -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-monitor</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-monitor-logging</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        
+        <!-- Policy models -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy-security</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy-xml</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- SCA API -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- XMLSchema support -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-xsd</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-xsd-xml</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+
+        <!-- Default build profile that can be used to build the distro packages -->
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>distribution-package</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>src/main/assembly/bin.xml</descriptor>
+                                        <descriptor>src/main/assembly/src.xml</descriptor>
+                                    </descriptors>
+                                    <tarLongFileMode>gnu</tarLongFileMode>
+                                    <finalName>apache-tuscany-sca-1.4-SNAPSHOT</finalName>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        
+        <!-- Profile that can be used to build the modules included in the distro -->
+        <profile>
+            <id>modules</id>
+            <modules>
+                <module>../../../modules/assembly</module>
+                <module>../../../modules/assembly-xml</module>
+                <module>../../../modules/assembly-xsd</module>
+                <module>../../../modules/binding-corba</module>
+                <module>../../../modules/binding-corba-runtime</module>
+                <module>../../../modules/binding-sca</module>
+                <module>../../../modules/binding-sca-xml</module>
+                <module>../../../modules/contribution</module>
+                <module>../../../modules/contribution-impl</module>
+                <module>../../../modules/contribution-java</module>
+                <module>../../../modules/contribution-namespace</module>
+                <module>../../../modules/contribution-xml</module>
+                <module>../../../modules/core</module>
+                <module>../../../modules/core-databinding</module>
+                <module>../../../modules/core-spi</module>
+                <module>../../../modules/data-api</module>
+                <module>../../../modules/databinding</module>
+                <module>../../../modules/databinding-jaxb</module>
+                <module>../../../modules/definitions</module>
+                <module>../../../modules/definitions-xml</module>
+                <module>../../../modules/endpoint</module>
+                <module>../../../modules/extensibility</module>
+                <module>../../../modules/extensibility-equinox</module>
+                <module>../../../modules/host-corba</module>
+                <module>../../../modules/host-corba-jse</module>
+                <module>../../../modules/host-embedded</module>
+                <module>../../../modules/host-http</module>
+                <module>../../../modules/implementation-java</module>
+                <module>../../../modules/implementation-java-runtime</module>
+                <module>../../../modules/implementation-java-xml</module>
+                <module>../../../modules/implementation-node</module>
+                <module>../../../modules/implementation-node-runtime</module>
+                <module>../../../modules/interface</module>
+                <module>../../../modules/interface-java</module>
+                <module>../../../modules/interface-java-jaxws</module>
+                <module>../../../modules/interface-java-xml</module>
+                <module>../../../modules/interface-wsdl</module>
+                <module>../../../modules/interface-wsdl-xml</module>
+                <module>../../../modules/monitor</module>
+                <module>../../../modules/monitor-logging</module>
+                <module>../../../modules/node-api</module>
+                <module>../../../modules/node-impl</module>
+                <module>../../../modules/node-launcher</module>
+                <module>../../../modules/node-launcher-equinox</module>
+                <module>../../../modules/node-launcher-webapp</module>
+                <module>../../../modules/policy</module>
+                <module>../../../modules/policy-security</module>
+                <module>../../../modules/policy-xml</module>
+                <module>../../../modules/sca-api</module>
+                <module>../../../modules/xsd</module>
+                <module>../../../modules/xsd-xml</module>
+            </modules>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/java/sca/distribution/features/ejava/pom.xml b/java/sca/distribution/features/ejava/pom.xml
index 1ff6baa336..a926209a6a 100644
--- a/java/sca/distribution/features/ejava/pom.xml
+++ b/java/sca/distribution/features/ejava/pom.xml
@@ -1,179 +1,179 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES 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-features</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-distribution-ejava</artifactId>
-    <name>Apache Tuscany SCA JEE Distribution</name>
-    <packaging>pom</packaging>
-
-    <dependencies>
-
-        <!-- Core distribution -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-core</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Bindings -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Hosts -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-ejb</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Implementations -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-
-        <!-- Default build profile that can be used to build the distro packages -->
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                                        <descriptor>src/main/assembly/src.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-ejava-1.4-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-                <module>../../../modules/assembly</module>
-                <module>../../../modules/assembly-xml</module>
-                <module>../../../modules/assembly-xsd</module>
-                <module>../../../modules/binding-corba</module>
-                <module>../../../modules/binding-corba-runtime</module>
-                <module>../../../modules/binding-ejb</module>
-                <module>../../../modules/binding-ejb-runtime</module>
-                <module>../../../modules/binding-jms</module>
-                <module>../../../modules/binding-jms-runtime</module>
-                <module>../../../modules/binding-sca</module>
-                <module>../../../modules/binding-sca-xml</module>
-                <module>../../../modules/contribution</module>
-                <module>../../../modules/contribution-impl</module>
-                <module>../../../modules/contribution-java</module>
-                <module>../../../modules/contribution-namespace</module>
-                <module>../../../modules/contribution-xml</module>
-                <module>../../../modules/core</module>
-                <module>../../../modules/core-databinding</module>
-                <module>../../../modules/core-spi</module>
-                <module>../../../modules/data-api</module>
-                <module>../../../modules/databinding</module>
-                <module>../../../modules/databinding-axiom</module>
-                <module>../../../modules/databinding-jaxb</module>
-                <module>../../../modules/definitions</module>
-                <module>../../../modules/definitions-xml</module>
-                <module>../../../modules/endpoint</module>
-                <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-equinox</module>
-                <module>../../../modules/extension-helper</module>
-                <module>../../../modules/host-corba</module>
-                <module>../../../modules/host-corba-jse</module>
-                <module>../../../modules/host-ejb</module>
-                <module>../../../modules/host-embedded</module>
-                <module>../../../modules/host-http</module>
-                <module>../../../modules/implementation-ejb</module>
-                <module>../../../modules/implementation-java</module>
-                <module>../../../modules/implementation-java-runtime</module>
-                <module>../../../modules/implementation-java-xml</module>
-                <module>../../../modules/implementation-node</module>
-                <module>../../../modules/implementation-node-runtime</module>
-                <module>../../../modules/implementation-script</module>
-                <module>../../../modules/implementation-spring</module>
-                <module>../../../modules/interface</module>
-                <module>../../../modules/interface-java</module>
-                <module>../../../modules/interface-java-jaxws</module>
-                <module>../../../modules/interface-java-xml</module>
-                <module>../../../modules/interface-wsdl</module>
-                <module>../../../modules/interface-wsdl-xml</module>
-                <module>../../../modules/monitor</module>
-                <module>../../../modules/monitor-logging</module>
-                <module>../../../modules/node-api</module>
-                <module>../../../modules/node-impl</module>
-                <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-equinox</module>
-                <module>../../../modules/node-launcher-webapp</module>
-                <module>../../../modules/policy</module>
-                <module>../../../modules/policy-security</module>
-                <module>../../../modules/policy-xml</module>
-                <module>../../../modules/sca-api</module>
-                <module>../../../modules/xsd</module>
-                <module>../../../modules/xsd-xml</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-distribution-features</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>tuscany-distribution-ejava</artifactId>
+    <name>Apache Tuscany SCA JEE Distribution</name>
+    <packaging>pom</packaging>
+
+    <dependencies>
+
+        <!-- Core distribution -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distribution-core</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Bindings -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ejb-runtime</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms-runtime</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Hosts -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-ejb</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Implementations -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-ejb</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-spring</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+
+        <!-- Default build profile that can be used to build the distro packages -->
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>distribution-package</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>src/main/assembly/bin.xml</descriptor>
+                                        <descriptor>src/main/assembly/src.xml</descriptor>
+                                    </descriptors>
+                                    <tarLongFileMode>gnu</tarLongFileMode>
+                                    <finalName>apache-tuscany-sca-ejava-1.4-SNAPSHOT</finalName>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        
+        <!-- Profile that can be used to build the modules included in the distro -->
+        <profile>
+            <id>modules</id>
+            <modules>
+                <module>../../../modules/assembly</module>
+                <module>../../../modules/assembly-xml</module>
+                <module>../../../modules/assembly-xsd</module>
+                <module>../../../modules/binding-corba</module>
+                <module>../../../modules/binding-corba-runtime</module>
+                <module>../../../modules/binding-ejb</module>
+                <module>../../../modules/binding-ejb-runtime</module>
+                <module>../../../modules/binding-jms</module>
+                <module>../../../modules/binding-jms-runtime</module>
+                <module>../../../modules/binding-sca</module>
+                <module>../../../modules/binding-sca-xml</module>
+                <module>../../../modules/contribution</module>
+                <module>../../../modules/contribution-impl</module>
+                <module>../../../modules/contribution-java</module>
+                <module>../../../modules/contribution-namespace</module>
+                <module>../../../modules/contribution-xml</module>
+                <module>../../../modules/core</module>
+                <module>../../../modules/core-databinding</module>
+                <module>../../../modules/core-spi</module>
+                <module>../../../modules/data-api</module>
+                <module>../../../modules/databinding</module>
+                <module>../../../modules/databinding-axiom</module>
+                <module>../../../modules/databinding-jaxb</module>
+                <module>../../../modules/definitions</module>
+                <module>../../../modules/definitions-xml</module>
+                <module>../../../modules/endpoint</module>
+                <module>../../../modules/extensibility</module>
+                <module>../../../modules/extensibility-equinox</module>
+                <module>../../../modules/extension-helper</module>
+                <module>../../../modules/host-corba</module>
+                <module>../../../modules/host-corba-jse</module>
+                <module>../../../modules/host-ejb</module>
+                <module>../../../modules/host-embedded</module>
+                <module>../../../modules/host-http</module>
+                <module>../../../modules/implementation-ejb</module>
+                <module>../../../modules/implementation-java</module>
+                <module>../../../modules/implementation-java-runtime</module>
+                <module>../../../modules/implementation-java-xml</module>
+                <module>../../../modules/implementation-node</module>
+                <module>../../../modules/implementation-node-runtime</module>
+                <module>../../../modules/implementation-script</module>
+                <module>../../../modules/implementation-spring</module>
+                <module>../../../modules/interface</module>
+                <module>../../../modules/interface-java</module>
+                <module>../../../modules/interface-java-jaxws</module>
+                <module>../../../modules/interface-java-xml</module>
+                <module>../../../modules/interface-wsdl</module>
+                <module>../../../modules/interface-wsdl-xml</module>
+                <module>../../../modules/monitor</module>
+                <module>../../../modules/monitor-logging</module>
+                <module>../../../modules/node-api</module>
+                <module>../../../modules/node-impl</module>
+                <module>../../../modules/node-launcher</module>
+                <module>../../../modules/node-launcher-equinox</module>
+                <module>../../../modules/node-launcher-webapp</module>
+                <module>../../../modules/policy</module>
+                <module>../../../modules/policy-security</module>
+                <module>../../../modules/policy-xml</module>
+                <module>../../../modules/sca-api</module>
+                <module>../../../modules/xsd</module>
+                <module>../../../modules/xsd-xml</module>
+            </modules>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/java/sca/distribution/features/manager/pom.xml b/java/sca/distribution/features/manager/pom.xml
index cc594256c9..3d7bfe9bd4 100644
--- a/java/sca/distribution/features/manager/pom.xml
+++ b/java/sca/distribution/features/manager/pom.xml
@@ -1,259 +1,259 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES 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-features</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-distribution-manager</artifactId>
-    <name>Apache Tuscany SCA Domain Manager Distribution</name>
-    <packaging>pom</packaging>
-
-    <dependencies>
-    
-        <!-- Core distribution -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-core</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Binding Models -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ejb</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rss</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Contribution models -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-resource</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Domain support -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-manager</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Implementation Models -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-bpel</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-
-        <!-- Default build profile that can be used to build the distro packages -->
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                                        <descriptor>src/main/assembly/src.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-manager-1.4-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-                <module>../../../modules/assembly</module>
-                <module>../../../modules/assembly-xml</module>
-                <module>../../../modules/assembly-xsd</module>
-                <module>../../../modules/binding-atom</module>
-                <module>../../../modules/binding-atom-abdera</module>
-                <module>../../../modules/binding-corba</module>
-                <module>../../../modules/binding-corba-runtime</module>
-                <module>../../../modules/binding-ejb</module>
-                <module>../../../modules/binding-http</module>
-                <module>../../../modules/binding-http-runtime</module>
-                <module>../../../modules/binding-jsonrpc</module>
-                <module>../../../modules/binding-rss</module>
-                <module>../../../modules/binding-sca</module>
-                <module>../../../modules/binding-sca-xml</module>
-                <module>../../../modules/binding-ws</module>
-                <module>../../../modules/binding-ws-wsdlgen</module>
-                <module>../../../modules/binding-ws-xml</module>
-                <module>../../../modules/contribution</module>
-                <module>../../../modules/contribution-impl</module>
-                <module>../../../modules/contribution-java</module>
-                <module>../../../modules/contribution-namespace</module>
-                <module>../../../modules/contribution-resource</module>
-                <module>../../../modules/contribution-xml</module>
-                <module>../../../modules/core</module>
-                <module>../../../modules/core-databinding</module>
-                <module>../../../modules/core-spi</module>
-                <module>../../../modules/data-api</module>
-                <module>../../../modules/databinding</module>
-                <module>../../../modules/databinding-jaxb</module>
-                <module>../../../modules/definitions</module>
-                <module>../../../modules/definitions-xml</module>
-                <module>../../../modules/domain-manager</module>
-                <module>../../../modules/endpoint</module>
-                <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-equinox</module>
-                <module>../../../modules/host-corba</module>
-                <module>../../../modules/host-corba-jse</module>
-                <module>../../../modules/host-embedded</module>
-                <module>../../../modules/host-http</module>
-                <module>../../../modules/host-jetty</module>
-                <module>../../../modules/implementation-bpel</module>
-                <module>../../../modules/implementation-ejb</module>
-                <module>../../../modules/implementation-java</module>
-                <module>../../../modules/implementation-java-runtime</module>
-                <module>../../../modules/implementation-java-xml</module>
-                <module>../../../modules/implementation-node</module>
-                <module>../../../modules/implementation-node-runtime</module>
-                <module>../../../modules/implementation-resource</module>
-                <module>../../../modules/implementation-widget</module>
-                <module>../../../modules/implementation-widget-runtime</module>
-                <module>../../../modules/interface</module>
-                <module>../../../modules/interface-java</module>
-                <module>../../../modules/interface-java-jaxws</module>
-                <module>../../../modules/interface-java-xml</module>
-                <module>../../../modules/interface-wsdl</module>
-                <module>../../../modules/interface-wsdl-xml</module>
-                <module>../../../modules/monitor</module>
-                <module>../../../modules/monitor-logging</module>
-                <module>../../../modules/node-api</module>
-                <module>../../../modules/node-impl</module>
-                <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-equinox</module>
-                <module>../../../modules/node-launcher-webapp</module>
-                <module>../../../modules/node-manager</module>
-                <module>../../../modules/policy</module>
-                <module>../../../modules/policy-security</module>
-                <module>../../../modules/policy-security-ws</module>
-                <module>../../../modules/policy-xml</module>
-                <module>../../../modules/sca-api</module>
-                <module>../../../modules/workspace</module>
-                <module>../../../modules/workspace-impl</module>
-                <module>../../../modules/workspace-xml</module>
-                <module>../../../modules/xsd</module>
-                <module>../../../modules/xsd-xml</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-distribution-features</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>tuscany-distribution-manager</artifactId>
+    <name>Apache Tuscany SCA Domain Manager Distribution</name>
+    <packaging>pom</packaging>
+
+    <dependencies>
+    
+        <!-- Core distribution -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distribution-core</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Binding Models -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-atom</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ejb</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-http</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jsonrpc</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-rss</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-sca-xml</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-xml</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Contribution models -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-namespace</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-resource</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Domain support -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-domain-manager</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-manager</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Implementation Models -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-bpel</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-ejb</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-xml</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-node</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-resource</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-widget</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+
+        <!-- Default build profile that can be used to build the distro packages -->
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>distribution-package</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>src/main/assembly/bin.xml</descriptor>
+                                        <descriptor>src/main/assembly/src.xml</descriptor>
+                                    </descriptors>
+                                    <tarLongFileMode>gnu</tarLongFileMode>
+                                    <finalName>apache-tuscany-sca-manager-1.4-SNAPSHOT</finalName>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        
+        <!-- Profile that can be used to build the modules included in the distro -->
+        <profile>
+            <id>modules</id>
+            <modules>
+                <module>../../../modules/assembly</module>
+                <module>../../../modules/assembly-xml</module>
+                <module>../../../modules/assembly-xsd</module>
+                <module>../../../modules/binding-atom</module>
+                <module>../../../modules/binding-atom-abdera</module>
+                <module>../../../modules/binding-corba</module>
+                <module>../../../modules/binding-corba-runtime</module>
+                <module>../../../modules/binding-ejb</module>
+                <module>../../../modules/binding-http</module>
+                <module>../../../modules/binding-http-runtime</module>
+                <module>../../../modules/binding-jsonrpc</module>
+                <module>../../../modules/binding-rss</module>
+                <module>../../../modules/binding-sca</module>
+                <module>../../../modules/binding-sca-xml</module>
+                <module>../../../modules/binding-ws</module>
+                <module>../../../modules/binding-ws-wsdlgen</module>
+                <module>../../../modules/binding-ws-xml</module>
+                <module>../../../modules/contribution</module>
+                <module>../../../modules/contribution-impl</module>
+                <module>../../../modules/contribution-java</module>
+                <module>../../../modules/contribution-namespace</module>
+                <module>../../../modules/contribution-resource</module>
+                <module>../../../modules/contribution-xml</module>
+                <module>../../../modules/core</module>
+                <module>../../../modules/core-databinding</module>
+                <module>../../../modules/core-spi</module>
+                <module>../../../modules/data-api</module>
+                <module>../../../modules/databinding</module>
+                <module>../../../modules/databinding-jaxb</module>
+                <module>../../../modules/definitions</module>
+                <module>../../../modules/definitions-xml</module>
+                <module>../../../modules/domain-manager</module>
+                <module>../../../modules/endpoint</module>
+                <module>../../../modules/extensibility</module>
+                <module>../../../modules/extensibility-equinox</module>
+                <module>../../../modules/host-corba</module>
+                <module>../../../modules/host-corba-jse</module>
+                <module>../../../modules/host-embedded</module>
+                <module>../../../modules/host-http</module>
+                <module>../../../modules/host-jetty</module>
+                <module>../../../modules/implementation-bpel</module>
+                <module>../../../modules/implementation-ejb</module>
+                <module>../../../modules/implementation-java</module>
+                <module>../../../modules/implementation-java-runtime</module>
+                <module>../../../modules/implementation-java-xml</module>
+                <module>../../../modules/implementation-node</module>
+                <module>../../../modules/implementation-node-runtime</module>
+                <module>../../../modules/implementation-resource</module>
+                <module>../../../modules/implementation-widget</module>
+                <module>../../../modules/implementation-widget-runtime</module>
+                <module>../../../modules/interface</module>
+                <module>../../../modules/interface-java</module>
+                <module>../../../modules/interface-java-jaxws</module>
+                <module>../../../modules/interface-java-xml</module>
+                <module>../../../modules/interface-wsdl</module>
+                <module>../../../modules/interface-wsdl-xml</module>
+                <module>../../../modules/monitor</module>
+                <module>../../../modules/monitor-logging</module>
+                <module>../../../modules/node-api</module>
+                <module>../../../modules/node-impl</module>
+                <module>../../../modules/node-launcher</module>
+                <module>../../../modules/node-launcher-equinox</module>
+                <module>../../../modules/node-launcher-webapp</module>
+                <module>../../../modules/node-manager</module>
+                <module>../../../modules/policy</module>
+                <module>../../../modules/policy-security</module>
+                <module>../../../modules/policy-security-ws</module>
+                <module>../../../modules/policy-xml</module>
+                <module>../../../modules/sca-api</module>
+                <module>../../../modules/workspace</module>
+                <module>../../../modules/workspace-impl</module>
+                <module>../../../modules/workspace-xml</module>
+                <module>../../../modules/xsd</module>
+                <module>../../../modules/xsd-xml</module>
+            </modules>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/java/sca/distribution/features/pom.xml b/java/sca/distribution/features/pom.xml
index 15cb996980..2acd155a97 100644
--- a/java/sca/distribution/features/pom.xml
+++ b/java/sca/distribution/features/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-sca</artifactId>
-        <relativePath>../../pom.xml</relativePath>
-        <version>1.4-SNAPSHOT</version>
-    </parent>
-    <groupId>org.apache.tuscany.sca</groupId>
-    <artifactId>tuscany-distribution-features</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Feature Distributions</name>
-
-    <modules>
-        <module>all</module>
-        <module>core</module>
-        <module>ejava</module>
-        <module>repository</module>
-        <module>manager</module>
-        <module>process</module>
-        <module>web20</module>
-        <module>webservice</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>
+        <relativePath>../../pom.xml</relativePath>
+        <version>2.0-SNAPSHOT</version>
+    </parent>
+    <groupId>org.apache.tuscany.sca</groupId>
+    <artifactId>tuscany-distribution-features</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Tuscany SCA Feature Distributions</name>
+
+    <modules>
+        <module>all</module>
+        <module>core</module>
+        <module>ejava</module>
+        <module>repository</module>
+        <module>manager</module>
+        <module>process</module>
+        <module>web20</module>
+        <module>webservice</module>
+    </modules>
+
+</project>
diff --git a/java/sca/distribution/features/process/pom.xml b/java/sca/distribution/features/process/pom.xml
index 4310034a0f..2b058cadbf 100644
--- a/java/sca/distribution/features/process/pom.xml
+++ b/java/sca/distribution/features/process/pom.xml
@@ -1,155 +1,155 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES 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-features</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-distribution-process</artifactId>
-    <name>Apache Tuscany SCA Business Process Distribution</name>
-    <packaging>pom</packaging>
-
-    <dependencies>
-
-        <!-- Core distribution -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-core</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Implementations -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-
-        <!-- Default build profile that can be used to build the distro packages -->
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                                        <descriptor>src/main/assembly/src.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-process-1.4-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-                <module>../../../modules/assembly</module>
-                <module>../../../modules/assembly-xml</module>
-                <module>../../../modules/assembly-xsd</module>
-                <module>../../../modules/binding-corba</module>
-                <module>../../../modules/binding-corba-runtime</module>
-                <module>../../../modules/binding-sca</module>
-                <module>../../../modules/binding-sca-xml</module>
-                <module>../../../modules/contribution</module>
-                <module>../../../modules/contribution-impl</module>
-                <module>../../../modules/contribution-java</module>
-                <module>../../../modules/contribution-namespace</module>
-                <module>../../../modules/contribution-xml</module>
-                <module>../../../modules/core</module>
-                <module>../../../modules/core-databinding</module>
-                <module>../../../modules/core-spi</module>
-                <module>../../../modules/data-api</module>
-                <module>../../../modules/databinding</module>
-                <module>../../../modules/databinding-jaxb</module>
-                <module>../../../modules/databinding-saxon</module>
-                <module>../../../modules/databinding-sdo</module>
-                <module>../../../modules/definitions</module>
-                <module>../../../modules/definitions-xml</module>
-                <module>../../../modules/endpoint</module>
-                <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-equinox</module>
-                <module>../../../modules/host-corba</module>
-                <module>../../../modules/host-corba-jse</module>
-                <module>../../../modules/host-embedded</module>
-                <module>../../../modules/host-http</module>
-                <module>../../../modules/implementation-bpel</module>
-                <module>../../../modules/implementation-bpel-ode</module>
-                <module>../../../modules/implementation-java</module>
-                <module>../../../modules/implementation-java-runtime</module>
-                <module>../../../modules/implementation-java-xml</module>
-                <module>../../../modules/implementation-node</module>
-                <module>../../../modules/implementation-node-runtime</module>
-                <module>../../../modules/implementation-xquery</module>
-                <module>../../../modules/interface</module>
-                <module>../../../modules/interface-java</module>
-                <module>../../../modules/interface-java-jaxws</module>
-                <module>../../../modules/interface-java-xml</module>
-                <module>../../../modules/interface-wsdl</module>
-                <module>../../../modules/interface-wsdl-xml</module>
-                <module>../../../modules/monitor</module>
-                <module>../../../modules/monitor-logging</module>
-                <module>../../../modules/node-api</module>
-                <module>../../../modules/node-impl</module>
-                <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-equinox</module>
-                <module>../../../modules/node-launcher-webapp</module>
-                <module>../../../modules/policy</module>
-                <module>../../../modules/policy-security</module>
-                <module>../../../modules/policy-xml</module>
-                <module>../../../modules/sca-api</module>
-                <module>../../../modules/xsd</module>
-                <module>../../../modules/xsd-xml</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-distribution-features</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>tuscany-distribution-process</artifactId>
+    <name>Apache Tuscany SCA Business Process Distribution</name>
+    <packaging>pom</packaging>
+
+    <dependencies>
+
+        <!-- Core distribution -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distribution-core</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Implementations -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-bpel-ode</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-xquery</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+
+        <!-- Default build profile that can be used to build the distro packages -->
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>distribution-package</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>src/main/assembly/bin.xml</descriptor>
+                                        <descriptor>src/main/assembly/src.xml</descriptor>
+                                    </descriptors>
+                                    <tarLongFileMode>gnu</tarLongFileMode>
+                                    <finalName>apache-tuscany-sca-process-1.4-SNAPSHOT</finalName>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        
+        <!-- Profile that can be used to build the modules included in the distro -->
+        <profile>
+            <id>modules</id>
+            <modules>
+                <module>../../../modules/assembly</module>
+                <module>../../../modules/assembly-xml</module>
+                <module>../../../modules/assembly-xsd</module>
+                <module>../../../modules/binding-corba</module>
+                <module>../../../modules/binding-corba-runtime</module>
+                <module>../../../modules/binding-sca</module>
+                <module>../../../modules/binding-sca-xml</module>
+                <module>../../../modules/contribution</module>
+                <module>../../../modules/contribution-impl</module>
+                <module>../../../modules/contribution-java</module>
+                <module>../../../modules/contribution-namespace</module>
+                <module>../../../modules/contribution-xml</module>
+                <module>../../../modules/core</module>
+                <module>../../../modules/core-databinding</module>
+                <module>../../../modules/core-spi</module>
+                <module>../../../modules/data-api</module>
+                <module>../../../modules/databinding</module>
+                <module>../../../modules/databinding-jaxb</module>
+                <module>../../../modules/databinding-saxon</module>
+                <module>../../../modules/databinding-sdo</module>
+                <module>../../../modules/definitions</module>
+                <module>../../../modules/definitions-xml</module>
+                <module>../../../modules/endpoint</module>
+                <module>../../../modules/extensibility</module>
+                <module>../../../modules/extensibility-equinox</module>
+                <module>../../../modules/host-corba</module>
+                <module>../../../modules/host-corba-jse</module>
+                <module>../../../modules/host-embedded</module>
+                <module>../../../modules/host-http</module>
+                <module>../../../modules/implementation-bpel</module>
+                <module>../../../modules/implementation-bpel-ode</module>
+                <module>../../../modules/implementation-java</module>
+                <module>../../../modules/implementation-java-runtime</module>
+                <module>../../../modules/implementation-java-xml</module>
+                <module>../../../modules/implementation-node</module>
+                <module>../../../modules/implementation-node-runtime</module>
+                <module>../../../modules/implementation-xquery</module>
+                <module>../../../modules/interface</module>
+                <module>../../../modules/interface-java</module>
+                <module>../../../modules/interface-java-jaxws</module>
+                <module>../../../modules/interface-java-xml</module>
+                <module>../../../modules/interface-wsdl</module>
+                <module>../../../modules/interface-wsdl-xml</module>
+                <module>../../../modules/monitor</module>
+                <module>../../../modules/monitor-logging</module>
+                <module>../../../modules/node-api</module>
+                <module>../../../modules/node-impl</module>
+                <module>../../../modules/node-launcher</module>
+                <module>../../../modules/node-launcher-equinox</module>
+                <module>../../../modules/node-launcher-webapp</module>
+                <module>../../../modules/policy</module>
+                <module>../../../modules/policy-security</module>
+                <module>../../../modules/policy-xml</module>
+                <module>../../../modules/sca-api</module>
+                <module>../../../modules/xsd</module>
+                <module>../../../modules/xsd-xml</module>
+            </modules>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/java/sca/distribution/features/repository/pom.xml b/java/sca/distribution/features/repository/pom.xml
index cfee564971..aaf96f99b1 100644
--- a/java/sca/distribution/features/repository/pom.xml
+++ b/java/sca/distribution/features/repository/pom.xml
@@ -1,180 +1,180 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES 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-features</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-distribution-repository</artifactId>
-    <name>Apache Tuscany SCA Maven Repository Distribution</name>
-    <packaging>pom</packaging>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-all</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-    
-        <!-- Default build profile that can be used to build the distro packages -->
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/repository.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-repository-1.4-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>    
-
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-                <module>../../../modules/assembly</module>
-                <module>../../../modules/assembly-xml</module>
-                <module>../../../modules/assembly-xsd</module>
-                <module>../../../modules/binding-atom</module>
-                <module>../../../modules/binding-atom-abdera</module>
-                <module>../../../modules/binding-corba</module>
-                <module>../../../modules/binding-corba-runtime</module>
-                <module>../../../modules/binding-ejb</module>
-                <module>../../../modules/binding-ejb-runtime</module>
-                <module>../../../modules/binding-http</module>
-                <module>../../../modules/binding-http-runtime</module>
-                <module>../../../modules/binding-jms</module>
-                <module>../../../modules/binding-jms-runtime</module>
-                <module>../../../modules/binding-jsonrpc</module>
-                <module>../../../modules/binding-jsonrpc-runtime</module>
-                <module>../../../modules/binding-rss</module>
-                <module>../../../modules/binding-rss-rome</module>
-                <module>../../../modules/binding-sca</module>
-                <module>../../../modules/binding-sca-axis2</module>
-                <module>../../../modules/binding-sca-xml</module>
-                <module>../../../modules/binding-ws</module>
-                <module>../../../modules/binding-ws-axis2</module>
-                <module>../../../modules/binding-ws-wsdlgen</module>
-                <module>../../../modules/binding-ws-xml</module>
-                <module>../../../modules/contribution</module>
-                <module>../../../modules/contribution-impl</module>
-                <module>../../../modules/contribution-java</module>
-                <module>../../../modules/contribution-namespace</module>
-                <module>../../../modules/contribution-resource</module>
-                <module>../../../modules/contribution-xml</module>
-                <module>../../../modules/core</module>
-                <module>../../../modules/core-databinding</module>
-                <module>../../../modules/core-spi</module>
-                <module>../../../modules/data-api</module>
-                <module>../../../modules/databinding</module>
-                <module>../../../modules/databinding-axiom</module>
-                <module>../../../modules/databinding-jaxb</module>
-                <module>../../../modules/databinding-jaxb-axiom</module>
-                <module>../../../modules/databinding-json</module>
-                <module>../../../modules/databinding-saxon</module>
-                <module>../../../modules/databinding-sdo</module>
-                <module>../../../modules/databinding-sdo-axiom</module>
-                <module>../../../modules/definitions</module>
-                <module>../../../modules/definitions-xml</module>
-                <module>../../../modules/domain-manager</module>
-                <module>../../../modules/endpoint</module>
-                <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-equinox</module>
-                <module>../../../modules/extension-helper</module>
-                <module>../../../modules/host-corba</module>
-                <module>../../../modules/host-corba-jse</module>
-                <module>../../../modules/host-ejb</module>
-                <module>../../../modules/host-embedded</module>
-                <module>../../../modules/host-http</module>
-                <module>../../../modules/host-jetty</module>
-                <module>../../../modules/implementation-bpel</module>
-                <module>../../../modules/implementation-bpel-ode</module>
-                <module>../../../modules/implementation-ejb</module>
-                <module>../../../modules/implementation-java</module>
-                <module>../../../modules/implementation-java-runtime</module>
-                <module>../../../modules/implementation-java-xml</module>
-                <module>../../../modules/implementation-node</module>
-                <module>../../../modules/implementation-node-runtime</module>
-                <module>../../../modules/implementation-resource</module>
-                <module>../../../modules/implementation-resource-runtime</module>
-                <module>../../../modules/implementation-script</module>
-                <module>../../../modules/implementation-spring</module>
-                <module>../../../modules/implementation-widget</module>
-                <module>../../../modules/implementation-widget-runtime</module>
-                <module>../../../modules/implementation-xquery</module>
-                <module>../../../modules/interface</module>
-                <module>../../../modules/interface-java</module>
-                <module>../../../modules/interface-java-jaxws</module>
-                <module>../../../modules/interface-java-xml</module>
-                <module>../../../modules/interface-wsdl</module>
-                <module>../../../modules/interface-wsdl-xml</module>
-                <module>../../../modules/monitor</module>
-                <module>../../../modules/monitor-logging</module>
-                <module>../../../modules/node-api</module>
-                <module>../../../modules/node-impl</module>
-                <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-equinox</module>
-                <module>../../../modules/node-launcher-webapp</module>
-                <module>../../../modules/node-manager</module>
-                <module>../../../modules/policy</module>
-                <module>../../../modules/policy-security</module>
-                <module>../../../modules/policy-security-ws</module>
-                <module>../../../modules/policy-xml</module>
-                <module>../../../modules/policy-xml-ws</module>
-                <module>../../../modules/sca-api</module>
-                <module>../../../modules/workspace</module>
-                <module>../../../modules/workspace-impl</module>
-                <module>../../../modules/workspace-xml</module>
-                <module>../../../modules/xsd</module>
-                <module>../../../modules/xsd-xml</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-distribution-features</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>tuscany-distribution-repository</artifactId>
+    <name>Apache Tuscany SCA Maven Repository Distribution</name>
+    <packaging>pom</packaging>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distribution-all</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+    
+        <!-- Default build profile that can be used to build the distro packages -->
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>distribution-package</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>src/main/assembly/repository.xml</descriptor>
+                                    </descriptors>
+                                    <tarLongFileMode>gnu</tarLongFileMode>
+                                    <finalName>apache-tuscany-sca-repository-1.4-SNAPSHOT</finalName>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>    
+
+        <!-- Profile that can be used to build the modules included in the distro -->
+        <profile>
+            <id>modules</id>
+            <modules>
+                <module>../../../modules/assembly</module>
+                <module>../../../modules/assembly-xml</module>
+                <module>../../../modules/assembly-xsd</module>
+                <module>../../../modules/binding-atom</module>
+                <module>../../../modules/binding-atom-abdera</module>
+                <module>../../../modules/binding-corba</module>
+                <module>../../../modules/binding-corba-runtime</module>
+                <module>../../../modules/binding-ejb</module>
+                <module>../../../modules/binding-ejb-runtime</module>
+                <module>../../../modules/binding-http</module>
+                <module>../../../modules/binding-http-runtime</module>
+                <module>../../../modules/binding-jms</module>
+                <module>../../../modules/binding-jms-runtime</module>
+                <module>../../../modules/binding-jsonrpc</module>
+                <module>../../../modules/binding-jsonrpc-runtime</module>
+                <module>../../../modules/binding-rss</module>
+                <module>../../../modules/binding-rss-rome</module>
+                <module>../../../modules/binding-sca</module>
+                <module>../../../modules/binding-sca-axis2</module>
+                <module>../../../modules/binding-sca-xml</module>
+                <module>../../../modules/binding-ws</module>
+                <module>../../../modules/binding-ws-axis2</module>
+                <module>../../../modules/binding-ws-wsdlgen</module>
+                <module>../../../modules/binding-ws-xml</module>
+                <module>../../../modules/contribution</module>
+                <module>../../../modules/contribution-impl</module>
+                <module>../../../modules/contribution-java</module>
+                <module>../../../modules/contribution-namespace</module>
+                <module>../../../modules/contribution-resource</module>
+                <module>../../../modules/contribution-xml</module>
+                <module>../../../modules/core</module>
+                <module>../../../modules/core-databinding</module>
+                <module>../../../modules/core-spi</module>
+                <module>../../../modules/data-api</module>
+                <module>../../../modules/databinding</module>
+                <module>../../../modules/databinding-axiom</module>
+                <module>../../../modules/databinding-jaxb</module>
+                <module>../../../modules/databinding-jaxb-axiom</module>
+                <module>../../../modules/databinding-json</module>
+                <module>../../../modules/databinding-saxon</module>
+                <module>../../../modules/databinding-sdo</module>
+                <module>../../../modules/databinding-sdo-axiom</module>
+                <module>../../../modules/definitions</module>
+                <module>../../../modules/definitions-xml</module>
+                <module>../../../modules/domain-manager</module>
+                <module>../../../modules/endpoint</module>
+                <module>../../../modules/extensibility</module>
+                <module>../../../modules/extensibility-equinox</module>
+                <module>../../../modules/extension-helper</module>
+                <module>../../../modules/host-corba</module>
+                <module>../../../modules/host-corba-jse</module>
+                <module>../../../modules/host-ejb</module>
+                <module>../../../modules/host-embedded</module>
+                <module>../../../modules/host-http</module>
+                <module>../../../modules/host-jetty</module>
+                <module>../../../modules/implementation-bpel</module>
+                <module>../../../modules/implementation-bpel-ode</module>
+                <module>../../../modules/implementation-ejb</module>
+                <module>../../../modules/implementation-java</module>
+                <module>../../../modules/implementation-java-runtime</module>
+                <module>../../../modules/implementation-java-xml</module>
+                <module>../../../modules/implementation-node</module>
+                <module>../../../modules/implementation-node-runtime</module>
+                <module>../../../modules/implementation-resource</module>
+                <module>../../../modules/implementation-resource-runtime</module>
+                <module>../../../modules/implementation-script</module>
+                <module>../../../modules/implementation-spring</module>
+                <module>../../../modules/implementation-widget</module>
+                <module>../../../modules/implementation-widget-runtime</module>
+                <module>../../../modules/implementation-xquery</module>
+                <module>../../../modules/interface</module>
+                <module>../../../modules/interface-java</module>
+                <module>../../../modules/interface-java-jaxws</module>
+                <module>../../../modules/interface-java-xml</module>
+                <module>../../../modules/interface-wsdl</module>
+                <module>../../../modules/interface-wsdl-xml</module>
+                <module>../../../modules/monitor</module>
+                <module>../../../modules/monitor-logging</module>
+                <module>../../../modules/node-api</module>
+                <module>../../../modules/node-impl</module>
+                <module>../../../modules/node-launcher</module>
+                <module>../../../modules/node-launcher-equinox</module>
+                <module>../../../modules/node-launcher-webapp</module>
+                <module>../../../modules/node-manager</module>
+                <module>../../../modules/policy</module>
+                <module>../../../modules/policy-security</module>
+                <module>../../../modules/policy-security-ws</module>
+                <module>../../../modules/policy-xml</module>
+                <module>../../../modules/policy-xml-ws</module>
+                <module>../../../modules/sca-api</module>
+                <module>../../../modules/workspace</module>
+                <module>../../../modules/workspace-impl</module>
+                <module>../../../modules/workspace-xml</module>
+                <module>../../../modules/xsd</module>
+                <module>../../../modules/xsd-xml</module>
+            </modules>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/java/sca/distribution/features/web20/pom.xml b/java/sca/distribution/features/web20/pom.xml
index 58fe78edd4..e2f141f206 100644
--- a/java/sca/distribution/features/web20/pom.xml
+++ b/java/sca/distribution/features/web20/pom.xml
@@ -1,208 +1,208 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES 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-features</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-distribution-web20</artifactId>
-    <name>Apache Tuscany SCA Web 2.0 Distribution</name>
-    <packaging>pom</packaging>
-
-    <dependencies>
-
-        <!-- Core distribution -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-core</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Bindings -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Contribution model -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-resource</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Databindings -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-json</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Hosts -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Implementation types -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-
-        <!-- Default build profile that can be used to build the distro packages -->
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                                        <descriptor>src/main/assembly/src.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-web20-1.4-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-                <module>../../../modules/assembly</module>
-                <module>../../../modules/assembly-xml</module>
-                <module>../../../modules/assembly-xsd</module>
-                <module>../../../modules/binding-atom</module>
-                <module>../../../modules/binding-atom-abdera</module>
-                <module>../../../modules/binding-corba</module>
-                <module>../../../modules/binding-corba-runtime</module>
-                <module>../../../modules/binding-http</module>
-                <module>../../../modules/binding-http-runtime</module>
-                <module>../../../modules/binding-jsonrpc</module>
-                <module>../../../modules/binding-jsonrpc-runtime</module>
-                <module>../../../modules/binding-rss</module>
-                <module>../../../modules/binding-rss-rome</module>
-                <module>../../../modules/binding-sca</module>
-                <module>../../../modules/binding-sca-xml</module>
-                <module>../../../modules/contribution</module>
-                <module>../../../modules/contribution-impl</module>
-                <module>../../../modules/contribution-java</module>
-                <module>../../../modules/contribution-namespace</module>
-                <module>../../../modules/contribution-resource</module>
-                <module>../../../modules/contribution-xml</module>
-                <module>../../../modules/core</module>
-                <module>../../../modules/core-databinding</module>
-                <module>../../../modules/core-spi</module>
-                <module>../../../modules/data-api</module>
-                <module>../../../modules/databinding</module>
-                <module>../../../modules/databinding-jaxb</module>
-                <module>../../../modules/databinding-json</module>
-                <module>../../../modules/definitions</module>
-                <module>../../../modules/definitions-xml</module>
-                <module>../../../modules/endpoint</module>
-                <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-equinox</module>
-                <module>../../../modules/host-corba</module>
-                <module>../../../modules/host-corba-jse</module>
-                <module>../../../modules/host-embedded</module>
-                <module>../../../modules/host-http</module>
-                <module>../../../modules/host-jetty</module>
-                <module>../../../modules/implementation-java</module>
-                <module>../../../modules/implementation-java-runtime</module>
-                <module>../../../modules/implementation-java-xml</module>
-                <module>../../../modules/implementation-node</module>
-                <module>../../../modules/implementation-node-runtime</module>
-                <module>../../../modules/implementation-resource</module>
-                <module>../../../modules/implementation-resource-runtime</module>
-                <module>../../../modules/implementation-widget</module>
-                <module>../../../modules/implementation-widget-runtime</module>
-                <module>../../../modules/interface</module>
-                <module>../../../modules/interface-java</module>
-                <module>../../../modules/interface-java-jaxws</module>
-                <module>../../../modules/interface-java-xml</module>
-                <module>../../../modules/interface-wsdl</module>
-                <module>../../../modules/interface-wsdl-xml</module>
-                <module>../../../modules/monitor</module>
-                <module>../../../modules/monitor-logging</module>
-                <module>../../../modules/node-api</module>
-                <module>../../../modules/node-impl</module>
-                <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-equinox</module>
-                <module>../../../modules/node-launcher-webapp</module>
-                <module>../../../modules/policy</module>
-                <module>../../../modules/policy-security</module>
-                <module>../../../modules/policy-xml</module>
-                <module>../../../modules/sca-api</module>
-                <module>../../../modules/xsd</module>
-                <module>../../../modules/xsd-xml</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-distribution-features</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>tuscany-distribution-web20</artifactId>
+    <name>Apache Tuscany SCA Web 2.0 Distribution</name>
+    <packaging>pom</packaging>
+
+    <dependencies>
+
+        <!-- Core distribution -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distribution-core</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Bindings -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-atom-abdera</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-http-runtime</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-rss-rome</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Contribution model -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-resource</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Databindings -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-json</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Hosts -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Implementation types -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-resource-runtime</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-widget-runtime</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+
+        <!-- Default build profile that can be used to build the distro packages -->
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>distribution-package</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>src/main/assembly/bin.xml</descriptor>
+                                        <descriptor>src/main/assembly/src.xml</descriptor>
+                                    </descriptors>
+                                    <tarLongFileMode>gnu</tarLongFileMode>
+                                    <finalName>apache-tuscany-sca-web20-1.4-SNAPSHOT</finalName>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        
+        <!-- Profile that can be used to build the modules included in the distro -->
+        <profile>
+            <id>modules</id>
+            <modules>
+                <module>../../../modules/assembly</module>
+                <module>../../../modules/assembly-xml</module>
+                <module>../../../modules/assembly-xsd</module>
+                <module>../../../modules/binding-atom</module>
+                <module>../../../modules/binding-atom-abdera</module>
+                <module>../../../modules/binding-corba</module>
+                <module>../../../modules/binding-corba-runtime</module>
+                <module>../../../modules/binding-http</module>
+                <module>../../../modules/binding-http-runtime</module>
+                <module>../../../modules/binding-jsonrpc</module>
+                <module>../../../modules/binding-jsonrpc-runtime</module>
+                <module>../../../modules/binding-rss</module>
+                <module>../../../modules/binding-rss-rome</module>
+                <module>../../../modules/binding-sca</module>
+                <module>../../../modules/binding-sca-xml</module>
+                <module>../../../modules/contribution</module>
+                <module>../../../modules/contribution-impl</module>
+                <module>../../../modules/contribution-java</module>
+                <module>../../../modules/contribution-namespace</module>
+                <module>../../../modules/contribution-resource</module>
+                <module>../../../modules/contribution-xml</module>
+                <module>../../../modules/core</module>
+                <module>../../../modules/core-databinding</module>
+                <module>../../../modules/core-spi</module>
+                <module>../../../modules/data-api</module>
+                <module>../../../modules/databinding</module>
+                <module>../../../modules/databinding-jaxb</module>
+                <module>../../../modules/databinding-json</module>
+                <module>../../../modules/definitions</module>
+                <module>../../../modules/definitions-xml</module>
+                <module>../../../modules/endpoint</module>
+                <module>../../../modules/extensibility</module>
+                <module>../../../modules/extensibility-equinox</module>
+                <module>../../../modules/host-corba</module>
+                <module>../../../modules/host-corba-jse</module>
+                <module>../../../modules/host-embedded</module>
+                <module>../../../modules/host-http</module>
+                <module>../../../modules/host-jetty</module>
+                <module>../../../modules/implementation-java</module>
+                <module>../../../modules/implementation-java-runtime</module>
+                <module>../../../modules/implementation-java-xml</module>
+                <module>../../../modules/implementation-node</module>
+                <module>../../../modules/implementation-node-runtime</module>
+                <module>../../../modules/implementation-resource</module>
+                <module>../../../modules/implementation-resource-runtime</module>
+                <module>../../../modules/implementation-widget</module>
+                <module>../../../modules/implementation-widget-runtime</module>
+                <module>../../../modules/interface</module>
+                <module>../../../modules/interface-java</module>
+                <module>../../../modules/interface-java-jaxws</module>
+                <module>../../../modules/interface-java-xml</module>
+                <module>../../../modules/interface-wsdl</module>
+                <module>../../../modules/interface-wsdl-xml</module>
+                <module>../../../modules/monitor</module>
+                <module>../../../modules/monitor-logging</module>
+                <module>../../../modules/node-api</module>
+                <module>../../../modules/node-impl</module>
+                <module>../../../modules/node-launcher</module>
+                <module>../../../modules/node-launcher-equinox</module>
+                <module>../../../modules/node-launcher-webapp</module>
+                <module>../../../modules/policy</module>
+                <module>../../../modules/policy-security</module>
+                <module>../../../modules/policy-xml</module>
+                <module>../../../modules/sca-api</module>
+                <module>../../../modules/xsd</module>
+                <module>../../../modules/xsd-xml</module>
+            </modules>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/java/sca/distribution/features/webservice/pom.xml b/java/sca/distribution/features/webservice/pom.xml
index 3edf5290b3..c1ff9080c3 100644
--- a/java/sca/distribution/features/webservice/pom.xml
+++ b/java/sca/distribution/features/webservice/pom.xml
@@ -1,230 +1,230 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES 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-features</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-distribution-webservice</artifactId>
-    <name>Apache Tuscany SCA Web Service Distribution</name>
-    <packaging>pom</packaging>
-
-    <dependencies>
-
-        <!-- Core distribution -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-core</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Bindings -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.ant</groupId>
-                    <artifactId>ant-nodeps</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.axis2</groupId>
-                    <artifactId>addressing</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.axis2</groupId>
-                    <artifactId>axis2-xmlbeans</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.axis2</groupId>
-                    <artifactId>axis2-adb-codegen</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>bouncycastle</groupId>
-                    <artifactId>bcprov-jdk15</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>opensaml</groupId>
-                    <artifactId>opensaml</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- Databindings -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo-axiom</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Hosts -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Policy models -->
-        <!--dependency> NOW IN BINDING-WS-AXIS2-POLICY
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security-ws</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency-->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-xml-ws</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-
-        <!-- Default build profile that can be used to build the distro packages -->
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                                        <descriptor>src/main/assembly/src.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-webservice-1.4-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-                <module>../../../modules/assembly</module>
-                <module>../../../modules/assembly-xml</module>
-                <module>../../../modules/assembly-xsd</module>
-                <module>../../../modules/binding-corba</module>
-                <module>../../../modules/binding-corba-runtime</module>
-                <module>../../../modules/binding-sca</module>
-                <module>../../../modules/binding-sca-axis2</module>
-                <module>../../../modules/binding-sca-xml</module>
-                <module>../../../modules/binding-ws</module>
-                <module>../../../modules/binding-ws-axis2</module>
-                <module>../../../modules/binding-ws-axis2-policy</module>
-                <module>../../../modules/binding-ws-wsdlgen</module>
-                <module>../../../modules/binding-ws-xml</module>
-                <module>../../../modules/contribution</module>
-                <module>../../../modules/contribution-impl</module>
-                <module>../../../modules/contribution-java</module>
-                <module>../../../modules/contribution-namespace</module>
-                <module>../../../modules/contribution-xml</module>
-                <module>../../../modules/core</module>
-                <module>../../../modules/core-databinding</module>
-                <module>../../../modules/core-spi</module>
-                <module>../../../modules/data-api</module>
-                <module>../../../modules/databinding</module>
-                <module>../../../modules/databinding-axiom</module>
-                <module>../../../modules/databinding-jaxb</module>
-                <module>../../../modules/databinding-jaxb-axiom</module>
-                <module>../../../modules/databinding-sdo</module>
-                <module>../../../modules/databinding-sdo-axiom</module>
-                <module>../../../modules/definitions</module>
-                <module>../../../modules/definitions-xml</module>
-                <module>../../../modules/endpoint</module>
-                <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-equinox</module>
-                <module>../../../modules/host-corba</module>
-                <module>../../../modules/host-corba-jse</module>
-                <module>../../../modules/host-embedded</module>
-                <module>../../../modules/host-http</module>
-                <module>../../../modules/host-jetty</module>
-                <module>../../../modules/implementation-java</module>
-                <module>../../../modules/implementation-java-runtime</module>
-                <module>../../../modules/implementation-java-xml</module>
-                <module>../../../modules/implementation-node</module>
-                <module>../../../modules/implementation-node-runtime</module>
-                <module>../../../modules/interface</module>
-                <module>../../../modules/interface-java</module>
-                <module>../../../modules/interface-java-jaxws</module>
-                <module>../../../modules/interface-java-xml</module>
-                <module>../../../modules/interface-wsdl</module>
-                <module>../../../modules/interface-wsdl-xml</module>
-                <module>../../../modules/monitor</module>
-                <module>../../../modules/monitor-logging</module>
-                <module>../../../modules/node-api</module>
-                <module>../../../modules/node-impl</module>
-                <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-equinox</module>
-                <module>../../../modules/node-launcher-webapp</module>
-                <module>../../../modules/policy</module>
-                <module>../../../modules/policy-security</module>
-                <module>../../../modules/policy-security-ws</module>
-                <module>../../../modules/policy-xml</module>
-                <module>../../../modules/policy-xml-ws</module>
-                <module>../../../modules/sca-api</module>
-                <module>../../../modules/xsd</module>
-                <module>../../../modules/xsd-xml</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-distribution-features</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>tuscany-distribution-webservice</artifactId>
+    <name>Apache Tuscany SCA Web Service Distribution</name>
+    <packaging>pom</packaging>
+
+    <dependencies>
+
+        <!-- Core distribution -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distribution-core</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Bindings -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-sca-axis2</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.ant</groupId>
+                    <artifactId>ant-nodeps</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.axis2</groupId>
+                    <artifactId>addressing</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.axis2</groupId>
+                    <artifactId>axis2-xmlbeans</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.axis2</groupId>
+                    <artifactId>axis2-adb-codegen</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>bouncycastle</groupId>
+                    <artifactId>bcprov-jdk15</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>opensaml</groupId>
+                    <artifactId>opensaml</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- Databindings -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-axiom</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-sdo</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-sdo-axiom</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Hosts -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Policy models -->
+        <!--dependency> NOW IN BINDING-WS-AXIS2-POLICY
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy-security-ws</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency-->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy-xml-ws</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+
+        <!-- Default build profile that can be used to build the distro packages -->
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>distribution-package</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>src/main/assembly/bin.xml</descriptor>
+                                        <descriptor>src/main/assembly/src.xml</descriptor>
+                                    </descriptors>
+                                    <tarLongFileMode>gnu</tarLongFileMode>
+                                    <finalName>apache-tuscany-sca-webservice-1.4-SNAPSHOT</finalName>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        
+        <!-- Profile that can be used to build the modules included in the distro -->
+        <profile>
+            <id>modules</id>
+            <modules>
+                <module>../../../modules/assembly</module>
+                <module>../../../modules/assembly-xml</module>
+                <module>../../../modules/assembly-xsd</module>
+                <module>../../../modules/binding-corba</module>
+                <module>../../../modules/binding-corba-runtime</module>
+                <module>../../../modules/binding-sca</module>
+                <module>../../../modules/binding-sca-axis2</module>
+                <module>../../../modules/binding-sca-xml</module>
+                <module>../../../modules/binding-ws</module>
+                <module>../../../modules/binding-ws-axis2</module>
+                <module>../../../modules/binding-ws-axis2-policy</module>
+                <module>../../../modules/binding-ws-wsdlgen</module>
+                <module>../../../modules/binding-ws-xml</module>
+                <module>../../../modules/contribution</module>
+                <module>../../../modules/contribution-impl</module>
+                <module>../../../modules/contribution-java</module>
+                <module>../../../modules/contribution-namespace</module>
+                <module>../../../modules/contribution-xml</module>
+                <module>../../../modules/core</module>
+                <module>../../../modules/core-databinding</module>
+                <module>../../../modules/core-spi</module>
+                <module>../../../modules/data-api</module>
+                <module>../../../modules/databinding</module>
+                <module>../../../modules/databinding-axiom</module>
+                <module>../../../modules/databinding-jaxb</module>
+                <module>../../../modules/databinding-jaxb-axiom</module>
+                <module>../../../modules/databinding-sdo</module>
+                <module>../../../modules/databinding-sdo-axiom</module>
+                <module>../../../modules/definitions</module>
+                <module>../../../modules/definitions-xml</module>
+                <module>../../../modules/endpoint</module>
+                <module>../../../modules/extensibility</module>
+                <module>../../../modules/extensibility-equinox</module>
+                <module>../../../modules/host-corba</module>
+                <module>../../../modules/host-corba-jse</module>
+                <module>../../../modules/host-embedded</module>
+                <module>../../../modules/host-http</module>
+                <module>../../../modules/host-jetty</module>
+                <module>../../../modules/implementation-java</module>
+                <module>../../../modules/implementation-java-runtime</module>
+                <module>../../../modules/implementation-java-xml</module>
+                <module>../../../modules/implementation-node</module>
+                <module>../../../modules/implementation-node-runtime</module>
+                <module>../../../modules/interface</module>
+                <module>../../../modules/interface-java</module>
+                <module>../../../modules/interface-java-jaxws</module>
+                <module>../../../modules/interface-java-xml</module>
+                <module>../../../modules/interface-wsdl</module>
+                <module>../../../modules/interface-wsdl-xml</module>
+                <module>../../../modules/monitor</module>
+                <module>../../../modules/monitor-logging</module>
+                <module>../../../modules/node-api</module>
+                <module>../../../modules/node-impl</module>
+                <module>../../../modules/node-launcher</module>
+                <module>../../../modules/node-launcher-equinox</module>
+                <module>../../../modules/node-launcher-webapp</module>
+                <module>../../../modules/policy</module>
+                <module>../../../modules/policy-security</module>
+                <module>../../../modules/policy-security-ws</module>
+                <module>../../../modules/policy-xml</module>
+                <module>../../../modules/policy-xml-ws</module>
+                <module>../../../modules/sca-api</module>
+                <module>../../../modules/xsd</module>
+                <module>../../../modules/xsd-xml</module>
+            </modules>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/java/sca/distribution/manifest/pom.xml b/java/sca/distribution/manifest/pom.xml
index 95fef9ca10..320dcc2151 100644
--- a/java/sca/distribution/manifest/pom.xml
+++ b/java/sca/distribution/manifest/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/java/sca/distribution/pom.xml b/java/sca/distribution/pom.xml
index f092b2ee3e..d7e9a46930 100644
--- a/java/sca/distribution/pom.xml
+++ b/java/sca/distribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -101,7 +101,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <!--don't put two servlet hosts in the classpath TUSCANY-1954 -->
         <!--include tomcat here so it is shipped in modules/ but not  -->
@@ -109,7 +109,7 @@
         <!-- dependency> 
             <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency -->
         <dependency>
             <groupId>org.apache.tuscany.sdo</groupId>
diff --git a/java/sca/distribution/standalone/pom.xml b/java/sca/distribution/standalone/pom.xml
index 1cea366020..83cf69211e 100644
--- a/java/sca/distribution/standalone/pom.xml
+++ b/java/sca/distribution/standalone/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/java/sca/distribution/tomcat/pom.xml b/java/sca/distribution/tomcat/pom.xml
index 50259c299e..83d4884d6d 100644
--- a/java/sca/distribution/tomcat/pom.xml
+++ b/java/sca/distribution/tomcat/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/java/sca/distribution/war/pom.xml b/java/sca/distribution/war/pom.xml
index 4d280b2f26..08c2687e20 100644
--- a/java/sca/distribution/war/pom.xml
+++ b/java/sca/distribution/war/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/java/sca/distribution/webapp/pom.xml b/java/sca/distribution/webapp/pom.xml
index b78b81fc84..6745a87c60 100644
--- a/java/sca/distribution/webapp/pom.xml
+++ b/java/sca/distribution/webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-- 
cgit v1.2.3