From 5035e611bbff453189e2ef3894b67f2be38c037f Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 26 Oct 2010 13:46:59 +0000
Subject: Merge r1022646 TUSCANY-3726: Include store-dojo and its runtime
 dependencies in the binary distribution

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027556 13f79535-47bb-0310-9956-ffa450edef68
---
 sca-java-1.x/trunk/samples/build.xml            | 1 +
 sca-java-1.x/trunk/samples/pom-distribution.xml | 3 +--
 sca-java-1.x/trunk/samples/pom.xml              | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

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

diff --git a/sca-java-1.x/trunk/samples/build.xml b/sca-java-1.x/trunk/samples/build.xml
index be9c338f52..dfb23f7d75 100644
--- a/sca-java-1.x/trunk/samples/build.xml
+++ b/sca-java-1.x/trunk/samples/build.xml
@@ -87,6 +87,7 @@
         <ant dir="spring-bigbank-checkaccount" target="${target}"/>
         <ant dir="spring-bigbank-stockquote" target="${target}"/>
         <ant dir="store" target="${target}"/>
+        <ant dir="store-dojo" target="${target}"/>
         <ant dir="store-secure" target="${target}"/>
         <ant dir="store-webapp" target="${target}"/>
         <ant dir="supplychain" target="${target}"/>
diff --git a/sca-java-1.x/trunk/samples/pom-distribution.xml b/sca-java-1.x/trunk/samples/pom-distribution.xml
index 2034f3a77e..12609a0d19 100644
--- a/sca-java-1.x/trunk/samples/pom-distribution.xml
+++ b/sca-java-1.x/trunk/samples/pom-distribution.xml
@@ -129,8 +129,7 @@
                 <module>simple-callback</module>
                 <module>simple-callback-ws</module>
                 <module>store</module>
-                <!-- the following is excluded from pom-distribution.xml
-                <module>store-dojo</module -->
+                <module>store-dojo</module>
                 <module>store-webapp</module>
                 <module>store-secure</module>
                 <module>supplychain</module>
diff --git a/sca-java-1.x/trunk/samples/pom.xml b/sca-java-1.x/trunk/samples/pom.xml
index 8c78ae010f..0400bd1873 100644
--- a/sca-java-1.x/trunk/samples/pom.xml
+++ b/sca-java-1.x/trunk/samples/pom.xml
@@ -129,7 +129,6 @@
                 <module>simple-callback</module>
                 <module>simple-callback-ws</module>
                 <module>store</module>
-                <!-- the following is excluded from pom-distribution.xml -->
                 <module>store-dojo</module>
                 <module>store-webapp</module>
                 <module>store-secure</module>
-- 
cgit v1.2.3