From 1a782a0069143286e9e386c628cd4e58c3b51e46 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 2 Jan 2010 09:24:41 +0000
Subject: Add/fix ant scripts for contents of travel sample services and
 launchers directories (TUSCANY-3398)

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@895152 13f79535-47bb-0310-9956-ffa450edef68
---
 sandbox/travelsample/launchers/blog-feed/build.xml | 27 +++------
 sandbox/travelsample/launchers/build.xml           | 67 ++++++++++++++++++++++
 sandbox/travelsample/launchers/common/build.xml    | 22 +++++++
 .../launchers/currency-converter-corba/build.xml   | 38 ++++++------
 .../launchers/currency-converter-jms/build.xml     | 34 ++++-------
 .../launchers/currency-converter-rmi/build.xml     | 27 +++------
 .../launchers/currency-converter-ws/build.xml      | 27 +++------
 .../launchers/currency-converter/build.xml         | 27 +++------
 .../travelsample/launchers/databinding/build.xml   | 27 +++------
 .../travelsample/launchers/feed-logger/build.xml   | 27 +++------
 .../launchers/fullapp-domain/build.xml             | 33 ++++++++---
 .../main/java/scatours/FullAppDomainLauncher.java  |  1 +
 .../travelsample/launchers/fullapp-nodes/build.xml | 30 ++--------
 sandbox/travelsample/launchers/fullapp/build.xml   | 35 +++--------
 .../travelsample/launchers/help-pages/build.xml    | 27 +++------
 .../travelsample/launchers/interaction/build.xml   | 27 +++------
 .../launchers/introducing-client/build.xml         | 23 +-------
 .../launchers/introducing-domain/build.xml         | 13 ++---
 .../launchers/introducing-tours/build.xml          |  5 +-
 .../launchers/introducing-trips/build.xml          |  5 +-
 .../travelsample/launchers/introducing/build.xml   | 27 +++------
 sandbox/travelsample/launchers/jumpstart/build.xml | 32 +++--------
 .../launchers/notification-corba/build.xml         | 47 +++++++--------
 .../launchers/notification-ejb/build.xml           | 30 ++++------
 .../launchers/notification-jms/build.xml           | 40 +++++--------
 .../src/main/java/scatours/JMSBrokerLauncher.java  | 38 ------------
 .../launchers/notification-rmi/build.xml           | 29 ++++------
 .../com/tuscanyscatours/smsgateway/SMSGateway.java | 30 ++++++++++
 .../launchers/notification-ws/build.xml            | 27 +++------
 sandbox/travelsample/launchers/policy/build.xml    | 27 +++------
 sandbox/travelsample/launchers/pom.xml             |  2 +-
 31 files changed, 342 insertions(+), 509 deletions(-)
 create mode 100644 sandbox/travelsample/launchers/build.xml
 create mode 100644 sandbox/travelsample/launchers/common/build.xml
 delete mode 100644 sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/JMSBrokerLauncher.java
 create mode 100644 sandbox/travelsample/launchers/notification-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java

(limited to 'sandbox/travelsample/launchers')

diff --git a/sandbox/travelsample/launchers/blog-feed/build.xml b/sandbox/travelsample/launchers/blog-feed/build.xml
index d243ed2dba..fff8bc212f 100644
--- a/sandbox/travelsample/launchers/blog-feed/build.xml
+++ b/sandbox/travelsample/launchers/blog-feed/build.xml
@@ -18,31 +18,18 @@
 -->
 
 <project name="scatours-launcher-blog-feed" default="compile">
-    <property environment="env"/> 
-
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src/main/java"/>
-            <classpath>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>
-    </target>
+    <import file="../../antdefs.xml"/>
+    <path id="compile-path">
+        <pathelement path="../common/target/scatours-launcher-common.jar"/>
+    </path>
+    <path id="package-path" refid="compile-path"/>
 
     <target name="run">
         <java classname="scatours.BlogFeedLauncher" fork="true">
             <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+                <pathelement location="target/${ant.project.name}.jar"/>
+                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </java>
     </target>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
 </project>
