Add the samples implementation-java-calculator, binding-ws-calculator, host-webapp-calculator to the distribution.

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

2 files changed, 28 insertions, 8 deletions

diff --git a/java/sca/distribution/all/pom.xml b/java/sca/distribution/all/pom.xml
index c8b7b95b12..8b3c1ef7b9 100644
--- a/java/sca/distribution/all/pom.xml
+++ b/java/sca/distribution/all/pom.xml
@@ -34,6 +34,13 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distribution-api</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-distribution-core</artifactId>
             <type>pom</type>
             <version>2.0-SNAPSHOT</version>
@@ -41,36 +48,43 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-ejava</artifactId>
+            <artifactId>tuscany-distribution-webapp</artifactId>
             <type>pom</type>
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
-<!--
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-manager</artifactId>
+            <artifactId>tuscany-distribution-webservice</artifactId>
             <type>pom</type>
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-process</artifactId>
+            <artifactId>tuscany-distribution-ejava</artifactId>
             <type>pom</type>
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
+        <!--
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-web20</artifactId>
+            <artifactId>tuscany-distribution-manager</artifactId>
             <type>pom</type>
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-webservice</artifactId>
+            <artifactId>tuscany-distribution-process</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distribution-web20</artifactId>
             <type>pom</type>
             <version>2.0-SNAPSHOT</version>
         </dependency>
@@ -98,7 +112,8 @@
             <artifactId>tuscany-tracing-aspectj</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
--->
+        -->
+
     </dependencies>
 
     <profiles>
@@ -106,6 +121,9 @@
         <!-- Build profile that can be used to build the distro packages -->
         <profile>
             <id>distribution</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <build>
                 <plugins>
                     <plugin>
@@ -120,6 +138,7 @@
                                 </goals>
                                 <configuration>
                                     <targetDirectory>target/modules</targetDirectory>
+                                    <generateManifestJar>true</generateManifestJar>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/java/sca/distribution/all/src/main/assembly/bin.xml b/java/sca/distribution/all/src/main/assembly/bin.xml
index 50013c05ca..5db4ba65a5 100644
--- a/java/sca/distribution/all/src/main/assembly/bin.xml
+++ b/java/sca/distribution/all/src/main/assembly/bin.xml
@@ -33,11 +33,12 @@
         <componentDescriptor>../core/src/main/components/bin-modules.xml</componentDescriptor>

         <componentDescriptor>../core/src/main/components/bin-samples.xml</componentDescriptor>

         <componentDescriptor>../ejava/src/main/components/bin-samples.xml</componentDescriptor>

+        <componentDescriptor>../host-webapp/src/main/components/bin-samples.xml</componentDescriptor>

+        <componentDescriptor>../webservice/src/main/components/bin-samples.xml</componentDescriptor>

 <!--

         <componentDescriptor>../manager/src/main/components/bin-samples.xml</componentDescriptor>

         <componentDescriptor>../process/src/main/components/bin-samples.xml</componentDescriptor>

         <componentDescriptor>../web20/src/main/components/bin-samples.xml</componentDescriptor>

-        <componentDescriptor>../webservice/src/main/components/bin-samples.xml</componentDescriptor>

 -->

     </componentDescriptors>

 </assembly>