From 3ec191a6e470ee82ac7784efe388cc3d377a6fd4 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 30 Apr 2010 15:04:23 +0000
Subject: Add the base jar to the all distro

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@939702 13f79535-47bb-0310-9956-ffa450edef68
---
 sca-java-2.x/trunk/distribution/all/pom.xml                        | 7 +++++++
 .../trunk/distribution/all/src/main/assembly/bin-default.xml       | 1 +
 .../trunk/distribution/all/src/main/assembly/bin-distribution.xml  | 1 +
 .../trunk/distribution/all/src/main/components/bin-modules.xml     | 1 +
 4 files changed, 10 insertions(+)

(limited to 'sca-java-2.x/trunk')

diff --git a/sca-java-2.x/trunk/distribution/all/pom.xml b/sca-java-2.x/trunk/distribution/all/pom.xml
index 8ae58b3858..d93040026f 100644
--- a/sca-java-2.x/trunk/distribution/all/pom.xml
+++ b/sca-java-2.x/trunk/distribution/all/pom.xml
@@ -72,6 +72,13 @@
             <artifactId>aspectjweaver</artifactId>
             <version>1.6.8</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca.shades</groupId>
+            <artifactId>tuscany-base-nodep</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
     </dependencies>
 
     <profiles>
diff --git a/sca-java-2.x/trunk/distribution/all/src/main/assembly/bin-default.xml b/sca-java-2.x/trunk/distribution/all/src/main/assembly/bin-default.xml
index 871c483808..c946a0925a 100644
--- a/sca-java-2.x/trunk/distribution/all/src/main/assembly/bin-default.xml
+++ b/sca-java-2.x/trunk/distribution/all/src/main/assembly/bin-default.xml
@@ -28,6 +28,7 @@
 
     <componentDescriptors>
         <componentDescriptor>src/main/components/bin-common.xml</componentDescriptor>
+        <componentDescriptor>src/main/components/bin-lib.xml</componentDescriptor>
         <componentDescriptor>src/main/components/bin-modules.xml</componentDescriptor>
         <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
         <componentDescriptor>src/main/components/bin-launcher.xml</componentDescriptor>
diff --git a/sca-java-2.x/trunk/distribution/all/src/main/assembly/bin-distribution.xml b/sca-java-2.x/trunk/distribution/all/src/main/assembly/bin-distribution.xml
index 51033a5e1d..59b7c14719 100644
--- a/sca-java-2.x/trunk/distribution/all/src/main/assembly/bin-distribution.xml
+++ b/sca-java-2.x/trunk/distribution/all/src/main/assembly/bin-distribution.xml
@@ -29,6 +29,7 @@
 
     <componentDescriptors>
         <componentDescriptor>src/main/components/bin-common.xml</componentDescriptor>
+        <componentDescriptor>src/main/components/bin-lib.xml</componentDescriptor>
         <componentDescriptor>src/main/components/bin-modules.xml</componentDescriptor>
         <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
         <componentDescriptor>src/main/components/bin-launcher.xml</componentDescriptor>
diff --git a/sca-java-2.x/trunk/distribution/all/src/main/components/bin-modules.xml b/sca-java-2.x/trunk/distribution/all/src/main/components/bin-modules.xml
index b41a7e0260..aaac2a24ad 100644
--- a/sca-java-2.x/trunk/distribution/all/src/main/components/bin-modules.xml
+++ b/sca-java-2.x/trunk/distribution/all/src/main/components/bin-modules.xml
@@ -28,6 +28,7 @@
             </includes>
             <excludes>
                 <exclude>org.aspectj:aspectjweaver</exclude> 
+                <exclude>org.apache.tuscany.sca.shades:tuscany-base-nodep</exclude> 
             </excludes>
         </fileSet>
 
-- 
cgit v1.2.3