diff --git a/sandbox/travelsample/launchers/build.xml b/sandbox/travelsample/launchers/build.xml
new file mode 100644
index 0000000000..b080b2c473
--- /dev/null
+++ b/sandbox/travelsample/launchers/build.xml
@@ -0,0 +1,67 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+
+<project name="scatours-launchers" default="compile">
+
+    <target name="compile">
+        <antcall target="allsubdirs">
+            <param name="target" value="compile"/>
+        </antcall>
+    </target>
+
+    <target name="test">
+        <antcall target="allsubdirs">
+            <param name="target" value="test"/>
+        </antcall>
+    </target>
+
+    <target name="clean">
+        <antcall target="allsubdirs">
+            <param name="target" value="clean"/>
+        </antcall>
+    </target>
+
+    <target name="allsubdirs">
+        <ant dir="common" target="${target}"/> <!--needed by blog-feed-->
+        <ant dir="blog-feed" target="${target}"/>
+        <ant dir="currency-converter" target="${target}"/>
+        <ant dir="currency-converter-corba" target="${target}"/>
+        <ant dir="currency-converter-jms" target="${target}"/>
+        <ant dir="currency-converter-rmi" target="${target}"/>
+        <ant dir="currency-converter-ws" target="${target}"/>
+        <ant dir="databinding" target="${target}"/>
+        <ant dir="feed-logger" target="${target}"/>
+        <ant dir="fullapp" target="${target}"/>
+        <ant dir="fullapp-domain" target="${target}"/>
+        <ant dir="fullapp-nodes" target="${target}"/>
+        <ant dir="help-pages" target="${target}"/>
+        <ant dir="interaction" target="${target}"/>
+        <ant dir="introducing" target="${target}"/>
+        <ant dir="introducing-client" target="${target}"/>
+        <ant dir="introducing-domain" target="${target}"/>
+        <ant dir="jumpstart" target="${target}"/>
+        <ant dir="notification-corba" target="${target}"/>
+        <ant dir="notification-ejb" target="${target}"/>
+        <ant dir="notification-jms" target="${target}"/>
+        <ant dir="notification-rmi" target="${target}"/>
+        <ant dir="notification-ws" target="${target}"/>
+        <ant dir="policy" target="${target}"/>
+    </target>
+
+</project>
diff --git a/sandbox/travelsample/launchers/common/build.xml b/sandbox/travelsample/launchers/common/build.xml
new file mode 100644
index 0000000000..c56323c786
--- /dev/null
+++ b/sandbox/travelsample/launchers/common/build.xml
@@ -0,0 +1,22 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+
+<project name="scatours-launcher-common" default="compile">
+    <import file="../../antdefs.xml"/>
+</project>
diff --git a/sandbox/travelsample/launchers/currency-converter-corba/build.xml b/sandbox/travelsample/launchers/currency-converter-corba/build.xml
index 1dca0a680d..36012e293a 100644
--- a/sandbox/travelsample/launchers/currency-converter-corba/build.xml
+++ b/sandbox/travelsample/launchers/currency-converter-corba/build.xml
@@ -18,33 +18,27 @@
 -->
 
 <project name="scatours-launcher-currency-converter-corba" default="compile">
-    <property environment="env"/> 
-
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src/main/java"/>
-            <classpath>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>
-    </target>
+    <import file="../../antdefs.xml"/>
+    <path id="compile-path">
+        <pathelement path="../common/target/scatours-launcher-common.jar"/>
+    </path>
+    <path id="package-path" refid="compile-path"/>
 
+    <!-- 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
+       added to the classpath explicitly.  For some reason these jars aren't
+       part of the Tuscany binary distribution so you'll need to download
+       them from the maven repository http://repo1.maven.org/maven2 and set
+       the TUSCANY_HOST_CORBA environment variable to the name of your local
+       download directory. -->
     <target name="run">
         <java classname="scatours.CurrencyConverterCORBALauncher" fork="true">
             <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="${env.TUSCANY_HOST_CORBA}/tuscany-host-corba-jse-tns.jar"/>
-                <pathelement location="${env.TUSCANY_HOST_CORBA}/tuscany-host-corba-jse.jar"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+                <pathelement location="target/${ant.project.name}.jar"/>
+                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+                <fileset dir="${env.TUSCANY_HOST_CORBA}"/>
             </classpath>
         </java>
     </target>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
 </project>
diff --git a/sandbox/travelsample/launchers/currency-converter-jms/build.xml b/sandbox/travelsample/launchers/currency-converter-jms/build.xml
index d5db4633a3..264e028dd1 100644
--- a/sandbox/travelsample/launchers/currency-converter-jms/build.xml
+++ b/sandbox/travelsample/launchers/currency-converter-jms/build.xml
@@ -18,23 +18,20 @@
 -->
 
 <project name="scatours-launcher-currency-converter-jms" default="compile">
-    <property environment="env"/> 
-
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src/main/java"/>
-            <classpath>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>
-    </target>
+    <import file="../../antdefs.xml"/>
+    <path id="compile-path">
+        <pathelement path="../common/target/scatours-launcher-common.jar"/>
+    </path>
+    <path id="package-path" refid="compile-path"/>
 
