Minor cleanup of the Maven descriptors.

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

3 files changed, 5 insertions, 24 deletions

diff --git a/java/sca/distribution/features/core/src/main/assembly/bin.xml b/java/sca/distribution/features/core/src/main/assembly/bin.xml
index 76b6b87c1e..200cc91080 100644
--- a/java/sca/distribution/features/core/src/main/assembly/bin.xml
+++ b/java/sca/distribution/features/core/src/main/assembly/bin.xml
@@ -31,8 +31,8 @@
     </formats>
 
     <componentDescriptors>
-        <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
-        <componentDescriptor>../core/src/main/components/bin-dependencies.xml</componentDescriptor>
-        <componentDescriptor>../core/src/main/components/bin-samples.xml</componentDescriptor>
+        <componentDescriptor>src/main/components/bin-common.xml</componentDescriptor>
+        <componentDescriptor>src/main/components/bin-dependencies.xml</componentDescriptor>
+        <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
     </componentDescriptors>
 </assembly>
diff --git a/java/sca/distribution/features/core/src/main/assembly/src.xml b/java/sca/distribution/features/core/src/main/assembly/src.xml
index 0d2c7eab32..6fe3e2dae1 100644
--- a/java/sca/distribution/features/core/src/main/assembly/src.xml
+++ b/java/sca/distribution/features/core/src/main/assembly/src.xml
@@ -31,7 +31,7 @@
     </formats>
 
     <componentDescriptors>
-        <componentDescriptor>../core/src/main/components/src-common.xml</componentDescriptor>
-        <componentDescriptor>../core/src/main/components/src-modules.xml</componentDescriptor>
+        <componentDescriptor>src/main/components/src-common.xml</componentDescriptor>
+        <componentDescriptor>src/main/components/src-modules.xml</componentDescriptor>
     </componentDescriptors>
 </assembly>
diff --git a/java/sca/distribution/features/manager/pom.xml b/java/sca/distribution/features/manager/pom.xml
index fbe21edd6d..045f529094 100644
--- a/java/sca/distribution/features/manager/pom.xml
+++ b/java/sca/distribution/features/manager/pom.xml
@@ -38,7 +38,6 @@
             <artifactId>tuscany-distribution-core</artifactId>
             <type>pom</type>
             <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
         </dependency>
 
         <!-- Binding Models -->
@@ -46,43 +45,36 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom</artifactId>
             <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ejb</artifactId>
             <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http</artifactId>
             <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc</artifactId>
             <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rss</artifactId>
             <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-xml</artifactId>
             <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-xml</artifactId>
             <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
         </dependency>
 
         <!-- Contribution models -->
@@ -90,19 +82,16 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
             <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
             <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-resource</artifactId>
             <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
         </dependency>
 
         <!-- Domain support -->
@@ -110,13 +99,11 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
             <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-manager</artifactId>
             <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
         </dependency>
 
         <!-- Implementation Models -->
@@ -124,37 +111,31 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel</artifactId>
             <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-ejb</artifactId>
             <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-xml</artifactId>
             <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node</artifactId>
             <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource</artifactId>
             <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget</artifactId>
             <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>