From fd3af62c55965d85dcad55afb021071cfe2ff456 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 7 Jan 2010 03:37:52 +0000
Subject: Add launcher targets so that all scenarios can be run from a launcher
 directory

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@896749 13f79535-47bb-0310-9956-ffa450edef68
---
 sandbox/travelsample/README                        | 28 ++++++++++++----------
 .../launchers/currency-converter-corba/build.xml   |  7 ++++++
 .../launchers/currency-converter-jms/build.xml     |  9 ++++++-
 .../launchers/currency-converter-rmi/build.xml     |  7 ++++++
 .../launchers/currency-converter-ws/build.xml      |  7 ++++++
 5 files changed, 45 insertions(+), 13 deletions(-)

(limited to 'sandbox/travelsample')

diff --git a/sandbox/travelsample/README b/sandbox/travelsample/README
index 397be78486..1f42129160 100644
--- a/sandbox/travelsample/README
+++ b/sandbox/travelsample/README
@@ -141,31 +141,35 @@ Launchers: common
 
 12b) CORBA client
 
-Directory: clients/currency-converter-corba
-Command: ant run-service, ant run
+Directory: launchers/currency-converter-corba
+Commands: ant run, ant run-client
 Contributions: currency, currency-corba
-Launchers: common, currency-converter-corba
+Launchers: common
+Clients: currency-converter-corba
 
 12c) JMS client
 
-Directory: clients/currency-converter-jms
-Commands: ant run-broker, ant run-service, ant run
+Directory: launchers/currency-converter-jms
+Commands: ant run-broker, ant run, ant run-client
 Contributions: currency, currency-jms
-Launchers: common, currency-converter-jms
+Launchers: common
+Clients: currency-converter-jms
 
 12d) RMI client
 
-Directory: clients/currency-converter-rmi
-Command: ant run-service, ant run
+Directory: launchers/currency-converter-rmi
+Commands: ant run, ant run-client
 Contributions: currency, currency-rmi
-Launchers: common, currency-converter-rmi
+Launchers: common
+Clients: currency-converter-rmi
 
 12e) JAX-WS client
 
-Directory: clients/currency-converter-ws-jaxws
-Command: ant run-service, ant run
+Directory: launchers/currency-converter-ws
+Commands: ant run, ant run-client
 Contributions: currency, currency-ws
-Launchers: common, currency-converter-ws
+Launchers: common
+Clients: currency-converter-ws-jaxws
 
 13) SCA notification service interoperating with non-SCA SMS gateway service
 
diff --git a/sandbox/travelsample/launchers/currency-converter-corba/build.xml b/sandbox/travelsample/launchers/currency-converter-corba/build.xml
index c40f77c322..0e51e79bca 100644
--- a/sandbox/travelsample/launchers/currency-converter-corba/build.xml
+++ b/sandbox/travelsample/launchers/currency-converter-corba/build.xml
@@ -23,6 +23,13 @@
         <pathelement path="../common/target/scatours-launcher-common.jar"/>
     </path>
 
+    <!-- After starting the SCA CORBA service by invoking the "run" target below,
+       the CORBA Java implementation of the currency converter client should be
+       run in another process using the "run-client" target. -->
+    <target name="run-client">
+        <ant dir="../../clients/currency-converter-corba" target="run"/>
+    </target>
+
     <!-- When running this sample, the tuscany-host-corba-jse and
        tuscany-host-corba-jse-tns jars need to be present on the classpath.
        These aren't included in tuscany-sca-manifest so they need to be
diff --git a/sandbox/travelsample/launchers/currency-converter-jms/build.xml b/sandbox/travelsample/launchers/currency-converter-jms/build.xml
index ab972ea3fe..f67a8fd907 100644
--- a/sandbox/travelsample/launchers/currency-converter-jms/build.xml
+++ b/sandbox/travelsample/launchers/currency-converter-jms/build.xml
@@ -29,17 +29,24 @@
         <java classname="scatours.JMSBrokerLauncher" fork="true">
             <classpath>
                 <pathelement location="target/${ant.project.name}.jar"/>
-                <path refid="compile-path"/>
                 <!-- The following is used to bring in the ActiveMQ runtime. -->
                 <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </java>
     </target>
 
+    <!-- After starting the SCA JMS service by invoking the "run" target below,
+       the ActiveMQ JMS implementation of the currency converter client should be
+       run in another process using the "run-client" target. -->
+    <target name="run-client">
+        <ant dir="../../clients/currency-converter-jms" target="run"/>
+    </target>
+
     <target name="run">
         <java classname="scatours.CurrencyConverterJMSLauncher" fork="true">
             <classpath>
                 <pathelement location="target/${ant.project.name}.jar"/>
+                <path refid="compile-path"/>
                 <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </java>
diff --git a/sandbox/travelsample/launchers/currency-converter-rmi/build.xml b/sandbox/travelsample/launchers/currency-converter-rmi/build.xml
index 5d4fc20e8c..ff42ceac1c 100644
--- a/sandbox/travelsample/launchers/currency-converter-rmi/build.xml
+++ b/sandbox/travelsample/launchers/currency-converter-rmi/build.xml
@@ -23,6 +23,13 @@
         <pathelement path="../common/target/scatours-launcher-common.jar"/>
     </path>
 
+    <!-- After starting the SCA RMI service by invoking the "run" target below,
+       the RMI Java implementation of the currency converter client should be
+       run in another process using the "run-client" target. -->
+    <target name="run-client">
+        <ant dir="../../clients/currency-converter-rmi" target="run"/>
+    </target>
+
     <target name="run">
         <java classname="scatours.CurrencyConverterRMILauncher" fork="true">
             <classpath>
diff --git a/sandbox/travelsample/launchers/currency-converter-ws/build.xml b/sandbox/travelsample/launchers/currency-converter-ws/build.xml
index 8b45a79763..c7ffc87570 100644
--- a/sandbox/travelsample/launchers/currency-converter-ws/build.xml
+++ b/sandbox/travelsample/launchers/currency-converter-ws/build.xml
@@ -23,6 +23,13 @@
         <pathelement path="../common/target/scatours-launcher-common.jar"/>
     </path>
 
+    <!-- After starting the SCA Web service by invoking the "run" target below,
+       the JAX-WS implementation of the currency converter client should be
+       run in another process using the "run-client" target. -->
+    <target name="run-client">
+        <ant dir="../../clients/currency-converter-ws-jaxws" target="run"/>
+    </target>
+
     <target name="run">
         <java classname="scatours.CurrencyConverterWSLauncher" fork="true">
             <classpath>
-- 
cgit v1.2.3