Author: slaws
Date: Sat May  8 14:41:14 2010
New Revision: 942392

URL: http://svn.apache.org/viewvc?rev=942392&view=rev
Log:
Add a tuscany.home property to make it easy to run the ant script from outside 
a distribution, e.g. from eclipse

Modified:
    tuscany/sca-java-2.x/trunk/samples/calculator-equinox/build.xml

Modified: tuscany/sca-java-2.x/trunk/samples/calculator-equinox/build.xml
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/calculator-equinox/build.xml?rev=942392&r1=942391&r2=942392&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/calculator-equinox/build.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/calculator-equinox/build.xml Sat May  8 
14:41:14 2010
@@ -17,8 +17,12 @@
  * under the License.    
 -->
 <project name="calculator-equinox" default="run">
+       <property name="tuscany.home" value="../.."/>
        <property name="sample.name" value="${ant.project.name}"/>
        <property name="sample.jar" value="./target/sample-${sample.name}.jar" 
/>
+       
+       <echo>${java.home}</echo>
+       <echo>${tuscany.home}</echo>
 
        <target name="init">
                <mkdir dir="target/classes"/>
@@ -31,7 +35,7 @@
                source="1.5"
                target="1.5">
                        <classpath>
-                               <fileset dir="../../features">
+                               <fileset dir="${tuscany.home}/features">
                                        <include 
name="tuscany-sca-manifest.jar" />
                                </fileset>
                        </classpath>
@@ -44,7 +48,7 @@
        </target>
 
        <target name="run" depends="compile">
-               <java jar="../../features/tuscany-sca-manifest.jar" fork="true" 
failonerror="true">
+               <java jar="${tuscany.home}/features/tuscany-sca-manifest.jar" 
fork="true" failonerror="true">
                        <jvmarg 
value="-Djava.util.logging.config.file=../logging.properties"/>
                        <!-- optional to set the deployable composite -->
                        <arg value="-composite"/>
@@ -57,12 +61,12 @@
        </target>
 
        <target name="run-equinox" depends="compile">
-               <java jar="../../features/tuscany-sca-equinox-manifest.jar" 
fork="true" failonerror="true">
+               <java 
jar="${tuscany.home}/features/tuscany-sca-equinox-manifest.jar" fork="true" 
failonerror="true">
                        <jvmarg 
value="-Djava.util.logging.config.file=../logging.properties"/>
                        <arg value="-composite"/>
                        <arg value="Calculator.composite"/>
                        <arg value="-config"/>
-                       <arg value="../../features/configuration"/>
+                       <arg value="${tuscany.home}/features/configuration"/>
                        <arg value="-ttl"/>
                        <arg value="0"/>
                        <arg value="${sample.jar}"/>


Reply via email to