From d32e9ac7c0616caa1cb3b4ec94e0d7c21e371a0c Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 19 May 2010 22:04:51 +0000
Subject: Merge revision r945328 from 1.0 release branch

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@946446 13f79535-47bb-0310-9956-ffa450edef68
---
 .../travelsample/binaries/src/main/resources/build-clients.xml |  4 ++--
 .../binaries/src/main/resources/build-defs-selfcontained.xml   |  2 ++
 .../travelsample/binaries/src/main/resources/build-defs.xml    |  7 +++++++
 .../binaries/src/main/resources/build-launchers.xml            | 10 +++++-----
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-clients.xml b/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-clients.xml
index 98a3b2c345..a118203c8c 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-clients.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-clients.xml
@@ -46,8 +46,8 @@
         <java classname="scatours.CurrencyConverterWSClient" fork="true" failonerror="true">
             <classpath>
                 <pathelement location="scatours-client-currency-converter-ws-jaxws.jar"/>
-                <!-- The following is used to bring in additional dependencies of the JAX-WS runtime. -->
-                <path refid="scatours.tuscany-manifest"/>
+                <!-- The following is used to bring in the JAX-WS runtime and its dependencies. -->
+                <path refid="scatours.jaxws-runtime"/>
             </classpath>
         </java>
     </target>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-defs-selfcontained.xml b/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-defs-selfcontained.xml
index 759afa0987..d5b1951040 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-defs-selfcontained.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-defs-selfcontained.xml
@@ -25,6 +25,8 @@
 
     <path id="scatours.tuscany-node-launcher"/>
 
+    <path id="scatours.tuscany-openejb"/>
+
     <path id="scatours.openejb-runtime"/>
 
     <path id="scatours.jaxws-runtime"/>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-defs.xml b/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-defs.xml
index e76572a282..1fb9a327f0 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-defs.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-defs.xml
@@ -29,6 +29,13 @@
         <fileset dir="${env.TUSCANY_HOME}/modules" includes="tuscany-node-launcher-*.jar"/>
     </path>
 
+    <path id="scatours.tuscany-openejb">
+        <!-- We need the following if the jars were built using ant and have no manifest classpath -->
+        <fileset dir="../openejb"/>
+        <!-- The openejb directory doesn't include all dependencies, so bring these in from Tuscany -->
+        <fileset dir="${env.TUSCANY_HOME}/lib"/>
+    </path>
+
     <path id="scatours.openejb-runtime">
         <!-- We need the following if the jars were built using ant and have no manifest classpath -->
         <fileset dir="../openejb"/>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-launchers.xml b/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-launchers.xml
index 31e14457c7..4ceb61291f 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-launchers.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-launchers.xml
@@ -204,7 +204,7 @@
         <java classname="scatours.NotificationEJBLauncher" fork="true" failonerror="true">
             <classpath>
                 <pathelement location="scatours-launcher-notification-ejb.jar"/>
-                <path refid="scatours.tuscany-manifest"/>
+                <path refid="scatours.tuscany-openejb"/>
             </classpath>
         </java>
     </target>
@@ -275,7 +275,7 @@
     <target name="run-payment-java-callback">
         <java classname="scatours.payment.PaymentLauncher" fork="true" failonerror="true">
             <classpath>
-                <pathelement location="scatours-launcher-payment-java.jar"/>
+                <pathelement location="scatours-launcher-payment-java-callback.jar"/>
                 <path refid="scatours.tuscany-manifest"/>
             </classpath>
         </java>
@@ -284,7 +284,7 @@
     <target name="run-payment-java-policy">
         <java classname="scatours.payment.PaymentLauncher" fork="true" failonerror="true">
             <classpath>
-                <pathelement location="scatours-launcher-java-policy.jar"/>
+                <pathelement location="scatours-launcher-payment-java-policy.jar"/>
                 <path refid="scatours.tuscany-manifest"/>
             </classpath>
         </java>
@@ -293,7 +293,7 @@
     <target name="run-payment-java-reference-pass">
         <java classname="scatours.payment.PaymentLauncher" fork="true" failonerror="true">
             <classpath>
-                <pathelement location="scatours-launcher-payment-java.jar"/>
+                <pathelement location="scatours-launcher-payment-java-reference-pass.jar"/>
                 <path refid="scatours.tuscany-manifest"/>
             </classpath>
         </java>
@@ -311,7 +311,7 @@
     <target name="run-payment-spring-scatag">
         <java classname="scatours.payment.PaymentLauncher" fork="true" failonerror="true">
             <classpath>
-                <pathelement location="scatours-launcher-spring-scatag.jar"/>
+                <pathelement location="scatours-launcher-payment-spring-scatag.jar"/>
                 <path refid="scatours.tuscany-manifest"/>
             </classpath>
         </java>
-- 
cgit v1.2.3