Add/fix ant scripts for non-SCA clients and add additional targets described in the README scenarios

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

1 files changed, 10 insertions, 4 deletions

diff --git a/sandbox/travelsample/antdefs.xml b/sandbox/travelsample/antdefs.xml
index 00d69133ea..9d2f26db2d 100644
--- a/sandbox/travelsample/antdefs.xml
+++ b/sandbox/travelsample/antdefs.xml
@@ -29,8 +29,6 @@
      TUSCANY_HOME A directory containing the Tuscany binary distribution.

      JUNIT_JAR The location of the JUnit jar file.  The JUnit version used

        for testing these build files was JUnit 4.5.

-     TUSCANY_HOST_CORBA (only needed to run CORBA services) A directory

-       containing the Tuscany JSE CORBA host jars.

 

    This file defines the following targets that can be used on the

    ant command that invokes the build.xml file:

@@ -82,6 +80,7 @@
      "idlj" Generates Java code from a CORBA IDL file (unless the Java

        code is already up to date) by running the JDK idlj command.

        Requires the following parameters:

+       . <idljopts> the options to be used on this idlj command invocation

        . <idlfile> the filename of the IDL file

        . <javaclass> the filename of any Java class file that will be

            generated by running this target for this IDL file

@@ -185,7 +184,10 @@
     <target name="idlj" depends="#idlcheck" unless="#idl-uptodate">

         <mkdir dir="target/idlj-source"/>

         <exec executable="${java.home}/../bin/idlj">

-            <arg line="-fall -td target/idlj-source src/main/resources/${idlfile}"/>

+            <arg value="${idljopts}"/>

+            <arg value="-td"/>

+            <arg value="target/idlj-source"/>

+            <arg value="src/main/resources/${idlfile}"/>

         </exec>

         <javac destdir="target/classes" debug="on" source="1.5" target="1.5">

             <src path="target/idlj-source"/>

@@ -395,6 +397,7 @@
 

     <!-- for external use on the ant command line -->

     <target name="compile">

+        <echo message="Compiling project ${ant.project.name}"/>

         <mkdir dir="target/classes"/>

         <antcall target="#call-wsdljava"/>

         <antcall target="#call-idljava"/>

@@ -406,6 +409,7 @@
 

     <!-- for external use on the ant command line -->

     <target name="test" depends="#find-testjava, #set-test-classpath, #default-test-classpath" if="#testjava">

+        <echo message="Testing project ${ant.project.name}"/>

         <mkdir dir="target/test-classes"/>

         <javac destdir="target/test-classes" debug="on" source="1.5" target="1.5">

             <src path="src/test/java"/>

@@ -422,13 +426,15 @@
     </target>

 

     <!-- for external use on the ant command line -->

-    <target name="package" depends="#find-javafiles" if="#javafiles">

+    <target name="package">

+        <echo message="Packaging project ${ant.project.name}"/>

         <antcall target="#package-war"/>

         <antcall target="#package-jar"/>

     </target>

 

     <!-- for external use on the ant command line -->

     <target name="clean">

+        <echo message="Cleaning project ${ant.project.name}"/>

         <delete dir="target" includeemptydirs="true"/>

     </target>