+    <!-- Before invoking the "run" target, the JMS broker needs to be
+         started and running in a different process. -->
     <target name="run-broker">
         <java classname="scatours.JMSBrokerLauncher" fork="true">
             <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+                <pathelement location="target/${ant.project.name}.jar"/>
+                <!-- The following is used to bring in the ActiveMQ runtime. -->
+                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </java>
     </target>
@@ -42,16 +39,9 @@
     <target name="run">
         <java classname="scatours.CurrencyConverterJMSLauncher" fork="true">
             <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+                <pathelement location="target/${ant.project.name}.jar"/>
+                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </java>
     </target>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
 </project>
diff --git a/sandbox/travelsample/launchers/currency-converter-rmi/build.xml b/sandbox/travelsample/launchers/currency-converter-rmi/build.xml
index 1d2fc52a26..814ed9a053 100644
--- a/sandbox/travelsample/launchers/currency-converter-rmi/build.xml
+++ b/sandbox/travelsample/launchers/currency-converter-rmi/build.xml
@@ -18,31 +18,18 @@
 -->
 
 <project name="scatours-launcher-currency-converter-rmi" default="compile">
-    <property environment="env"/> 
-
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src/main/java"/>
-            <classpath>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>
-    </target>
+    <import file="../../antdefs.xml"/>
+    <path id="compile-path">
+        <pathelement path="../common/target/scatours-launcher-common.jar"/>
+    </path>
+    <path id="package-path" refid="compile-path"/>
 
     <target name="run">
         <java classname="scatours.CurrencyConverterRMILauncher" fork="true">
             <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+                <pathelement location="target/${ant.project.name}.jar"/>
+                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </java>
     </target>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
 </project>
diff --git a/sandbox/travelsample/launchers/currency-converter-ws/build.xml b/sandbox/travelsample/launchers/currency-converter-ws/build.xml
index 2fc1b8caf5..f4b21d0b55 100644
--- a/sandbox/travelsample/launchers/currency-converter-ws/build.xml
+++ b/sandbox/travelsample/launchers/currency-converter-ws/build.xml
@@ -18,31 +18,18 @@
 -->
 
 <project name="scatours-launcher-currency-converter-ws" default="compile">
-    <property environment="env"/> 
-
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src/main/java"/>
-            <classpath>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>
-    </target>
+    <import file="../../antdefs.xml"/>
+    <path id="compile-path">
+        <pathelement path="../common/target/scatours-launcher-common.jar"/>
+    </path>
+    <path id="package-path" refid="compile-path"/>
 
     <target name="run">
         <java classname="scatours.CurrencyConverterWSLauncher" fork="true">
             <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+                <pathelement location="target/${ant.project.name}.jar"/>
+                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </java>
     </target>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
 </project>
diff --git a/sandbox/travelsample/launchers/currency-converter/build.xml b/sandbox/travelsample/launchers/currency-converter/build.xml
index 7f1e5646d5..6b0f17f2db 100644
--- a/sandbox/travelsample/launchers/currency-converter/build.xml
+++ b/sandbox/travelsample/launchers/currency-converter/build.xml
@@ -18,31 +18,18 @@
 -->
 
 <project name="scatours-launcher-currency-converter" default="compile">
-    <property environment="env"/> 
-
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src/main/java"/>
-            <classpath>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>
-    </target>
+    <import file="../../antdefs.xml"/>
+    <path id="compile-path">
+        <pathelement path="../common/target/scatours-launcher-common.jar"/>
+    </path>
+    <path id="package-path" refid="compile-path"/>
 
     <target name="run">
         <java classname="scatours.CurrencyConverterLauncher" fork="true">
             <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+                <pathelement location="target/${ant.project.name}.jar"/>
+                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </java>
     </target>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
 </project>
diff --git a/sandbox/travelsample/launchers/databinding/build.xml b/sandbox/travelsample/launchers/databinding/build.xml
index 5c1e4a1eea..3d80a6ca68 100644
--- a/sandbox/travelsample/launchers/databinding/build.xml
+++ b/sandbox/travelsample/launchers/databinding/build.xml
@@ -18,31 +18,18 @@
 -->
 
 <project name="scatours-launcher-databinding" default="compile">
-    <property environment="env"/> 
-
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src/main/java"/>
-            <classpath>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>
-    </target>
+    <import file="../../antdefs.xml"/>
+    <path id="compile-path">
+        <pathelement path="../common/target/scatours-launcher-common.jar"/>
+    </path>
+    <path id="package-path" refid="compile-path"/>
 
     <target name="run">
         <java classname="scatours.DatabindingLauncher" fork="true">
             <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+                <pathelement location="target/${ant.project.name}.jar"/>
+                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </java>
     </target>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
 </project>
