Adjusted poms to move to trunk.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@677171 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 10 insertions, 10 deletions

diff --git a/java/sca/distribution/features/all/pom.xml b/java/sca/distribution/features/all/pom.xml
index 266fa72bb3..09982c80b7 100644
--- a/java/sca/distribution/features/all/pom.xml
+++ b/java/sca/distribution/features/all/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modular-distribution</artifactId>
+        <artifactId>tuscany-distribution-features</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
diff --git a/java/sca/distribution/features/base/pom.xml b/java/sca/distribution/features/base/pom.xml
index f9730f9956..837fc0fa6d 100644
--- a/java/sca/distribution/features/base/pom.xml
+++ b/java/sca/distribution/features/base/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modular-distribution</artifactId>
+        <artifactId>tuscany-distribution-features</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
diff --git a/java/sca/distribution/features/ejava/pom.xml b/java/sca/distribution/features/ejava/pom.xml
index b2e3afed69..bda2c93f22 100644
--- a/java/sca/distribution/features/ejava/pom.xml
+++ b/java/sca/distribution/features/ejava/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modular-distribution</artifactId>
+        <artifactId>tuscany-distribution-features</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
diff --git a/java/sca/distribution/features/manager/pom.xml b/java/sca/distribution/features/manager/pom.xml
index 337e1ead94..e62be25e22 100644
--- a/java/sca/distribution/features/manager/pom.xml
+++ b/java/sca/distribution/features/manager/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modular-distribution</artifactId>
+        <artifactId>tuscany-distribution-features</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
diff --git a/java/sca/distribution/features/pom.xml b/java/sca/distribution/features/pom.xml
index 1ad43b223f..55bb8b98a6 100644
--- a/java/sca/distribution/features/pom.xml
+++ b/java/sca/distribution/features/pom.xml
@@ -22,13 +22,13 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <relativePath>../sca/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
         <version>1.4-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.tuscany.sca</groupId>
-    <artifactId>tuscany-modular-distribution</artifactId>
+    <artifactId>tuscany-distribution-features</artifactId>
     <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Modular Distribution</name>
+    <name>Apache Tuscany SCA Distribution Features</name>
 
     <build>
         <defaultGoal>install</defaultGoal>
diff --git a/java/sca/distribution/features/process/pom.xml b/java/sca/distribution/features/process/pom.xml
index cba9bfb8c3..8bf17134f3 100644
--- a/java/sca/distribution/features/process/pom.xml
+++ b/java/sca/distribution/features/process/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modular-distribution</artifactId>
+        <artifactId>tuscany-distribution-features</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
diff --git a/java/sca/distribution/features/web20/pom.xml b/java/sca/distribution/features/web20/pom.xml
index 846e40f968..31321114e2 100644
--- a/java/sca/distribution/features/web20/pom.xml
+++ b/java/sca/distribution/features/web20/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modular-distribution</artifactId>
+        <artifactId>tuscany-distribution-features</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
diff --git a/java/sca/distribution/features/webservice/pom.xml b/java/sca/distribution/features/webservice/pom.xml
index 95aa137cd9..224a4fcc06 100644
--- a/java/sca/distribution/features/webservice/pom.xml
+++ b/java/sca/distribution/features/webservice/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modular-distribution</artifactId>
+        <artifactId>tuscany-distribution-features</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>