3 files changed, 17 insertions, 25 deletions
diff --git a/sandbox/travelsample/clients/currency-converter-ws-jaxws/build.xml b/sandbox/travelsample/clients/currency-converter-ws-jaxws/build.xml
index 8b866698ff..6d17bbd1a3 100644
--- a/sandbox/travelsample/clients/currency-converter-ws-jaxws/build.xml
+++ b/sandbox/travelsample/clients/currency-converter-ws-jaxws/build.xml
@@ -18,35 +18,27 @@
 -->
 
 <project name="scatours-client-currency-converter-ws-jaxws" default="compile">
-    <property environment="env"/> 
+    <import file="../../antdefs.xml"/>
 
-    <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 name="wsdljava">
+        <antcall target="wsimport">
+            <param name="wsdlfile" value="wsdl/CurrencyConverter.wsdl"/>
+            <param name="javaclass" value="scatours/currencyconverter/client/CurrencyConverter.class"/>
+            <param name="package" value="scatours.currencyconverter.client"/>
+        </antcall>
+    </target>
+
+    <!-- Before invoking the "run" target, the Web Services implementation of
+       the currency converter service needs to be started in its own process. -->
+    <target name="run-service">
+        <ant dir="../../launchers/currency-converter-ws" target="run"/>
     </target>
 
     <target name="run">
         <java classname="scatours.CurrencyConverterWSClient" fork="true">
             <classpath>
-                <pathelement location="target/classes"/>
-                <!--
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-                -->
+                <pathelement location="target/${ant.project.name}.jar"/>
             </classpath>
         </java>
     </target>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
 </project>
diff --git a/sandbox/travelsample/clients/currency-converter-ws-jaxws/pom.xml b/sandbox/travelsample/clients/currency-converter-ws-jaxws/pom.xml
index b79a5477b2..8880c341bd 100644
--- a/sandbox/travelsample/clients/currency-converter-ws-jaxws/pom.xml
+++ b/sandbox/travelsample/clients/currency-converter-ws-jaxws/pom.xml
@@ -79,7 +79,7 @@
                         </goals>
                         <configuration>
                             <wsdlDirectory>${basedir}/src/main/resources/wsdl</wsdlDirectory>
-                            <packageName>scatours.curencyconverter.client</packageName>
+                            <packageName>scatours.currencyconverter.client</packageName>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/sandbox/travelsample/clients/currency-converter-ws-jaxws/src/main/java/scatours/CurrencyConverterWSClient.java b/sandbox/travelsample/clients/currency-converter-ws-jaxws/src/main/java/scatours/CurrencyConverterWSClient.java
index ae0bae2a3e..dbaa7c2124 100644
--- a/sandbox/travelsample/clients/currency-converter-ws-jaxws/src/main/java/scatours/CurrencyConverterWSClient.java
+++ b/sandbox/travelsample/clients/currency-converter-ws-jaxws/src/main/java/scatours/CurrencyConverterWSClient.java
@@ -18,8 +18,8 @@
  */
 package scatours;
 
-import scatours.curencyconverter.client.CurrencyConverter;
-import scatours.curencyconverter.client.CurrencyConverterService;
+import scatours.currencyconverter.client.CurrencyConverter;
+import scatours.currencyconverter.client.CurrencyConverterService;
 
 public class CurrencyConverterWSClient {