Merge revision r944930 from 1.0 release branch

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@946413 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 11 insertions, 1 deletions

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 f914208f52..e76572a282 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,7 +29,10 @@
         <fileset dir="${env.TUSCANY_HOME}/modules" includes="tuscany-node-launcher-*.jar"/>

     </path>

 

-    <path id="scatours.tuscany-openejb">

+    <path id="scatours.openejb-runtime">

+        <!-- 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">

             <!-- exclude some jars to prevent them being loaded by OpenEJB -->

             <exclude name="tuscany-sca-manifest.jar"/>

@@ -43,4 +46,11 @@
         </fileset>

     </path>

 

+    <path id="scatours.jaxws-runtime">

+        <!-- We need the following if the jars were built using ant and have no manifest classpath -->

+        <fileset dir="../jaxws"/>

+        <!-- The jaxws directory doesn't include all dependencies, so bring these in from Tuscany -->

+        <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

+    </path>

+

 </project>