diff --git a/sandbox/travelsample/launchers/feed-logger/build.xml b/sandbox/travelsample/launchers/feed-logger/build.xml
index e772c2f67a..e6bca9c15d 100644
--- a/sandbox/travelsample/launchers/feed-logger/build.xml
+++ b/sandbox/travelsample/launchers/feed-logger/build.xml
@@ -18,31 +18,18 @@
 -->
 
 <project name="scatours-launcher-feed-logger" default="compile">
-    <property environment="env"/> 
-
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src/main/java"/>
-            <classpath>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>
-    </target>
+    <import file="../../antdefs.xml"/>
+    <path id="compile-path">
+        <pathelement path="../common/target/scatours-launcher-common.jar"/>
+    </path>
+    <path id="package-path" refid="compile-path"/>
 
     <target name="run">
         <java classname="scatours.FeedLoggerLauncher" fork="true">
             <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+                <pathelement location="target/${ant.project.name}.jar"/>
+                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </java>
     </target>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
 </project>
diff --git a/sandbox/travelsample/launchers/fullapp-domain/build.xml b/sandbox/travelsample/launchers/fullapp-domain/build.xml
index 92957b88ab..1befc6413f 100644
--- a/sandbox/travelsample/launchers/fullapp-domain/build.xml
+++ b/sandbox/travelsample/launchers/fullapp-domain/build.xml
@@ -18,20 +18,37 @@
 -->
 
 <project name="scatours-launcher-fullapp-domain" default="run">
-    <property environment="env"/> 
+    <import file="../../antdefs.xml"/>
 
+    <!-- In Tuscany 1.5.1 the command-line launcher for the domain manager
+       is hard wired to use the current directory for the domain configuration,
+       so we use a custom launcher to override this setting using the domain
+       manager API.  Note that the classpath only includes the node launcher
+       jar which will bootstrap the rest of the Tuscany runtime. -->
     <target name="run">
-        <java classname="org.apache.tuscany.sca.node.launcher.DomainManagerLauncher"
-              dir="." fork="true">
+        <java classname="scatours.FullAppDomainLauncher" fork="true">
             <classpath>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+                <pathelement location="target/${ant.project.name}.jar"/>
+                <fileset dir="${env.TUSCANY_HOME}/modules">
+                    <include name="tuscany-node-launcher-*.jar"/>
+                </fileset>
             </classpath>
-        	<arg value="./target/classes"/>
         </java>
     </target>
 
-    <target name="clean">
-        <delete dir="./target"/>
+    <!-- The "run-command" target runs the DomainManagerLauncher class
+       directly (as if it had been invoked from a command line) and passes
+       in the domain configuration directory as a command-line argument.
+       This only works for Tuscany versions greater than 1.5.1. -->
+    <target name="run-command">
+        <java classname="org.apache.tuscany.sca.node.launcher.DomainManagerLauncher"
+              dir="." fork="true">
+            <classpath>
+                <fileset dir="${env.TUSCANY_HOME}/modules">
+                    <include name="tuscany-node-launcher-*.jar"/>
+                </fileset>
+            </classpath>
+        	<arg value=".\target\classes"/>
+        </java>
     </target>
-
 </project>
diff --git a/sandbox/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainLauncher.java b/sandbox/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainLauncher.java
index 8dfbc947c8..21b0ae4cb3 100644
--- a/sandbox/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainLauncher.java
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainLauncher.java
@@ -39,5 +39,6 @@ public class FullAppDomainLauncher {
         } catch (IOException e) {
         }
 
+        dm.getClass().getMethod("stop").invoke(dm);
     }
 }
diff --git a/sandbox/travelsample/launchers/fullapp-nodes/build.xml b/sandbox/travelsample/launchers/fullapp-nodes/build.xml
index c34d22faad..14a483b564 100644
--- a/sandbox/travelsample/launchers/fullapp-nodes/build.xml
+++ b/sandbox/travelsample/launchers/fullapp-nodes/build.xml
@@ -17,37 +17,15 @@
  * under the License.
 -->
 
-<project name="scatours-launcher-fullapp-nodes" default="run">
-    <property environment="env"/> 
-
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src\main\java"/>
-            <classpath>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>
-        <jar destfile="target/scatours-launcher-fullapp-nodes.jar" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="scatours.FullAppNodesLauncher"/>
-            </manifest>
-        </jar>
-    </target>
+<project name="scatours-launcher-fullapp-nodes" default="compile">
+    <import file="../../antdefs.xml"/>
 
     <target name="run">
         <java classname="scatours.FullAppNodesLauncher" fork="true">
             <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+                <pathelement location="target/${ant.project.name}.jar"/>
+                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </java>
     </target>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
 </project>
