From 3518e886bed82c8859fd09d5f2962d997aba3934 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 15 May 2010 15:11:47 +0000
Subject: Merge revision r937878 from trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@944660 13f79535-47bb-0310-9956-ffa450edef68
---
 .../services/smsgateway-ejb/build.xml               |  4 ++--
 .../services/smsgateway-jaxws/build.xml             | 21 +--------------------
 2 files changed, 3 insertions(+), 22 deletions(-)

(limited to 'sca-java-1.x/branches/sca-java-travelsample-1.0/services')

diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-ejb/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-ejb/build.xml
index cc7456ac52..ac75efa6ca 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-ejb/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-ejb/build.xml
@@ -23,12 +23,12 @@
     <!-- The "run" target starts an OpenEJB service endpoint for the
        SMS gateway service.  This endpoint is used by the "run" target
        of the notification-ejb launcher. -->
-    <target name="run">
+    <target name="run" depends="locate-openejb">
         <java classname="com.tuscanyscatours.smsgateway.SMSGatewayEJBServiceBootstrap"
               fork="true" failonerror="true">
             <classpath>
                 <pathelement location="target/${ant.project.name}.jar"/>
-                <fileset dir="${env.OPENEJB_HOME}/lib"/>
+                <fileset dir="${openejb-dir}"/>
             </classpath>
         </java>
     </target>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-jaxws/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-jaxws/build.xml
index 6c57e2420b..bdbf07c42f 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-jaxws/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-jaxws/build.xml
@@ -23,7 +23,7 @@
     <!-- The "run" target starts a JAX-WS service endpoint for the
        SMS gateway service.  This endpoint is used by the "run" target
        of the notification-ws launcher. -->
-    <target name="run" depends="is-jdk6, jaxws-jdk6, jaxws-jdk5">
+    <target name="run" depends="locate-jaxws">
         <java classname="com.tuscanyscatours.smsgateway.SMSGatewayServiceBootstrap" fork="true">
             <classpath>
                 <pathelement location="target/${ant.project.name}.jar"/>
@@ -31,23 +31,4 @@
             </classpath>
         </java>
     </target>
-
-    <!-- check to see if we are running on JDK 6 -->
-    <target name="is-jdk6">
-        <condition property="jdk6">
-            <available classname="javax.xml.ws.Endpoint"/>
-        </condition>
-    </target>
-
-    <!-- JDK 6 contains JAX-WS so we don't need it on the classpath -->
-    <target name="jaxws-jdk6" if="jdk6">
-        <path id="jaxws-path"/>
-    </target>
-
-    <!-- on JDK 5 we need to add the JAX-WS runtime to the classpath -->
-    <target name="jaxws-jdk5" unless="jdk6">
-        <path id="jaxws-path">
-            <fileset dir="${env.JAXWS_HOME}/lib"/>
-        </path>
-    </target>
 </project>
-- 
cgit v1.2.3