Fix up ant script to use an aggregate base jar

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

1 files changed, 8 insertions, 3 deletions

diff --git a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/build.xml b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/build.xml
index af24fb2c25..726d5f14c3 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/build.xml
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/build.xml
@@ -25,6 +25,7 @@
     <import file="${tuscany.home}/features/tuscany-base-runtime/build-path.xml"/>

     <import file="${tuscany.home}/features/tuscany-binding-ws-runtime-axis2/build-path.xml"/>

     <import file="${tuscany.home}/features/tuscany-binding-rmi-runtime/build-path.xml"/>

+    <import file="${tuscany.home}/features/tuscany-host-jetty/build-path.xml"/>

 

     <target name="init"> 

       <delete quiet="true" includeemptydirs="true"> 

@@ -58,6 +59,7 @@
 	<echo>  'ant implementation-java-calculator'  </echo>

     </target>

 

+    <!-- Run using the "all" manifest jar -->

     <target name="binding-sca-calculator" depends="compile">

   	     <java classname="launcher.JSELauncherBindingSCACalculator"

               fork="true"

@@ -71,6 +73,7 @@
         </java>  

     </target>

 	

+    <!-- Run using the base + extension ant paths -->

     <target name="binding-ws-calculator" depends="compile">

         <java classname="launcher.JSELauncherBindingWSCalculator"

               fork="true"

@@ -79,10 +82,12 @@
                 <pathelement location="target/${jar.name}"/>

                 <path refid="tuscany-base-runtime.path"/>

                 <path refid="tuscany-binding-ws-runtime-axis2.path"/>

+                <path refid="tuscany-host-jetty.path"/>

             </classpath> 

         </java>     

     </target>	

 	

+    <!-- Run using the base + extension manifest -->

     <target name="binding-rmi-calculator" depends="compile">

         <java classname="launcher.JSELauncherBindingRMICalculator"

               fork="true"

@@ -99,15 +104,15 @@
         </java>       

     </target>	

 	

-    <!-- TODO - I'd like this to be running with aggregate JARs -->

+    <!-- Run using the base + extension aggregations -->

     <target name="implementation-java-calculator" depends="compile">

         <java classname="launcher.JSELauncherImplementationJavaCalculator"

               fork="true"

               failonerror="true">

             <classpath>  

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

-                <fileset dir="${tuscany.home}/features">

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

+                <fileset dir="${tuscany.home}/lib">

+                   <include name="tuscany-base-runtime-aggregation-2.0-SNAPSHOT.jar" />

                 </fileset>

             </classpath> 

         </java>