diff --git a/sandbox/travelsample/launchers/fullapp/build.xml b/sandbox/travelsample/launchers/fullapp/build.xml
index 8061df32e3..d6e7e18dbb 100644
--- a/sandbox/travelsample/launchers/fullapp/build.xml
+++ b/sandbox/travelsample/launchers/fullapp/build.xml
@@ -18,39 +18,18 @@
 -->
 
 <project name="scatours-launcher-fullapp" default="compile">
-    <property environment="env"/> 
-
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src\main\java"/>
-            <classpath>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>
-        <copy todir="target/classes">
-            <fileset dir="src\main\resources"/>
-        </copy>
-        <jar destfile="target/scatours-launcher-fullapp.jar" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="scatours.FullAppLauncher"/>
-            </manifest>
-        </jar>
-    </target>
+    <import file="../../antdefs.xml"/>
+    <path id="compile-path">
+        <pathelement path="../common/target/scatours-launcher-common.jar"/>
+    </path>
+    <path id="package-path" refid="compile-path"/>
 
     <target name="run">
         <java classname="scatours.FullAppLauncher" fork="true">
             <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+                <pathelement location="target/${ant.project.name}.jar"/>
+                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </java>
     </target>
-	
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
 </project>
diff --git a/sandbox/travelsample/launchers/help-pages/build.xml b/sandbox/travelsample/launchers/help-pages/build.xml
index 2bbb462dca..3f83d64e22 100644
--- a/sandbox/travelsample/launchers/help-pages/build.xml
+++ b/sandbox/travelsample/launchers/help-pages/build.xml
@@ -18,31 +18,18 @@
 -->
 
 <project name="scatours-launcher-help-pages" default="compile">
-    <property environment="env"/> 
-
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src/main/java"/>
-            <classpath>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>
-    </target>
+    <import file="../../antdefs.xml"/>
+    <path id="compile-path">
+        <pathelement path="../common/target/scatours-launcher-common.jar"/>
+    </path>
+    <path id="package-path" refid="compile-path"/>
 
     <target name="run">
         <java classname="scatours.HelpPagesLauncher" fork="true">
             <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+                <pathelement location="target/${ant.project.name}.jar"/>
+                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </java>
     </target>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
 </project>
diff --git a/sandbox/travelsample/launchers/interaction/build.xml b/sandbox/travelsample/launchers/interaction/build.xml
index 5a9591b712..e00596f636 100644
--- a/sandbox/travelsample/launchers/interaction/build.xml
+++ b/sandbox/travelsample/launchers/interaction/build.xml
@@ -18,31 +18,18 @@
 -->
 
 <project name="scatours-launcher-interaction" default="compile">
-    <property environment="env"/> 
-
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src/main/java"/>
-            <classpath>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>
-    </target>
+    <import file="../../antdefs.xml"/>
+    <path id="compile-path">
+        <pathelement path="../common/target/scatours-launcher-common.jar"/>
+    </path>
+    <path id="package-path" refid="compile-path"/>
 
     <target name="run">
         <java classname="scatours.InteractionLauncher" fork="true">
             <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+                <pathelement location="target/${ant.project.name}.jar"/>
+                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </java>
     </target>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
 </project>
diff --git a/sandbox/travelsample/launchers/introducing-client/build.xml b/sandbox/travelsample/launchers/introducing-client/build.xml
index 51444507a8..4cd4a902f8 100644
--- a/sandbox/travelsample/launchers/introducing-client/build.xml
+++ b/sandbox/travelsample/launchers/introducing-client/build.xml
@@ -18,31 +18,14 @@
 -->
 
 <project name="scatours-launcher-introducing-client" default="compile">
-    <property environment="env"/> 
-
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src/main/java"/>
-            <classpath>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>
-    </target>
+    <import file="../../antdefs.xml"/>
 
     <target name="run">
         <java classname="scatours.IntroducingClientLauncher" fork="true">
             <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+                <pathelement location="target/${ant.project.name}.jar"/>
+                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </java>
     </target>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
 </project>
diff --git a/sandbox/travelsample/launchers/introducing-domain/build.xml b/sandbox/travelsample/launchers/introducing-domain/build.xml
index 55334cf658..67d5fab24c 100644
--- a/sandbox/travelsample/launchers/introducing-domain/build.xml
+++ b/sandbox/travelsample/launchers/introducing-domain/build.xml
@@ -18,19 +18,16 @@
 -->
 
 <project name="scatours-launcher-introducing-domain" default="run">
-    <property environment="env"/> 
+    <import file="../../antdefs.xml"/>
 
