Make the all distro depend on the "all" features rather than depending on it and some random jars. Also add in the aggregations to see how they look.

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

2 files changed, 32 insertions, 44 deletions

diff --git a/sca-java-2.x/trunk/distribution/all/pom.xml b/sca-java-2.x/trunk/distribution/all/pom.xml
index 3a846dc8b2..8b47546988 100644
--- a/sca-java-2.x/trunk/distribution/all/pom.xml
+++ b/sca-java-2.x/trunk/distribution/all/pom.xml
@@ -31,6 +31,9 @@
     <packaging>pom</packaging>
 
     <dependencies>
+
+        <!-- module jars for modules directory -->
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-all</artifactId>
@@ -38,58 +41,23 @@
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-base-runtime</artifactId>
-            <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
+        <!-- aggregation jars for lib directory -->
 
-<!-- TUSCANY-3674 - shouldn't these be in the all feature -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-node</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ejb-runtime</artifactId>
+            <groupId>org.apache.tuscany.sca.aggregation</groupId>
+            <artifactId>tuscany-base-runtime-aggregation</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-hazelcast-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>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-web-client</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-tracing-aspectj</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjweaver</artifactId>
-            <version>1.6.8</version>
-        </dependency>
 
         <dependency>
-            <groupId>org.apache.tuscany.sca.shades</groupId>
-            <artifactId>tuscany-base</artifactId>
+            <groupId>org.apache.tuscany.sca.aggregation</groupId>
+            <artifactId>tuscany-binding-rmi-runtime-aggregation</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
+
         <dependency>
-            <groupId>org.apache.tuscany.sca.shades</groupId>
-            <artifactId>tuscany-spring</artifactId>
+            <groupId>org.apache.tuscany.sca.aggregation</groupId>
+            <artifactId>tuscany-binding-ws-runtime-axis2-aggregation</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
@@ -211,7 +179,7 @@
                              <generateManifestJar>true</generateManifestJar>
                              <featuresName>features</featuresName>
                              <excludeGroupIds>
-                                 <groupId>org.apache.tuscany.sca.shades</groupId>
+                                 <groupId>org.apache.tuscany.sca.aggregation</groupId>
                              </excludeGroupIds>
                              <artifactManifests>
                                  <artifactManifest>
@@ -395,6 +363,11 @@
                                      <version>2.0-SNAPSHOT</version>
                                  </extension>
 
+                                 <extension>
+                                     <groupId>org.apache.tuscany.sca</groupId>
+                                     <artifactId>tuscany-host-jetty</artifactId>
+                                     <version>2.0-SNAPSHOT</version>
+                                 </extension>
                              </extensions>
                             <artifactManifests>
                                  <artifactManifest>
diff --git a/sca-java-2.x/trunk/distribution/all/src/main/components/bin-lib.xml b/sca-java-2.x/trunk/distribution/all/src/main/components/bin-lib.xml
index 1da6bebbe6..6860d0c968 100644
--- a/sca-java-2.x/trunk/distribution/all/src/main/components/bin-lib.xml
+++ b/sca-java-2.x/trunk/distribution/all/src/main/components/bin-lib.xml
@@ -24,6 +24,20 @@
             <useTransitiveDependencies>true</useTransitiveDependencies>

             <unpack>false</unpack>

             <includes>

+                <include>org.apache.tuscany.sca.aggregation:tuscany-base-runtime-aggregation</include>

+                <include>org.apache.tuscany.sca.aggregation:tuscany-binding-rmi-runtime-aggregation</include>

+                <include>org.apache.tuscany.sca.aggregation:tuscany-binding-ws-runtime-axis2-aggregation</include>

+                <!-- needed by some of the sample build scripts but don't think we actually need to put this here -->

+                <include>org.apache.tuscany.sca:tuscany-sca-api</include>

+            </includes>

+        </dependencySet>

+

+<!-- dependencies referring to the shade jars, disabling for the time being

+        <dependencySet>

+            <outputDirectory>lib</outputDirectory>

+            <useTransitiveDependencies>true</useTransitiveDependencies>

+            <unpack>false</unpack>

+            <includes>

                 <include>org.apache.tuscany.sca.shades:tuscany-base</include>

                 <include>org.apache.ws.commons.schema:XmlSchema</include>

                 <include>cglib:cglib</include>

@@ -42,6 +56,7 @@
                 <include>org.springframework:*</include>

             </includes>

         </dependencySet>

+-->

     </dependencySets>

     <fileSets>

 	<fileSet>