Add/fix ant scripts for contents of travel sample services and launchers directories (TUSCANY-3398)

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

1 files changed, 22 insertions, 25 deletions

diff --git a/sandbox/travelsample/launchers/notification-corba/build.xml b/sandbox/travelsample/launchers/notification-corba/build.xml
index b931f708d1..152918616a 100644
--- a/sandbox/travelsample/launchers/notification-corba/build.xml
+++ b/sandbox/travelsample/launchers/notification-corba/build.xml
@@ -18,39 +18,36 @@
 -->

 

 <project name="scatours-launcher-notification-corba" default="compile">

-    <property environment="env"/> 

-

-    <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>

+    <import file="../../antdefs.xml"/>

+    <path id="compile-path">

+        <pathelement path="../common/target/scatours-launcher-common.jar"/>

+    </path>

+    <path id="package-path" refid="compile-path"/>

 

+    <!-- Before invoking the "run" target, both the CORBA nameserver and

+       the CORBA SMS Gateway service need to be started and running in

+       different processes. -->

     <target name="run-nameserver">

-        <exec executable="${env.JAVA_HOME}/bin/tnameserv">

-            <arg value="-ORBInitialPort"/>

-            <arg value="5080"/>

-        </exec>

+        <ant dir="../../services/smsgateway-corba" target="run-nameserver"/>

+    </target>

+    <target name="run-smsgateway">

+        <ant dir="../../services/smsgateway-corba" target="run"/>

     </target>

 

+    <!-- When running this sample, the tuscany-host-corba-jse jar needs to be

+       present on the classpath.  This isn't included in tuscany-sca-manifest

+       so it needs to be added to the classpath  explicitly.  For some reason

+       this jar isn't part of the Tuscany binary distribution so you'll need

+       to download it from the maven repository http://repo1.maven.org/maven2

+       and set the TUSCANY_HOST_CORBA environment variable to the name of

+       your local download directory. -->

     <target name="run">

         <java classname="scatours.NotificationCORBALauncher" fork="true">

             <classpath>

-                <pathelement location="target/classes"/>

-                <pathelement location="${env.TUSCANY_HOST_CORBA}/tuscany-host-corba-jse.jar"/>

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

+                <pathelement location="target/${ant.project.name}.jar"/>

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

+                <fileset dir="${env.TUSCANY_HOST_CORBA}"/>

             </classpath>

         </java>

     </target>

-

-    <target name="clean">

-        <delete includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-

 </project>