-    <target name="run">
+    <target name="run" depends="compile">
         <java classname="org.apache.tuscany.sca.node.launcher.DomainManagerLauncher"
               dir="target/classes" fork="true">
             <classpath>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+                <fileset dir="${env.TUSCANY_HOME}/modules">
+                    <include name="tuscany-node-launcher-*.jar"/>
+                </fileset>
             </classpath>
         </java>
     </target>
-
-    <target name="clean">
-        <delete dir="./target"/>
-    </target>
-
 </project>
diff --git a/sandbox/travelsample/launchers/introducing-tours/build.xml b/sandbox/travelsample/launchers/introducing-tours/build.xml
index 2a2d774177..12482cf7b8 100644
--- a/sandbox/travelsample/launchers/introducing-tours/build.xml
+++ b/sandbox/travelsample/launchers/introducing-tours/build.xml
@@ -24,9 +24,10 @@
         <java classname="org.apache.tuscany.sca.node.launcher.NodeLauncher" fork="true">
             <arg value="http://localhost:9990/node-config/ToursNode"/>
             <classpath>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+                <fileset dir="${env.TUSCANY_HOME}/modules">
+                    <include name="tuscany-node-launcher-*.jar"/>
+                </fileset>
             </classpath>
         </java>
     </target>
-
 </project>
diff --git a/sandbox/travelsample/launchers/introducing-trips/build.xml b/sandbox/travelsample/launchers/introducing-trips/build.xml
index d0a9623966..463831c948 100644
--- a/sandbox/travelsample/launchers/introducing-trips/build.xml
+++ b/sandbox/travelsample/launchers/introducing-trips/build.xml
@@ -24,9 +24,10 @@
         <java classname="org.apache.tuscany.sca.node.launcher.NodeLauncher" fork="true">
             <arg value="http://localhost:9990/node-config/TripsNode"/>
             <classpath>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+                <fileset dir="${env.TUSCANY_HOME}/modules">
+                    <include name="tuscany-node-launcher-*.jar"/>
+                </fileset>
             </classpath>
         </java>
     </target>
-
 </project>
diff --git a/sandbox/travelsample/launchers/introducing/build.xml b/sandbox/travelsample/launchers/introducing/build.xml
index 7cf57f6217..3e3e839610 100644
--- a/sandbox/travelsample/launchers/introducing/build.xml
+++ b/sandbox/travelsample/launchers/introducing/build.xml
@@ -18,31 +18,18 @@
 -->
 
 <project name="scatours-launcher-introducing" default="compile">
-    <property environment="env"/> 
-
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src/main/java"/>
-            <classpath>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>
-    </target>
+    <import file="../../antdefs.xml"/>
+    <path id="compile-path">
+        <pathelement path="../common/target/scatours-launcher-common.jar"/>
+    </path>
+    <path id="package-path" refid="compile-path"/>
 
     <target name="run">
         <java classname="scatours.IntroducingLauncher" fork="true">
             <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+                <pathelement location="target/${ant.project.name}.jar"/>
+                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </java>
     </target>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
 </project>
diff --git a/sandbox/travelsample/launchers/jumpstart/build.xml b/sandbox/travelsample/launchers/jumpstart/build.xml
index 36de2730b2..fdfc12c92d 100644
--- a/sandbox/travelsample/launchers/jumpstart/build.xml
+++ b/sandbox/travelsample/launchers/jumpstart/build.xml
@@ -18,36 +18,18 @@
 -->
 
 <project name="scatours-launcher-jumpstart" default="compile">
-    <property environment="env"/> 
-
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src/main/java"/>
-            <classpath>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>
-        <jar destfile="target/scatours-launcher-jumpstart.jar" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="scatours.JumpstartLauncher"/>
-            </manifest>
-        </jar>
-    </target>
+    <import file="../../antdefs.xml"/>
+    <path id="compile-path">
+        <pathelement path="../common/target/scatours-launcher-common.jar"/>
+    </path>
+    <path id="package-path" refid="compile-path"/>
 
     <target name="run">
         <java classname="scatours.JumpstartLauncher" fork="true">
             <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+                <pathelement location="target/${ant.project.name}.jar"/>
+                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </java>
     </target>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
 </project>
diff --git a/sandbox/travelsample/launchers/notification-corba/build.xml b/sandbox/travelsample/launchers/notification-corba/build.xml
index b931f708d1..152918616a 100644
--- a/sandbox/travelsample/launchers/notification-corba/build.xml
+++ b/sandbox/travelsample/launchers/notification-corba/build.xml
@@ -18,39 +18,36 @@
 -->
 
 <project name="scatours-launcher-notification-corba" default="compile">
