Add buildingblocks* contributions and launcher to the mvn and ant builds

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

7 files changed, 57 insertions, 1 deletions

diff --git a/sandbox/travelsample/contributions/build.xml b/sandbox/travelsample/contributions/build.xml
index 12236387bf..33aedec1fc 100644
--- a/sandbox/travelsample/contributions/build.xml
+++ b/sandbox/travelsample/contributions/build.xml
@@ -39,6 +39,9 @@
 

     <target name="allsubdirs">

         <ant dir="blog-feed" target="${target}"/>

+        <ant dir="introducing-trips" target="${target}"/> <!--needed by buildingblocks-->

+        <ant dir="buildingblocks" target="${target}"/>

+        <ant dir="buildingblocks-client" target="${target}"/>

         <ant dir="calendar" target="${target}"/>

         <ant dir="common" target="${target}"/> <!--needed by car-->

         <ant dir="car" target="${target}"/>

@@ -71,7 +74,6 @@
         <ant dir="interaction-service-remote" target="${target}"/>

         <ant dir="introducing-tours" target="${target}"/> <!--needed by introducing-client-->

         <ant dir="introducing-client" target="${target}"/>

-        <ant dir="introducing-trips" target="${target}"/>

         <ant dir="notification" target="${target}"/>

         <ant dir="notification-corba" target="${target}"/>

         <ant dir="notification-ejb" target="${target}"/>

diff --git a/sandbox/travelsample/contributions/buildingblocks-client/pom.xml b/sandbox/travelsample/contributions/buildingblocks-client/pom.xml
index de4a711af0..20a5d8bce4 100644
--- a/sandbox/travelsample/contributions/buildingblocks-client/pom.xml
+++ b/sandbox/travelsample/contributions/buildingblocks-client/pom.xml
@@ -37,6 +37,20 @@
 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>scatours-contribution-buildingblocks</artifactId>

+            <version>${pom.version}</version>

+            <scope>provided</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>scatours-contribution-introducing-trips</artifactId>

+            <version>${pom.version}</version>

+            <scope>provided</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-implementation-java-runtime</artifactId>

             <version>${tuscany.version}</version>

             <scope>runtime</scope>

diff --git a/sandbox/travelsample/contributions/buildingblocks/pom.xml b/sandbox/travelsample/contributions/buildingblocks/pom.xml
index bb29e70011..32985041a7 100644
--- a/sandbox/travelsample/contributions/buildingblocks/pom.xml
+++ b/sandbox/travelsample/contributions/buildingblocks/pom.xml
@@ -44,6 +44,27 @@
 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-binding-ws-axis2</artifactId>

+            <version>${tuscany.version}</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-binding-jms-runtime</artifactId>

+            <version>${tuscany.version}</version>

+            <scope>runtime</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>scatours-contribution-introducing-trips</artifactId>

+            <version>${pom.version}</version>

+            <scope>provided</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-node-api</artifactId>

             <version>${tuscany.version}</version>

             <scope>test</scope>

diff --git a/sandbox/travelsample/contributions/pom.xml b/sandbox/travelsample/contributions/pom.xml
index 46699143fb..33a68c2550 100644
--- a/sandbox/travelsample/contributions/pom.xml
+++ b/sandbox/travelsample/contributions/pom.xml
@@ -38,6 +38,8 @@
             </activation>

             <modules>

                 <module>blog-feed</module>

+                <module>buildingblocks</module>

+                <module>buildingblocks-client</module>

                 <module>calendar</module>

                 <module>car</module>

                 <module>common</module>

diff --git a/sandbox/travelsample/distribution/pom.xml b/sandbox/travelsample/distribution/pom.xml
index cb4f8adaaf..210fc426a9 100644
--- a/sandbox/travelsample/distribution/pom.xml
+++ b/sandbox/travelsample/distribution/pom.xml
@@ -39,6 +39,16 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-contribution-buildingblocks</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-contribution-buildingblocks-client</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-contribution-calendar</artifactId>
             <version>${pom.version}</version>
         </dependency>
@@ -308,6 +318,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-launcher-buildingblocks</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-launcher-currency-converter</artifactId>
             <version>${pom.version}</version>
         </dependency>
diff --git a/sandbox/travelsample/launchers/build.xml b/sandbox/travelsample/launchers/build.xml
index a391f8e0cc..e396700052 100644
--- a/sandbox/travelsample/launchers/build.xml
+++ b/sandbox/travelsample/launchers/build.xml
@@ -39,6 +39,7 @@
 

     <target name="allsubdirs">

         <ant dir="blog-feed" target="${target}"/>

+        <ant dir="buildingblocks" target="${target}"/>

         <ant dir="currency-converter" target="${target}"/>

         <ant dir="currency-converter-corba" target="${target}"/>

         <ant dir="currency-converter-jms" target="${target}"/>

diff --git a/sandbox/travelsample/launchers/pom.xml b/sandbox/travelsample/launchers/pom.xml
index c575855690..40ad7a1696 100644
--- a/sandbox/travelsample/launchers/pom.xml
+++ b/sandbox/travelsample/launchers/pom.xml
@@ -38,6 +38,7 @@
             </activation>

             <modules>

                 <module>blog-feed</module>

+                <module>buildingblocks</module>

                 <module>currency-converter</module>

                 <module>currency-converter-corba</module>

                 <module>currency-converter-jms</module>