From ff3084de7fc98e78558300c9d24513eeb59ba224 Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 6 Feb 2009 17:24:06 +0000
Subject: Fix the build.xml to work with JSE and Equinox node launchers

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@741642 13f79535-47bb-0310-9956-ffa450edef68
---
 java/sca/samples/calculator-equinox/build.xml | 106 +++++++++++++-------------
 1 file changed, 55 insertions(+), 51 deletions(-)

(limited to 'java/sca/samples/calculator-equinox/build.xml')

diff --git a/java/sca/samples/calculator-equinox/build.xml b/java/sca/samples/calculator-equinox/build.xml
index 40938ebb8e..0343dbcd86 100644
--- a/java/sca/samples/calculator-equinox/build.xml
+++ b/java/sca/samples/calculator-equinox/build.xml
@@ -16,59 +16,63 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<project name="calculator-equinox" default="run"> <!-- could dertmine the same name autmatically -->
-    <property name="sample.name" value="${ant.project.name}"/>
-    <property name="sample.jar" value="./target/sample-${sample.name}.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
+<project name="calculator-equinox" default="run">
+	<property name="sample.name" value="${ant.project.name}"/>
+	<property name="sample.jar" value="./target/sample-${sample.name}.jar" />
+
+	<target name="init">
+		<mkdir dir="target/classes"/>
+	</target>
+
+	<target name="compile" depends="init">
+		<javac srcdir="src/main/java"
                destdir="target/classes"
                debug="on"
                source="1.5"
                target="1.5">
-            <classpath>
-                <fileset dir="../../modules">
-                    <include name="*.jar" />
-                    <include name="*/*.jar" />
-                </fileset>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="${sample.jar}" basedir="target/classes">
-        </jar>    	
-    </target>	
-	
-    <target name="run" depends="compile">
-        <java jar="../../modules/tuscany-node-launcher-2.0-SNAPSHOT.jar"
-              fork="true">
-            <jvmarg value="-Djava.util.logging.config.file=../logging.properties"/>
-            <arg value="Calculator.composite"/> 
-        	 <!-- would be good to have the node launcher run the first deplyable 
-        	      composite if this is not specified so I don't have to put it here -->
-            <arg value="${sample.jar}"/>
-        </java>    	
-    </target>
-	
-    <target name="run-equinox" depends="compile">
-        <java jar="../../modules/tuscany-node-launcher-equinox-2.0-SNAPSHOT.jar"
-              fork="true">
-            <jvmarg value="-Djava.util.logging.config.file=../logging.properties"/>
-            <arg value="Calculator.composite"/> 
-        	 <!-- would be good to have the node launcher run the first deplyable 
-        	      composite if this is not specified so I don't have to put it here -->
-            <arg value="${sample.jar}"/>
-        </java>    	
-    </target>
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
+			<classpath>
+				<fileset dir="../../features">
+					<include name="manifest.jar" />
+				</fileset>
+			</classpath>
+		</javac>
+		<copy todir="target/classes">
+			<fileset dir="src/main/resources"/>
+		</copy>
+		<jar destfile="${sample.jar}" basedir="target/classes">
+		</jar>
+	</target>
+
+	<target name="run" depends="compile">
+		<java jar="../../features/manifest.jar" fork="true">
+			<jvmarg value="-Djava.util.logging.config.file=../logging.properties"/>
+			<!-- optional to set the deployable composite -->
+			<arg value="-composite"/>
+			<arg value="Calculator.composite"/>
+			<!-- stop the node after the application runs -->
+			<arg value="-ttl"/>
+			<arg value="0"/>
+			<arg value="${sample.jar}"/>
+		</java>
+	</target>
+
+	<target name="run-equinox" depends="compile">
+		<java jar="../../features/equinox-manifest.jar" fork="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="-ttl"/>
+			<arg value="0"/>
+			<arg value="${sample.jar}"/>
+		</java>
+	</target>
+
+	<target name="clean">
+		<delete quiet="true" includeemptydirs="true">
+			<fileset dir="target"/>
+		</delete>
+	</target>
 </project>
+
-- 
cgit v1.2.3