-    <property environment="env"/> 
-
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src/main/java"/>
-            <classpath>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>
-    </target>
+    <import file="../../antdefs.xml"/>
+    <path id="compile-path">
+        <pathelement path="../common/target/scatours-launcher-common.jar"/>
+    </path>
+    <path id="package-path" refid="compile-path"/>
 
+    <!-- Before invoking the "run" target, both the CORBA nameserver and
+       the CORBA SMS Gateway service need to be started and running in
+       different processes. -->
     <target name="run-nameserver">
-        <exec executable="${env.JAVA_HOME}/bin/tnameserv">
-            <arg value="-ORBInitialPort"/>
-            <arg value="5080"/>
-        </exec>
+        <ant dir="../../services/smsgateway-corba" target="run-nameserver"/>
+    </target>
+    <target name="run-smsgateway">
+        <ant dir="../../services/smsgateway-corba" target="run"/>
     </target>
 
+    <!-- When running this sample, the tuscany-host-corba-jse jar needs to be
+       present on the classpath.  This isn't included in tuscany-sca-manifest
+       so it needs to be added to the classpath  explicitly.  For some reason
+       this jar isn't part of the Tuscany binary distribution so you'll need
+       to download it from the maven repository http://repo1.maven.org/maven2
+       and set the TUSCANY_HOST_CORBA environment variable to the name of
+       your local download directory. -->
     <target name="run">
         <java classname="scatours.NotificationCORBALauncher" fork="true">
             <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="${env.TUSCANY_HOST_CORBA}/tuscany-host-corba-jse.jar"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+                <pathelement location="target/${ant.project.name}.jar"/>
+                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+                <fileset dir="${env.TUSCANY_HOST_CORBA}"/>
             </classpath>
         </java>
     </target>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
 </project>
diff --git a/sandbox/travelsample/launchers/notification-ejb/build.xml b/sandbox/travelsample/launchers/notification-ejb/build.xml
index 27d9ab92cd..cc7e8466d8 100644
--- a/sandbox/travelsample/launchers/notification-ejb/build.xml
+++ b/sandbox/travelsample/launchers/notification-ejb/build.xml
@@ -18,31 +18,25 @@
 -->
 
 <project name="scatours-launcher-notification-ejb" default="compile">
-    <property environment="env"/> 
+    <import file="../../antdefs.xml"/>
+    <path id="compile-path">
+        <pathelement path="../common/target/scatours-launcher-common.jar"/>
+    </path>
+    <path id="package-path" refid="compile-path"/>
 
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src/main/java"/>
-            <classpath>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>
+    <!-- Before invoking the "run" target, the EJB server for the SMS Gateway EJB
+       needs to be started and running in a different process. -->
+    <target name="run-smsgateway">
+        <ant dir="../../services/smsgateway-ejb" target="run"/>
     </target>
 
     <target name="run">
         <java classname="scatours.NotificationEJBLauncher" fork="true">
             <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+                <pathelement location="target/${ant.project.name}.jar"/>
+                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+                <fileset dir="${env.OPENEJB_HOME}/lib"/>
             </classpath>
         </java>
     </target>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
 </project>
diff --git a/sandbox/travelsample/launchers/notification-jms/build.xml b/sandbox/travelsample/launchers/notification-jms/build.xml
index 1a0130aa82..0c1c4d2063 100644
--- a/sandbox/travelsample/launchers/notification-jms/build.xml
+++ b/sandbox/travelsample/launchers/notification-jms/build.xml
@@ -18,40 +18,28 @@
 -->
 
 <project name="scatours-launcher-notification-jms" default="compile">
-    <property environment="env"/> 
-
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src/main/java"/>
-            <classpath>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>
-    </target>
+    <import file="../../antdefs.xml"/>
+    <path id="compile-path">
+        <pathelement path="../common/target/scatours-launcher-common.jar"/>
+    </path>
+    <path id="package-path" refid="compile-path"/>
 
+    <!-- Before invoking the "run" target, both the JMS broker and the
+       JMS implementation of the SMS gateway need to be started and running
+       in different processes. -->
     <target name="run-broker">
-        <java classname="scatours.JMSBrokerLauncher" fork="true">
-            <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
+        <ant dir="../../services/smsgateway-jms" target="run-broker"/>
+    </target>
+    <target name="run-smsgateway">
+        <ant dir="../../services/smsgateway-jms" target="run"/>
     </target>
 
     <target name="run">
         <java classname="scatours.NotificationJMSLauncher" fork="true">
             <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+                <pathelement location="target/${ant.project.name}.jar"/>
+                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </java>
     </target>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
 </project>
