141 files changed, 22 insertions, 58 deletions
diff --git a/branches/sca-equinox/distribution/features/all/pom.xml b/branches/sca-equinox/distribution/all/pom.xml
index e684afc067..e8a6782163 100644
--- a/branches/sca-equinox/distribution/features/all/pom.xml
+++ b/branches/sca-equinox/distribution/all/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-distribution-features</artifactId>
+        <artifactId>tuscany-distribution</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
diff --git a/branches/sca-equinox/distribution/features/all/src/main/assembly/bin.xml b/branches/sca-equinox/distribution/all/src/main/assembly/bin.xml
index 0ae0aaa615..0ae0aaa615 100644
--- a/branches/sca-equinox/distribution/features/all/src/main/assembly/bin.xml
+++ b/branches/sca-equinox/distribution/all/src/main/assembly/bin.xml
diff --git a/branches/sca-equinox/distribution/features/all/src/main/assembly/src.xml b/branches/sca-equinox/distribution/all/src/main/assembly/src.xml
index 7a57773572..7a57773572 100644
--- a/branches/sca-equinox/distribution/features/all/src/main/assembly/src.xml
+++ b/branches/sca-equinox/distribution/all/src/main/assembly/src.xml
diff --git a/branches/sca-equinox/distribution/features/all/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/all/src/main/components/src-modules.xml
index f3320c3456..f3320c3456 100644
--- a/branches/sca-equinox/distribution/features/all/src/main/components/src-modules.xml
+++ b/branches/sca-equinox/distribution/all/src/main/components/src-modules.xml
diff --git a/branches/sca-equinox/distribution/features/all/src/main/release/CHANGES b/branches/sca-equinox/distribution/all/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/branches/sca-equinox/distribution/features/all/src/main/release/CHANGES
+++ b/branches/sca-equinox/distribution/all/src/main/release/CHANGES
diff --git a/branches/sca-equinox/distribution/features/all/src/main/release/DISCLAIMER b/branches/sca-equinox/distribution/all/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sca-equinox/distribution/features/all/src/main/release/DISCLAIMER
+++ b/branches/sca-equinox/distribution/all/src/main/release/DISCLAIMER
diff --git a/branches/sca-equinox/distribution/features/all/src/main/release/README b/branches/sca-equinox/distribution/all/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/branches/sca-equinox/distribution/features/all/src/main/release/README
+++ b/branches/sca-equinox/distribution/all/src/main/release/README
diff --git a/branches/sca-equinox/distribution/features/all/src/main/release/RELEASE_NOTES b/branches/sca-equinox/distribution/all/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/branches/sca-equinox/distribution/features/all/src/main/release/RELEASE_NOTES
+++ b/branches/sca-equinox/distribution/all/src/main/release/RELEASE_NOTES
diff --git a/branches/sca-equinox/distribution/features/all/src/main/release/bin/INSTALL b/branches/sca-equinox/distribution/all/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/branches/sca-equinox/distribution/features/all/src/main/release/bin/INSTALL
+++ b/branches/sca-equinox/distribution/all/src/main/release/bin/INSTALL
diff --git a/branches/sca-equinox/distribution/features/all/src/main/release/bin/LICENSE b/branches/sca-equinox/distribution/all/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/branches/sca-equinox/distribution/features/all/src/main/release/bin/LICENSE
+++ b/branches/sca-equinox/distribution/all/src/main/release/bin/LICENSE
diff --git a/branches/sca-equinox/distribution/features/all/src/main/release/bin/NOTICE b/branches/sca-equinox/distribution/all/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/branches/sca-equinox/distribution/features/all/src/main/release/bin/NOTICE
+++ b/branches/sca-equinox/distribution/all/src/main/release/bin/NOTICE
diff --git a/branches/sca-equinox/distribution/features/all/src/main/release/src/BUILDING b/branches/sca-equinox/distribution/all/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/branches/sca-equinox/distribution/features/all/src/main/release/src/BUILDING
+++ b/branches/sca-equinox/distribution/all/src/main/release/src/BUILDING
diff --git a/branches/sca-equinox/distribution/features/all/src/main/release/src/LICENSE b/branches/sca-equinox/distribution/all/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/branches/sca-equinox/distribution/features/all/src/main/release/src/LICENSE
+++ b/branches/sca-equinox/distribution/all/src/main/release/src/LICENSE
diff --git a/branches/sca-equinox/distribution/features/all/src/main/release/src/NOTICE b/branches/sca-equinox/distribution/all/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/branches/sca-equinox/distribution/features/all/src/main/release/src/NOTICE
+++ b/branches/sca-equinox/distribution/all/src/main/release/src/NOTICE
diff --git a/branches/sca-equinox/distribution/features/core/pom.xml b/branches/sca-equinox/distribution/core/pom.xml
index b5a2d7d8af..fba7d33baf 100644
--- a/branches/sca-equinox/distribution/features/core/pom.xml
+++ b/branches/sca-equinox/distribution/core/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-distribution-features</artifactId>
+        <artifactId>tuscany-distribution</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
diff --git a/branches/sca-equinox/distribution/features/core/src/main/assembly/bin.xml b/branches/sca-equinox/distribution/core/src/main/assembly/bin.xml
index d054e5696c..d054e5696c 100644
--- a/branches/sca-equinox/distribution/features/core/src/main/assembly/bin.xml
+++ b/branches/sca-equinox/distribution/core/src/main/assembly/bin.xml
diff --git a/branches/sca-equinox/distribution/features/core/src/main/assembly/src.xml b/branches/sca-equinox/distribution/core/src/main/assembly/src.xml
index 6fe3e2dae1..6fe3e2dae1 100644
--- a/branches/sca-equinox/distribution/features/core/src/main/assembly/src.xml
+++ b/branches/sca-equinox/distribution/core/src/main/assembly/src.xml
diff --git a/branches/sca-equinox/distribution/features/core/src/main/components/bin-common.xml b/branches/sca-equinox/distribution/core/src/main/components/bin-common.xml
index c69e8e3699..c69e8e3699 100644
--- a/branches/sca-equinox/distribution/features/core/src/main/components/bin-common.xml
+++ b/branches/sca-equinox/distribution/core/src/main/components/bin-common.xml
diff --git a/branches/sca-equinox/distribution/features/core/src/main/components/bin-modules.xml b/branches/sca-equinox/distribution/core/src/main/components/bin-modules.xml
index 5e1c5ec5d6..5e1c5ec5d6 100644
--- a/branches/sca-equinox/distribution/features/core/src/main/components/bin-modules.xml
+++ b/branches/sca-equinox/distribution/core/src/main/components/bin-modules.xml
diff --git a/branches/sca-equinox/distribution/features/core/src/main/components/bin-samples.xml b/branches/sca-equinox/distribution/core/src/main/components/bin-samples.xml
index fbe46a296c..fbe46a296c 100644
--- a/branches/sca-equinox/distribution/features/core/src/main/components/bin-samples.xml
+++ b/branches/sca-equinox/distribution/core/src/main/components/bin-samples.xml
diff --git a/branches/sca-equinox/distribution/features/core/src/main/components/src-common.xml b/branches/sca-equinox/distribution/core/src/main/components/src-common.xml
index 002df33fc7..002df33fc7 100644
--- a/branches/sca-equinox/distribution/features/core/src/main/components/src-common.xml
+++ b/branches/sca-equinox/distribution/core/src/main/components/src-common.xml
diff --git a/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/core/src/main/components/src-modules.xml
index 3a091b567b..3a091b567b 100644
--- a/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml
+++ b/branches/sca-equinox/distribution/core/src/main/components/src-modules.xml
diff --git a/branches/sca-equinox/distribution/features/core/src/main/release/CHANGES b/branches/sca-equinox/distribution/core/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/branches/sca-equinox/distribution/features/core/src/main/release/CHANGES
+++ b/branches/sca-equinox/distribution/core/src/main/release/CHANGES
diff --git a/branches/sca-equinox/distribution/features/core/src/main/release/DISCLAIMER b/branches/sca-equinox/distribution/core/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sca-equinox/distribution/features/core/src/main/release/DISCLAIMER
+++ b/branches/sca-equinox/distribution/core/src/main/release/DISCLAIMER
diff --git a/branches/sca-equinox/distribution/features/core/src/main/release/README b/branches/sca-equinox/distribution/core/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/branches/sca-equinox/distribution/features/core/src/main/release/README
+++ b/branches/sca-equinox/distribution/core/src/main/release/README
diff --git a/branches/sca-equinox/distribution/features/core/src/main/release/RELEASE_NOTES b/branches/sca-equinox/distribution/core/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/branches/sca-equinox/distribution/features/core/src/main/release/RELEASE_NOTES
+++ b/branches/sca-equinox/distribution/core/src/main/release/RELEASE_NOTES
diff --git a/branches/sca-equinox/distribution/features/core/src/main/release/bin/INSTALL b/branches/sca-equinox/distribution/core/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/branches/sca-equinox/distribution/features/core/src/main/release/bin/INSTALL
+++ b/branches/sca-equinox/distribution/core/src/main/release/bin/INSTALL
diff --git a/branches/sca-equinox/distribution/features/core/src/main/release/bin/LICENSE b/branches/sca-equinox/distribution/core/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/branches/sca-equinox/distribution/features/core/src/main/release/bin/LICENSE
+++ b/branches/sca-equinox/distribution/core/src/main/release/bin/LICENSE
diff --git a/branches/sca-equinox/distribution/features/core/src/main/release/bin/NOTICE b/branches/sca-equinox/distribution/core/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/branches/sca-equinox/distribution/features/core/src/main/release/bin/NOTICE
+++ b/branches/sca-equinox/distribution/core/src/main/release/bin/NOTICE
diff --git a/branches/sca-equinox/distribution/features/core/src/main/release/src/BUILDING b/branches/sca-equinox/distribution/core/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/branches/sca-equinox/distribution/features/core/src/main/release/src/BUILDING
+++ b/branches/sca-equinox/distribution/core/src/main/release/src/BUILDING
diff --git a/branches/sca-equinox/distribution/features/core/src/main/release/src/LICENSE b/branches/sca-equinox/distribution/core/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/branches/sca-equinox/distribution/features/core/src/main/release/src/LICENSE
+++ b/branches/sca-equinox/distribution/core/src/main/release/src/LICENSE
diff --git a/branches/sca-equinox/distribution/features/core/src/main/release/src/NOTICE b/branches/sca-equinox/distribution/core/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/branches/sca-equinox/distribution/features/core/src/main/release/src/NOTICE
+++ b/branches/sca-equinox/distribution/core/src/main/release/src/NOTICE
diff --git a/branches/sca-equinox/distribution/features/ejava/pom.xml b/branches/sca-equinox/distribution/ejava/pom.xml
index b4a27f7dca..26a1a9455a 100644
--- a/branches/sca-equinox/distribution/features/ejava/pom.xml
+++ b/branches/sca-equinox/distribution/ejava/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-distribution-features</artifactId>
+        <artifactId>tuscany-distribution</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
diff --git a/branches/sca-equinox/distribution/features/ejava/src/main/assembly/bin.xml b/branches/sca-equinox/distribution/ejava/src/main/assembly/bin.xml
index 7413fde78f..7413fde78f 100644
--- a/branches/sca-equinox/distribution/features/ejava/src/main/assembly/bin.xml
+++ b/branches/sca-equinox/distribution/ejava/src/main/assembly/bin.xml
diff --git a/branches/sca-equinox/distribution/features/ejava/src/main/assembly/src.xml b/branches/sca-equinox/distribution/ejava/src/main/assembly/src.xml
index 0d832271b9..0d832271b9 100644
--- a/branches/sca-equinox/distribution/features/ejava/src/main/assembly/src.xml
+++ b/branches/sca-equinox/distribution/ejava/src/main/assembly/src.xml
diff --git a/branches/sca-equinox/distribution/features/ejava/src/main/components/bin-samples.xml b/branches/sca-equinox/distribution/ejava/src/main/components/bin-samples.xml
index f1c691965b..f1c691965b 100644
--- a/branches/sca-equinox/distribution/features/ejava/src/main/components/bin-samples.xml
+++ b/branches/sca-equinox/distribution/ejava/src/main/components/bin-samples.xml
diff --git a/branches/sca-equinox/distribution/features/ejava/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/ejava/src/main/components/src-modules.xml
index 89a432e2cc..89a432e2cc 100644
--- a/branches/sca-equinox/distribution/features/ejava/src/main/components/src-modules.xml
+++ b/branches/sca-equinox/distribution/ejava/src/main/components/src-modules.xml
diff --git a/branches/sca-equinox/distribution/features/ejava/src/main/release/CHANGES b/branches/sca-equinox/distribution/ejava/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/branches/sca-equinox/distribution/features/ejava/src/main/release/CHANGES
+++ b/branches/sca-equinox/distribution/ejava/src/main/release/CHANGES
diff --git a/branches/sca-equinox/distribution/features/ejava/src/main/release/DISCLAIMER b/branches/sca-equinox/distribution/ejava/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sca-equinox/distribution/features/ejava/src/main/release/DISCLAIMER
+++ b/branches/sca-equinox/distribution/ejava/src/main/release/DISCLAIMER
diff --git a/branches/sca-equinox/distribution/features/ejava/src/main/release/README b/branches/sca-equinox/distribution/ejava/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/branches/sca-equinox/distribution/features/ejava/src/main/release/README
+++ b/branches/sca-equinox/distribution/ejava/src/main/release/README
diff --git a/branches/sca-equinox/distribution/features/ejava/src/main/release/RELEASE_NOTES b/branches/sca-equinox/distribution/ejava/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/branches/sca-equinox/distribution/features/ejava/src/main/release/RELEASE_NOTES
+++ b/branches/sca-equinox/distribution/ejava/src/main/release/RELEASE_NOTES
diff --git a/branches/sca-equinox/distribution/features/ejava/src/main/release/bin/INSTALL b/branches/sca-equinox/distribution/ejava/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/branches/sca-equinox/distribution/features/ejava/src/main/release/bin/INSTALL
+++ b/branches/sca-equinox/distribution/ejava/src/main/release/bin/INSTALL
diff --git a/branches/sca-equinox/distribution/features/ejava/src/main/release/bin/LICENSE b/branches/sca-equinox/distribution/ejava/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/branches/sca-equinox/distribution/features/ejava/src/main/release/bin/LICENSE
+++ b/branches/sca-equinox/distribution/ejava/src/main/release/bin/LICENSE
diff --git a/branches/sca-equinox/distribution/features/ejava/src/main/release/bin/NOTICE b/branches/sca-equinox/distribution/ejava/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/branches/sca-equinox/distribution/features/ejava/src/main/release/bin/NOTICE
+++ b/branches/sca-equinox/distribution/ejava/src/main/release/bin/NOTICE
diff --git a/branches/sca-equinox/distribution/features/ejava/src/main/release/src/BUILDING b/branches/sca-equinox/distribution/ejava/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/branches/sca-equinox/distribution/features/ejava/src/main/release/src/BUILDING
+++ b/branches/sca-equinox/distribution/ejava/src/main/release/src/BUILDING
diff --git a/branches/sca-equinox/distribution/features/ejava/src/main/release/src/LICENSE b/branches/sca-equinox/distribution/ejava/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/branches/sca-equinox/distribution/features/ejava/src/main/release/src/LICENSE
+++ b/branches/sca-equinox/distribution/ejava/src/main/release/src/LICENSE
diff --git a/branches/sca-equinox/distribution/features/ejava/src/main/release/src/NOTICE b/branches/sca-equinox/distribution/ejava/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/branches/sca-equinox/distribution/features/ejava/src/main/release/src/NOTICE
+++ b/branches/sca-equinox/distribution/ejava/src/main/release/src/NOTICE
diff --git a/branches/sca-equinox/distribution/features/etc/generate-all-maven-files.sh b/branches/sca-equinox/distribution/etc/generate-all-maven-files.sh
index 4d1327f518..4d1327f518 100755
--- a/branches/sca-equinox/distribution/features/etc/generate-all-maven-files.sh
+++ b/branches/sca-equinox/distribution/etc/generate-all-maven-files.sh
diff --git a/branches/sca-equinox/distribution/features/etc/generate-filtered-dependencies.sh b/branches/sca-equinox/distribution/etc/generate-filtered-dependencies.sh
index 7a04369b50..7a04369b50 100755
--- a/branches/sca-equinox/distribution/features/etc/generate-filtered-dependencies.sh
+++ b/branches/sca-equinox/distribution/etc/generate-filtered-dependencies.sh
diff --git a/branches/sca-equinox/distribution/features/etc/generate-maven-files.sh b/branches/sca-equinox/distribution/etc/generate-maven-files.sh
index adb190eabd..adb190eabd 100755
--- a/branches/sca-equinox/distribution/features/etc/generate-maven-files.sh
+++ b/branches/sca-equinox/distribution/etc/generate-maven-files.sh
diff --git a/branches/sca-equinox/distribution/features/etc/generate-pom.sh b/branches/sca-equinox/distribution/etc/generate-pom.sh
index ce0228694c..ce0228694c 100755
--- a/branches/sca-equinox/distribution/features/etc/generate-pom.sh
+++ b/branches/sca-equinox/distribution/etc/generate-pom.sh
diff --git a/branches/sca-equinox/distribution/features/etc/generate-src-modules.sh b/branches/sca-equinox/distribution/etc/generate-src-modules.sh
index 60dbbcd2d0..60dbbcd2d0 100755
--- a/branches/sca-equinox/distribution/features/etc/generate-src-modules.sh
+++ b/branches/sca-equinox/distribution/etc/generate-src-modules.sh
diff --git a/branches/sca-equinox/distribution/features/pom.xml b/branches/sca-equinox/distribution/features/pom.xml
deleted file mode 100644
index a00b03ca00..0000000000
--- a/branches/sca-equinox/distribution/features/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for 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>manager</module>
-        <module>pdetarget</module>
-        <module>process</module>
-        <module>repository</module>
-        <module>web20</module>
-        <module>webservice</module>
-    </modules>
-
-</project>
diff --git a/branches/sca-equinox/distribution/features/manager/pom.xml b/branches/sca-equinox/distribution/manager/pom.xml
index 219bdd4a11..d239ef0737 100644
--- a/branches/sca-equinox/distribution/features/manager/pom.xml
+++ b/branches/sca-equinox/distribution/manager/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-distribution-features</artifactId>
+        <artifactId>tuscany-distribution</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
diff --git a/branches/sca-equinox/distribution/features/manager/src/main/assembly/bin.xml b/branches/sca-equinox/distribution/manager/src/main/assembly/bin.xml
index 7413fde78f..7413fde78f 100644
--- a/branches/sca-equinox/distribution/features/manager/src/main/assembly/bin.xml
+++ b/branches/sca-equinox/distribution/manager/src/main/assembly/bin.xml
diff --git a/branches/sca-equinox/distribution/features/manager/src/main/assembly/src.xml b/branches/sca-equinox/distribution/manager/src/main/assembly/src.xml
index 0d832271b9..0d832271b9 100644
--- a/branches/sca-equinox/distribution/features/manager/src/main/assembly/src.xml
+++ b/branches/sca-equinox/distribution/manager/src/main/assembly/src.xml
diff --git a/branches/sca-equinox/distribution/features/manager/src/main/components/bin-samples.xml b/branches/sca-equinox/distribution/manager/src/main/components/bin-samples.xml
index d4b13c42e0..d4b13c42e0 100644
--- a/branches/sca-equinox/distribution/features/manager/src/main/components/bin-samples.xml
+++ b/branches/sca-equinox/distribution/manager/src/main/components/bin-samples.xml
diff --git a/branches/sca-equinox/distribution/features/manager/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/manager/src/main/components/src-modules.xml
index 3437db9cc5..3437db9cc5 100644
--- a/branches/sca-equinox/distribution/features/manager/src/main/components/src-modules.xml
+++ b/branches/sca-equinox/distribution/manager/src/main/components/src-modules.xml
diff --git a/branches/sca-equinox/distribution/features/manager/src/main/release/CHANGES b/branches/sca-equinox/distribution/manager/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/branches/sca-equinox/distribution/features/manager/src/main/release/CHANGES
+++ b/branches/sca-equinox/distribution/manager/src/main/release/CHANGES
diff --git a/branches/sca-equinox/distribution/features/manager/src/main/release/DISCLAIMER b/branches/sca-equinox/distribution/manager/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sca-equinox/distribution/features/manager/src/main/release/DISCLAIMER
+++ b/branches/sca-equinox/distribution/manager/src/main/release/DISCLAIMER
diff --git a/branches/sca-equinox/distribution/features/manager/src/main/release/README b/branches/sca-equinox/distribution/manager/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/branches/sca-equinox/distribution/features/manager/src/main/release/README
+++ b/branches/sca-equinox/distribution/manager/src/main/release/README
diff --git a/branches/sca-equinox/distribution/features/manager/src/main/release/RELEASE_NOTES b/branches/sca-equinox/distribution/manager/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/branches/sca-equinox/distribution/features/manager/src/main/release/RELEASE_NOTES
+++ b/branches/sca-equinox/distribution/manager/src/main/release/RELEASE_NOTES
diff --git a/branches/sca-equinox/distribution/features/manager/src/main/release/bin/INSTALL b/branches/sca-equinox/distribution/manager/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/branches/sca-equinox/distribution/features/manager/src/main/release/bin/INSTALL
+++ b/branches/sca-equinox/distribution/manager/src/main/release/bin/INSTALL
diff --git a/branches/sca-equinox/distribution/features/manager/src/main/release/bin/LICENSE b/branches/sca-equinox/distribution/manager/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/branches/sca-equinox/distribution/features/manager/src/main/release/bin/LICENSE
+++ b/branches/sca-equinox/distribution/manager/src/main/release/bin/LICENSE
diff --git a/branches/sca-equinox/distribution/features/manager/src/main/release/bin/NOTICE b/branches/sca-equinox/distribution/manager/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/branches/sca-equinox/distribution/features/manager/src/main/release/bin/NOTICE
+++ b/branches/sca-equinox/distribution/manager/src/main/release/bin/NOTICE
diff --git a/branches/sca-equinox/distribution/features/manager/src/main/release/src/BUILDING b/branches/sca-equinox/distribution/manager/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/branches/sca-equinox/distribution/features/manager/src/main/release/src/BUILDING
+++ b/branches/sca-equinox/distribution/manager/src/main/release/src/BUILDING
diff --git a/branches/sca-equinox/distribution/features/manager/src/main/release/src/LICENSE b/branches/sca-equinox/distribution/manager/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/branches/sca-equinox/distribution/features/manager/src/main/release/src/LICENSE
+++ b/branches/sca-equinox/distribution/manager/src/main/release/src/LICENSE
diff --git a/branches/sca-equinox/distribution/features/manager/src/main/release/src/NOTICE b/branches/sca-equinox/distribution/manager/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/branches/sca-equinox/distribution/features/manager/src/main/release/src/NOTICE
+++ b/branches/sca-equinox/distribution/manager/src/main/release/src/NOTICE
diff --git a/branches/sca-equinox/distribution/features/pdetarget/pom.xml b/branches/sca-equinox/distribution/pdetarget/pom.xml
index 9d00ece274..052538cfff 100644
--- a/branches/sca-equinox/distribution/features/pdetarget/pom.xml
+++ b/branches/sca-equinox/distribution/pdetarget/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-distribution-features</artifactId>
+        <artifactId>tuscany-distribution</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
diff --git a/branches/sca-equinox/distribution/features/pdetarget/src/main/assembly/bin.xml b/branches/sca-equinox/distribution/pdetarget/src/main/assembly/bin.xml
index 0ae0aaa615..0ae0aaa615 100644
--- a/branches/sca-equinox/distribution/features/pdetarget/src/main/assembly/bin.xml
+++ b/branches/sca-equinox/distribution/pdetarget/src/main/assembly/bin.xml
diff --git a/branches/sca-equinox/distribution/features/pdetarget/src/main/assembly/src.xml b/branches/sca-equinox/distribution/pdetarget/src/main/assembly/src.xml
index 7a57773572..7a57773572 100644
--- a/branches/sca-equinox/distribution/features/pdetarget/src/main/assembly/src.xml
+++ b/branches/sca-equinox/distribution/pdetarget/src/main/assembly/src.xml
diff --git a/branches/sca-equinox/distribution/features/pdetarget/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/pdetarget/src/main/components/src-modules.xml
index f3320c3456..f3320c3456 100644
--- a/branches/sca-equinox/distribution/features/pdetarget/src/main/components/src-modules.xml
+++ b/branches/sca-equinox/distribution/pdetarget/src/main/components/src-modules.xml
diff --git a/branches/sca-equinox/distribution/features/pdetarget/src/main/release/CHANGES b/branches/sca-equinox/distribution/pdetarget/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/branches/sca-equinox/distribution/features/pdetarget/src/main/release/CHANGES
+++ b/branches/sca-equinox/distribution/pdetarget/src/main/release/CHANGES
diff --git a/branches/sca-equinox/distribution/features/pdetarget/src/main/release/DISCLAIMER b/branches/sca-equinox/distribution/pdetarget/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sca-equinox/distribution/features/pdetarget/src/main/release/DISCLAIMER
+++ b/branches/sca-equinox/distribution/pdetarget/src/main/release/DISCLAIMER
diff --git a/branches/sca-equinox/distribution/features/pdetarget/src/main/release/README b/branches/sca-equinox/distribution/pdetarget/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/branches/sca-equinox/distribution/features/pdetarget/src/main/release/README
+++ b/branches/sca-equinox/distribution/pdetarget/src/main/release/README
diff --git a/branches/sca-equinox/distribution/features/pdetarget/src/main/release/RELEASE_NOTES b/branches/sca-equinox/distribution/pdetarget/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/branches/sca-equinox/distribution/features/pdetarget/src/main/release/RELEASE_NOTES
+++ b/branches/sca-equinox/distribution/pdetarget/src/main/release/RELEASE_NOTES
diff --git a/branches/sca-equinox/distribution/features/pdetarget/src/main/release/bin/INSTALL b/branches/sca-equinox/distribution/pdetarget/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/branches/sca-equinox/distribution/features/pdetarget/src/main/release/bin/INSTALL
+++ b/branches/sca-equinox/distribution/pdetarget/src/main/release/bin/INSTALL
diff --git a/branches/sca-equinox/distribution/features/pdetarget/src/main/release/bin/LICENSE b/branches/sca-equinox/distribution/pdetarget/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/branches/sca-equinox/distribution/features/pdetarget/src/main/release/bin/LICENSE
+++ b/branches/sca-equinox/distribution/pdetarget/src/main/release/bin/LICENSE
diff --git a/branches/sca-equinox/distribution/features/pdetarget/src/main/release/bin/NOTICE b/branches/sca-equinox/distribution/pdetarget/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/branches/sca-equinox/distribution/features/pdetarget/src/main/release/bin/NOTICE
+++ b/branches/sca-equinox/distribution/pdetarget/src/main/release/bin/NOTICE
diff --git a/branches/sca-equinox/distribution/features/pdetarget/src/main/release/src/BUILDING b/branches/sca-equinox/distribution/pdetarget/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/branches/sca-equinox/distribution/features/pdetarget/src/main/release/src/BUILDING
+++ b/branches/sca-equinox/distribution/pdetarget/src/main/release/src/BUILDING
diff --git a/branches/sca-equinox/distribution/features/pdetarget/src/main/release/src/LICENSE b/branches/sca-equinox/distribution/pdetarget/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/branches/sca-equinox/distribution/features/pdetarget/src/main/release/src/LICENSE
+++ b/branches/sca-equinox/distribution/pdetarget/src/main/release/src/LICENSE
diff --git a/branches/sca-equinox/distribution/features/pdetarget/src/main/release/src/NOTICE b/branches/sca-equinox/distribution/pdetarget/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/branches/sca-equinox/distribution/features/pdetarget/src/main/release/src/NOTICE
+++ b/branches/sca-equinox/distribution/pdetarget/src/main/release/src/NOTICE
diff --git a/branches/sca-equinox/distribution/pom.xml b/branches/sca-equinox/distribution/pom.xml
index 43c37d15d4..b4d1801580 100644
--- a/branches/sca-equinox/distribution/pom.xml
+++ b/branches/sca-equinox/distribution/pom.xml
@@ -22,15 +22,24 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
+        <version>1.4-SNAPSHOT</version>
     </parent>
