From 5af5db1b322dc75b7db907a2a85a1301b0beee47 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 26 Oct 2010 16:29:48 +0000
Subject: Merge r1023849 TUSCANY-3730: Add "ant setup" command to create
 database files needed by store tutorial

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027633 13f79535-47bb-0310-9956-ffa450edef68
---
 sca-java-1.x/trunk/tutorials/store/README          | 32 ++++++++++++++++++----
 sca-java-1.x/trunk/tutorials/store/build.xml       |  6 ++++
 .../trunk/tutorials/store/store-db/build.xml       |  3 ++
 .../trunk/tutorials/store/store-eu/build.xml       |  3 ++
 .../trunk/tutorials/store/store-supplier/build.xml |  3 ++
 5 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/sca-java-1.x/trunk/tutorials/store/README b/sca-java-1.x/trunk/tutorials/store/README
index b53d97a298..adec067cf2 100644
--- a/sca-java-1.x/trunk/tutorials/store/README
+++ b/sca-java-1.x/trunk/tutorials/store/README
@@ -2,7 +2,7 @@ Store Tutorial
 ==============
 
 This tutorial that shows how to use SCA and Tuscany to build multiple
-variations of an online Store application. The variations demostrate the
+variations of an online Store application. The variations demonstrate the
 evolution of the Store as it goes through the following stages:
 
 1 - Initial online fruit store
@@ -17,7 +17,18 @@ For diagrams of the scenarios covered here, please refer to Tutorial.pdf
 Running The Tutorial Application
 --------------------------------
 
-First start the SCA Domain Manager:
+If you're running the Store tutorial application for the first time since
+downloading the Tuscany SCA Java binary distribution, you need to start by
+running a setup step from the top-level store directory:
+
+   cd store
+   ant setup
+
+You only need to do this once. It creates some database files that are used
+by the tutorial application. If you forget to do it, you'll get errors when
+running some of the scenarios.
+
+Next, start the SCA Domain Manager:
 
    cd domain
    ant run
@@ -160,6 +171,9 @@ The store itself can be found at
 
    http://localhost:8102/ui/
 
+If you see an error at this stage, this probably means you haven't done the
+database setup mentioned in the section "Running The Tutorial Application".
+
 This looks the same as the scenario 2 store but this time a database is used
 for storing items put into the shopping cart. When you add items you 
 will see messages on the console indicating that items are added to the
@@ -315,8 +329,11 @@ Building the Store Tutorial Using Ant
 With the binary distribution the complete store tutorial can be built using Ant
 as follows:
 
-cd store
-ant compile
+   cd store
+   ant compile
+
+This also creates the database files that were mentioned in the section
+"Running The Tutorial Application".
 
 
 Building the Store Tutorial Using Maven 
@@ -324,5 +341,8 @@ Building the Store Tutorial Using Maven
 With either the binary or source distribution the complete store tutorial can
 be built using Maven as follows:
 
-cd store
-mvn
+   cd store
+   mvn
+
+This also creates the database files that were mentioned in the section
+"Running The Tutorial Application".
diff --git a/sca-java-1.x/trunk/tutorials/store/build.xml b/sca-java-1.x/trunk/tutorials/store/build.xml
index 7796d3069e..4f4ba66c8b 100644
--- a/sca-java-1.x/trunk/tutorials/store/build.xml
+++ b/sca-java-1.x/trunk/tutorials/store/build.xml
@@ -31,6 +31,12 @@
         </antcall>
     </target>
 
+    <target name="setup">
+        <ant dir="store-db" target="create-db"/>
+        <ant dir="store-eu" target="create-db"/>
+        <ant dir="store-supplier" target="create-db"/>
+    </target>
+
     <target name="allsubdirs">
         <ant dir="domain" target="${target}"/>
         <ant dir="assets" target="${target}"/>
diff --git a/sca-java-1.x/trunk/tutorials/store/store-db/build.xml b/sca-java-1.x/trunk/tutorials/store/store-db/build.xml
index 94cc0ba6ae..bbfd09febd 100644
--- a/sca-java-1.x/trunk/tutorials/store/store-db/build.xml
+++ b/sca-java-1.x/trunk/tutorials/store/store-db/build.xml
@@ -28,7 +28,10 @@
             <manifest>
             </manifest>
         </jar>
+        <antcall target="create-db"/>
+    </target>
 
+    <target name="create-db">
         <!--
            Create the example database.
         -->
diff --git a/sca-java-1.x/trunk/tutorials/store/store-eu/build.xml b/sca-java-1.x/trunk/tutorials/store/store-eu/build.xml
index deef28d3b1..a061a7587a 100644
--- a/sca-java-1.x/trunk/tutorials/store/store-eu/build.xml
+++ b/sca-java-1.x/trunk/tutorials/store/store-eu/build.xml
@@ -28,7 +28,10 @@
             <manifest>
             </manifest>
         </jar>
+        <antcall target="create-db"/>
+    </target>
 
+    <target name="create-db">
         <!--
            Create the example database.
         -->
diff --git a/sca-java-1.x/trunk/tutorials/store/store-supplier/build.xml b/sca-java-1.x/trunk/tutorials/store/store-supplier/build.xml
index 2338125e71..813486e7f8 100644
--- a/sca-java-1.x/trunk/tutorials/store/store-supplier/build.xml
+++ b/sca-java-1.x/trunk/tutorials/store/store-supplier/build.xml
@@ -28,7 +28,10 @@
             <manifest>
             </manifest>
         </jar>
+        <antcall target="create-db"/>
+    </target>
 
+    <target name="create-db">
         <!--
            Create the example database.  This database is needed by the unit test
            in ../store-test.
-- 
cgit v1.2.3