diff --git a/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/JMSBrokerLauncher.java b/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/JMSBrokerLauncher.java
deleted file mode 100644
index 929eb78431..0000000000
--- a/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/JMSBrokerLauncher.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package scatours;
-
-import org.apache.activemq.broker.BrokerService;
-
-public class JMSBrokerLauncher {
-
-    public static void main(String[] args) throws Exception {
-        final BrokerService jmsBroker = new BrokerService();
-        jmsBroker.setPersistent(false);
-        jmsBroker.setUseJmx(false);
-        jmsBroker.addConnector("tcp://localhost:61619");
-        jmsBroker.start();
-
-        System.out.println("JMS Message Broker started");
-        System.out.println("Press enter to shutdown.");
-        System.in.read();
-
-        jmsBroker.stop();
-    }
-}
diff --git a/sandbox/travelsample/launchers/notification-rmi/build.xml b/sandbox/travelsample/launchers/notification-rmi/build.xml
index 70b5b18f77..addffd998e 100644
--- a/sandbox/travelsample/launchers/notification-rmi/build.xml
+++ b/sandbox/travelsample/launchers/notification-rmi/build.xml
@@ -18,31 +18,24 @@
 -->
 
 <project name="scatours-launcher-notification-rmi" default="compile">
-    <property environment="env"/> 
+    <import file="../../antdefs.xml"/>
+    <path id="compile-path">
+        <pathelement path="../common/target/scatours-launcher-common.jar"/>
+    </path>
+    <path id="package-path" refid="compile-path"/>
 
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src/main/java"/>
-            <classpath>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>
+    <!-- Before invoking the "run" target, the RMI server for the SMS Gateway
+       remote object needs to be started and running in a different process. -->
+    <target name="run-smsgateway">
+        <ant dir="../../services/smsgateway-rmi" target="run"/>
     </target>
 
     <target name="run">
         <java classname="scatours.NotificationRMILauncher" fork="true">
             <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+                <pathelement location="target/${ant.project.name}.jar"/>
+                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </java>
     </target>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
 </project>
diff --git a/sandbox/travelsample/launchers/notification-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java b/sandbox/travelsample/launchers/notification-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java
new file mode 100644
index 0000000000..4ce528fd23
--- /dev/null
+++ b/sandbox/travelsample/launchers/notification-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package com.tuscanyscatours.smsgateway;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
+ * A gateway to send SMS messages.
+ */
+public interface SMSGateway extends Remote {
+    boolean sendSMS(String fromNumber, String toNumber, String text) throws RemoteException;
+}
diff --git a/sandbox/travelsample/launchers/notification-ws/build.xml b/sandbox/travelsample/launchers/notification-ws/build.xml
index 8be5783cb3..dff087b710 100644
--- a/sandbox/travelsample/launchers/notification-ws/build.xml
+++ b/sandbox/travelsample/launchers/notification-ws/build.xml
@@ -18,31 +18,18 @@
 -->
 
 <project name="scatours-launcher-notification-ws" default="compile">
-    <property environment="env"/> 
-
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src/main/java"/>
-            <classpath>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>
-    </target>
+    <import file="../../antdefs.xml"/>
+    <path id="compile-path">
+        <pathelement path="../common/target/scatours-launcher-common.jar"/>
+    </path>
+    <path id="package-path" refid="compile-path"/>
 
     <target name="run">
         <java classname="scatours.NotificationWSLauncher" fork="true">
             <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+                <pathelement location="target/${ant.project.name}.jar"/>
+                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </java>
     </target>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
 </project>
diff --git a/sandbox/travelsample/launchers/policy/build.xml b/sandbox/travelsample/launchers/policy/build.xml
index ec8155b871..2e670f6983 100644
--- a/sandbox/travelsample/launchers/policy/build.xml
+++ b/sandbox/travelsample/launchers/policy/build.xml
@@ -18,31 +18,18 @@
 -->
 
 <project name="scatours-launcher-policy" default="compile">
-    <property environment="env"/> 
-
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src/main/java"/>
-            <classpath>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>
-    </target>
+    <import file="../../antdefs.xml"/>
+    <path id="compile-path">
+        <pathelement path="../common/target/scatours-launcher-common.jar"/>
+    </path>
+    <path id="package-path" refid="compile-path"/>
 
     <target name="run">
         <java classname="scatours.PolicyLauncher" fork="true">
             <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+                <pathelement location="target/${ant.project.name}.jar"/>
+                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </java>
     </target>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
 </project>
diff --git a/sandbox/travelsample/launchers/pom.xml b/sandbox/travelsample/launchers/pom.xml
index a6191b4089..2e23f03b30 100644
--- a/sandbox/travelsample/launchers/pom.xml
+++ b/sandbox/travelsample/launchers/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-scatours</artifactId>
+        <artifactId>scatours</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-- 
cgit v1.2.3