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

3 files changed, 18 insertions, 6 deletions

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 f741f28a7b..759afa0987 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"/>

 

 </project>

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>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-services.xml b/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-services.xml
index 6154f0b451..b42d081946 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-services.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-services.xml
@@ -30,8 +30,8 @@
         <java classname="com.tuscanyscatours.smsgateway.SMSGatewayEJBServiceBootstrap" fork="true" failonerror="true">

             <classpath>

                 <pathelement location="scatours-service-smsgateway-ejb.jar"/>

-                <!-- The following is used to bring in additional dependencies of the OpenEJB runtime. -->

-                <path refid="scatours.tuscany-openejb"/>

+                <!-- The following is used to bring in the OpenEJB runtime and its dependencies. -->

+                <path refid="scatours.openejb-runtime"/>

             </classpath>

         </java>

     </target>

@@ -40,8 +40,8 @@
         <java classname="com.tuscanyscatours.smsgateway.SMSGatewayServiceBootstrap" fork="true">

             <classpath>

                 <pathelement location="scatours-service-smsgateway-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>