-
+    <groupId>org.apache.tuscany.sca</groupId>
     <artifactId>tuscany-distribution</artifactId>
-    <name>Apache Tuscany SCA Distribution</name>
     <packaging>pom</packaging>
+    <name>Apache Tuscany SCA Distributions</name>
 
     <modules>
-        <module>features</module>
+        <module>all</module>
+        <module>core</module>
+        <module>ejava</module>
+        <module>manager</module>
+        <module>pdetarget</module>
+        <module>process</module>
+        <module>repository</module>
+        <module>web20</module>
+        <module>webservice</module>
     </modules>
+
 </project>
diff --git a/branches/sca-equinox/distribution/features/process/pom.xml b/branches/sca-equinox/distribution/process/pom.xml
index 50f33a0e8c..d7a33cdae7 100644
--- a/branches/sca-equinox/distribution/features/process/pom.xml
+++ b/branches/sca-equinox/distribution/process/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-distribution-features</artifactId>
+        <artifactId>tuscany-distribution</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
diff --git a/branches/sca-equinox/distribution/features/process/src/main/assembly/bin.xml b/branches/sca-equinox/distribution/process/src/main/assembly/bin.xml
index 7413fde78f..7413fde78f 100644
--- a/branches/sca-equinox/distribution/features/process/src/main/assembly/bin.xml
+++ b/branches/sca-equinox/distribution/process/src/main/assembly/bin.xml
diff --git a/branches/sca-equinox/distribution/features/process/src/main/assembly/src.xml b/branches/sca-equinox/distribution/process/src/main/assembly/src.xml
index 0d832271b9..0d832271b9 100644
--- a/branches/sca-equinox/distribution/features/process/src/main/assembly/src.xml
+++ b/branches/sca-equinox/distribution/process/src/main/assembly/src.xml
diff --git a/branches/sca-equinox/distribution/features/process/src/main/components/bin-samples.xml b/branches/sca-equinox/distribution/process/src/main/components/bin-samples.xml
index 8e8bc2e507..8e8bc2e507 100644
--- a/branches/sca-equinox/distribution/features/process/src/main/components/bin-samples.xml
+++ b/branches/sca-equinox/distribution/process/src/main/components/bin-samples.xml
diff --git a/branches/sca-equinox/distribution/features/process/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/process/src/main/components/src-modules.xml
index 68b2c39644..68b2c39644 100644
--- a/branches/sca-equinox/distribution/features/process/src/main/components/src-modules.xml
+++ b/branches/sca-equinox/distribution/process/src/main/components/src-modules.xml
diff --git a/branches/sca-equinox/distribution/features/process/src/main/release/CHANGES b/branches/sca-equinox/distribution/process/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/branches/sca-equinox/distribution/features/process/src/main/release/CHANGES
+++ b/branches/sca-equinox/distribution/process/src/main/release/CHANGES
diff --git a/branches/sca-equinox/distribution/features/process/src/main/release/DISCLAIMER b/branches/sca-equinox/distribution/process/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sca-equinox/distribution/features/process/src/main/release/DISCLAIMER
+++ b/branches/sca-equinox/distribution/process/src/main/release/DISCLAIMER
diff --git a/branches/sca-equinox/distribution/features/process/src/main/release/README b/branches/sca-equinox/distribution/process/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/branches/sca-equinox/distribution/features/process/src/main/release/README
+++ b/branches/sca-equinox/distribution/process/src/main/release/README
diff --git a/branches/sca-equinox/distribution/features/process/src/main/release/RELEASE_NOTES b/branches/sca-equinox/distribution/process/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/branches/sca-equinox/distribution/features/process/src/main/release/RELEASE_NOTES
+++ b/branches/sca-equinox/distribution/process/src/main/release/RELEASE_NOTES
diff --git a/branches/sca-equinox/distribution/features/process/src/main/release/bin/INSTALL b/branches/sca-equinox/distribution/process/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/branches/sca-equinox/distribution/features/process/src/main/release/bin/INSTALL
+++ b/branches/sca-equinox/distribution/process/src/main/release/bin/INSTALL
diff --git a/branches/sca-equinox/distribution/features/process/src/main/release/bin/LICENSE b/branches/sca-equinox/distribution/process/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/branches/sca-equinox/distribution/features/process/src/main/release/bin/LICENSE
+++ b/branches/sca-equinox/distribution/process/src/main/release/bin/LICENSE
diff --git a/branches/sca-equinox/distribution/features/process/src/main/release/bin/NOTICE b/branches/sca-equinox/distribution/process/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/branches/sca-equinox/distribution/features/process/src/main/release/bin/NOTICE
+++ b/branches/sca-equinox/distribution/process/src/main/release/bin/NOTICE
diff --git a/branches/sca-equinox/distribution/features/process/src/main/release/src/BUILDING b/branches/sca-equinox/distribution/process/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/branches/sca-equinox/distribution/features/process/src/main/release/src/BUILDING
+++ b/branches/sca-equinox/distribution/process/src/main/release/src/BUILDING
diff --git a/branches/sca-equinox/distribution/features/process/src/main/release/src/LICENSE b/branches/sca-equinox/distribution/process/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/branches/sca-equinox/distribution/features/process/src/main/release/src/LICENSE
+++ b/branches/sca-equinox/distribution/process/src/main/release/src/LICENSE
diff --git a/branches/sca-equinox/distribution/features/process/src/main/release/src/NOTICE b/branches/sca-equinox/distribution/process/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/branches/sca-equinox/distribution/features/process/src/main/release/src/NOTICE
+++ b/branches/sca-equinox/distribution/process/src/main/release/src/NOTICE
diff --git a/branches/sca-equinox/distribution/features/repository/pom.xml b/branches/sca-equinox/distribution/repository/pom.xml
index ee1cb85df6..abbf789cb8 100644
--- a/branches/sca-equinox/distribution/features/repository/pom.xml
+++ b/branches/sca-equinox/distribution/repository/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-distribution-features</artifactId>
+        <artifactId>tuscany-distribution</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
diff --git a/branches/sca-equinox/distribution/features/repository/src/main/assembly/repository.xml b/branches/sca-equinox/distribution/repository/src/main/assembly/repository.xml
index ed459500a8..ed459500a8 100644
--- a/branches/sca-equinox/distribution/features/repository/src/main/assembly/repository.xml
+++ b/branches/sca-equinox/distribution/repository/src/main/assembly/repository.xml
diff --git a/branches/sca-equinox/distribution/features/repository/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/repository/src/main/components/src-modules.xml
index 0736faf913..0736faf913 100644
--- a/branches/sca-equinox/distribution/features/repository/src/main/components/src-modules.xml
+++ b/branches/sca-equinox/distribution/repository/src/main/components/src-modules.xml
diff --git a/branches/sca-equinox/distribution/features/repository/src/main/release/CHANGES b/branches/sca-equinox/distribution/repository/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/branches/sca-equinox/distribution/features/repository/src/main/release/CHANGES
+++ b/branches/sca-equinox/distribution/repository/src/main/release/CHANGES
diff --git a/branches/sca-equinox/distribution/features/repository/src/main/release/DISCLAIMER b/branches/sca-equinox/distribution/repository/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sca-equinox/distribution/features/repository/src/main/release/DISCLAIMER
+++ b/branches/sca-equinox/distribution/repository/src/main/release/DISCLAIMER
diff --git a/branches/sca-equinox/distribution/features/repository/src/main/release/README b/branches/sca-equinox/distribution/repository/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/branches/sca-equinox/distribution/features/repository/src/main/release/README
+++ b/branches/sca-equinox/distribution/repository/src/main/release/README
diff --git a/branches/sca-equinox/distribution/features/repository/src/main/release/RELEASE_NOTES b/branches/sca-equinox/distribution/repository/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/branches/sca-equinox/distribution/features/repository/src/main/release/RELEASE_NOTES
+++ b/branches/sca-equinox/distribution/repository/src/main/release/RELEASE_NOTES
diff --git a/branches/sca-equinox/distribution/features/repository/src/main/release/bin/INSTALL b/branches/sca-equinox/distribution/repository/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/branches/sca-equinox/distribution/features/repository/src/main/release/bin/INSTALL
+++ b/branches/sca-equinox/distribution/repository/src/main/release/bin/INSTALL
diff --git a/branches/sca-equinox/distribution/features/repository/src/main/release/bin/LICENSE b/branches/sca-equinox/distribution/repository/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/branches/sca-equinox/distribution/features/repository/src/main/release/bin/LICENSE
+++ b/branches/sca-equinox/distribution/repository/src/main/release/bin/LICENSE
diff --git a/branches/sca-equinox/distribution/features/repository/src/main/release/bin/NOTICE b/branches/sca-equinox/distribution/repository/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/branches/sca-equinox/distribution/features/repository/src/main/release/bin/NOTICE
+++ b/branches/sca-equinox/distribution/repository/src/main/release/bin/NOTICE
diff --git a/branches/sca-equinox/distribution/features/repository/src/main/release/src/BUILDING b/branches/sca-equinox/distribution/repository/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/branches/sca-equinox/distribution/features/repository/src/main/release/src/BUILDING
+++ b/branches/sca-equinox/distribution/repository/src/main/release/src/BUILDING
diff --git a/branches/sca-equinox/distribution/features/repository/src/main/release/src/LICENSE b/branches/sca-equinox/distribution/repository/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/branches/sca-equinox/distribution/features/repository/src/main/release/src/LICENSE
+++ b/branches/sca-equinox/distribution/repository/src/main/release/src/LICENSE
diff --git a/branches/sca-equinox/distribution/features/repository/src/main/release/src/NOTICE b/branches/sca-equinox/distribution/repository/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/branches/sca-equinox/distribution/features/repository/src/main/release/src/NOTICE
+++ b/branches/sca-equinox/distribution/repository/src/main/release/src/NOTICE
diff --git a/branches/sca-equinox/distribution/features/web20/pom.xml b/branches/sca-equinox/distribution/web20/pom.xml
index b1f0d587f0..6a3461e172 100644
--- a/branches/sca-equinox/distribution/features/web20/pom.xml
+++ b/branches/sca-equinox/distribution/web20/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-distribution-features</artifactId>
+        <artifactId>tuscany-distribution</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
diff --git a/branches/sca-equinox/distribution/features/web20/src/main/assembly/bin.xml b/branches/sca-equinox/distribution/web20/src/main/assembly/bin.xml
index 7413fde78f..7413fde78f 100644
--- a/branches/sca-equinox/distribution/features/web20/src/main/assembly/bin.xml
+++ b/branches/sca-equinox/distribution/web20/src/main/assembly/bin.xml
diff --git a/branches/sca-equinox/distribution/features/web20/src/main/assembly/src.xml b/branches/sca-equinox/distribution/web20/src/main/assembly/src.xml
index 0d832271b9..0d832271b9 100644
--- a/branches/sca-equinox/distribution/features/web20/src/main/assembly/src.xml
+++ b/branches/sca-equinox/distribution/web20/src/main/assembly/src.xml
diff --git a/branches/sca-equinox/distribution/features/web20/src/main/components/bin-samples.xml b/branches/sca-equinox/distribution/web20/src/main/components/bin-samples.xml
index 5cc62040c0..5cc62040c0 100644
--- a/branches/sca-equinox/distribution/features/web20/src/main/components/bin-samples.xml
+++ b/branches/sca-equinox/distribution/web20/src/main/components/bin-samples.xml
diff --git a/branches/sca-equinox/distribution/features/web20/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/web20/src/main/components/src-modules.xml
index 68aae46796..68aae46796 100644
--- a/branches/sca-equinox/distribution/features/web20/src/main/components/src-modules.xml
+++ b/branches/sca-equinox/distribution/web20/src/main/components/src-modules.xml
diff --git a/branches/sca-equinox/distribution/features/web20/src/main/release/CHANGES b/branches/sca-equinox/distribution/web20/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/branches/sca-equinox/distribution/features/web20/src/main/release/CHANGES
+++ b/branches/sca-equinox/distribution/web20/src/main/release/CHANGES
diff --git a/branches/sca-equinox/distribution/features/web20/src/main/release/DISCLAIMER b/branches/sca-equinox/distribution/web20/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sca-equinox/distribution/features/web20/src/main/release/DISCLAIMER
+++ b/branches/sca-equinox/distribution/web20/src/main/release/DISCLAIMER
diff --git a/branches/sca-equinox/distribution/features/web20/src/main/release/README b/branches/sca-equinox/distribution/web20/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/branches/sca-equinox/distribution/features/web20/src/main/release/README
+++ b/branches/sca-equinox/distribution/web20/src/main/release/README
diff --git a/branches/sca-equinox/distribution/features/web20/src/main/release/RELEASE_NOTES b/branches/sca-equinox/distribution/web20/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/branches/sca-equinox/distribution/features/web20/src/main/release/RELEASE_NOTES
+++ b/branches/sca-equinox/distribution/web20/src/main/release/RELEASE_NOTES
diff --git a/branches/sca-equinox/distribution/features/web20/src/main/release/bin/INSTALL b/branches/sca-equinox/distribution/web20/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/branches/sca-equinox/distribution/features/web20/src/main/release/bin/INSTALL
+++ b/branches/sca-equinox/distribution/web20/src/main/release/bin/INSTALL
diff --git a/branches/sca-equinox/distribution/features/web20/src/main/release/bin/LICENSE b/branches/sca-equinox/distribution/web20/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/branches/sca-equinox/distribution/features/web20/src/main/release/bin/LICENSE
+++ b/branches/sca-equinox/distribution/web20/src/main/release/bin/LICENSE
diff --git a/branches/sca-equinox/distribution/features/web20/src/main/release/bin/NOTICE b/branches/sca-equinox/distribution/web20/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/branches/sca-equinox/distribution/features/web20/src/main/release/bin/NOTICE
+++ b/branches/sca-equinox/distribution/web20/src/main/release/bin/NOTICE
diff --git a/branches/sca-equinox/distribution/features/web20/src/main/release/src/BUILDING b/branches/sca-equinox/distribution/web20/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/branches/sca-equinox/distribution/features/web20/src/main/release/src/BUILDING
+++ b/branches/sca-equinox/distribution/web20/src/main/release/src/BUILDING
diff --git a/branches/sca-equinox/distribution/features/web20/src/main/release/src/LICENSE b/branches/sca-equinox/distribution/web20/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/branches/sca-equinox/distribution/features/web20/src/main/release/src/LICENSE
+++ b/branches/sca-equinox/distribution/web20/src/main/release/src/LICENSE
diff --git a/branches/sca-equinox/distribution/features/web20/src/main/release/src/NOTICE b/branches/sca-equinox/distribution/web20/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/branches/sca-equinox/distribution/features/web20/src/main/release/src/NOTICE
+++ b/branches/sca-equinox/distribution/web20/src/main/release/src/NOTICE
diff --git a/branches/sca-equinox/distribution/features/webservice/pom.xml b/branches/sca-equinox/distribution/webservice/pom.xml
index be9329716e..c415c01395 100644
--- a/branches/sca-equinox/distribution/features/webservice/pom.xml
+++ b/branches/sca-equinox/distribution/webservice/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-distribution-features</artifactId>
+        <artifactId>tuscany-distribution</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
diff --git a/branches/sca-equinox/distribution/features/webservice/src/main/assembly/bin.xml b/branches/sca-equinox/distribution/webservice/src/main/assembly/bin.xml
index 7413fde78f..7413fde78f 100644
--- a/branches/sca-equinox/distribution/features/webservice/src/main/assembly/bin.xml
+++ b/branches/sca-equinox/distribution/webservice/src/main/assembly/bin.xml
diff --git a/branches/sca-equinox/distribution/features/webservice/src/main/assembly/src.xml b/branches/sca-equinox/distribution/webservice/src/main/assembly/src.xml
index 0d832271b9..0d832271b9 100644
--- a/branches/sca-equinox/distribution/features/webservice/src/main/assembly/src.xml
+++ b/branches/sca-equinox/distribution/webservice/src/main/assembly/src.xml
diff --git a/branches/sca-equinox/distribution/features/webservice/src/main/components/bin-samples.xml b/branches/sca-equinox/distribution/webservice/src/main/components/bin-samples.xml
index 1bb5c20536..1bb5c20536 100644
--- a/branches/sca-equinox/distribution/features/webservice/src/main/components/bin-samples.xml
+++ b/branches/sca-equinox/distribution/webservice/src/main/components/bin-samples.xml
diff --git a/branches/sca-equinox/distribution/features/webservice/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/webservice/src/main/components/src-modules.xml
index d4c14d2d90..d4c14d2d90 100644
--- a/branches/sca-equinox/distribution/features/webservice/src/main/components/src-modules.xml
+++ b/branches/sca-equinox/distribution/webservice/src/main/components/src-modules.xml
diff --git a/branches/sca-equinox/distribution/features/webservice/src/main/release/CHANGES b/branches/sca-equinox/distribution/webservice/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/branches/sca-equinox/distribution/features/webservice/src/main/release/CHANGES
+++ b/branches/sca-equinox/distribution/webservice/src/main/release/CHANGES
diff --git a/branches/sca-equinox/distribution/features/webservice/src/main/release/DISCLAIMER b/branches/sca-equinox/distribution/webservice/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sca-equinox/distribution/features/webservice/src/main/release/DISCLAIMER
+++ b/branches/sca-equinox/distribution/webservice/src/main/release/DISCLAIMER
diff --git a/branches/sca-equinox/distribution/features/webservice/src/main/release/README b/branches/sca-equinox/distribution/webservice/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/branches/sca-equinox/distribution/features/webservice/src/main/release/README
+++ b/branches/sca-equinox/distribution/webservice/src/main/release/README
diff --git a/branches/sca-equinox/distribution/features/webservice/src/main/release/RELEASE_NOTES b/branches/sca-equinox/distribution/webservice/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/branches/sca-equinox/distribution/features/webservice/src/main/release/RELEASE_NOTES
+++ b/branches/sca-equinox/distribution/webservice/src/main/release/RELEASE_NOTES
diff --git a/branches/sca-equinox/distribution/features/webservice/src/main/release/bin/INSTALL b/branches/sca-equinox/distribution/webservice/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/branches/sca-equinox/distribution/features/webservice/src/main/release/bin/INSTALL
+++ b/branches/sca-equinox/distribution/webservice/src/main/release/bin/INSTALL
diff --git a/branches/sca-equinox/distribution/features/webservice/src/main/release/bin/LICENSE b/branches/sca-equinox/distribution/webservice/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/branches/sca-equinox/distribution/features/webservice/src/main/release/bin/LICENSE
+++ b/branches/sca-equinox/distribution/webservice/src/main/release/bin/LICENSE
diff --git a/branches/sca-equinox/distribution/features/webservice/src/main/release/bin/NOTICE b/branches/sca-equinox/distribution/webservice/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/branches/sca-equinox/distribution/features/webservice/src/main/release/bin/NOTICE
+++ b/branches/sca-equinox/distribution/webservice/src/main/release/bin/NOTICE
diff --git a/branches/sca-equinox/distribution/features/webservice/src/main/release/src/BUILDING b/branches/sca-equinox/distribution/webservice/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/branches/sca-equinox/distribution/features/webservice/src/main/release/src/BUILDING
+++ b/branches/sca-equinox/distribution/webservice/src/main/release/src/BUILDING
diff --git a/branches/sca-equinox/distribution/features/webservice/src/main/release/src/LICENSE b/branches/sca-equinox/distribution/webservice/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/branches/sca-equinox/distribution/features/webservice/src/main/release/src/LICENSE
+++ b/branches/sca-equinox/distribution/webservice/src/main/release/src/LICENSE
diff --git a/branches/sca-equinox/distribution/features/webservice/src/main/release/src/NOTICE b/branches/sca-equinox/distribution/webservice/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/branches/sca-equinox/distribution/features/webservice/src/main/release/src/NOTICE
+++ b/branches/sca-equinox/distribution/webservice/src/main/release/src/NOTICE