You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/02/06 18:24:07 UTC
svn commit: r741642 - in /tuscany/java/sca/samples:
calculator-equinox/build.xml calculator-osgi/build.xml
Author: rfeng
Date: Fri Feb 6 17:24:06 2009
New Revision: 741642
URL: http://svn.apache.org/viewvc?rev=741642&view=rev
Log:
Fix the build.xml to work with JSE and Equinox node launchers
Added:
tuscany/java/sca/samples/calculator-osgi/build.xml (with props)
Modified:
tuscany/java/sca/samples/calculator-equinox/build.xml
Modified: tuscany/java/sca/samples/calculator-equinox/build.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-equinox/build.xml?rev=741642&r1=741641&r2=741642&view=diff
==============================================================================
--- tuscany/java/sca/samples/calculator-equinox/build.xml (original)
+++ tuscany/java/sca/samples/calculator-equinox/build.xml Fri Feb 6 17:24:06 2009
@@ -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>
+
Added: tuscany/java/sca/samples/calculator-osgi/build.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-osgi/build.xml?rev=741642&view=auto
==============================================================================
--- tuscany/java/sca/samples/calculator-osgi/build.xml (added)
+++ tuscany/java/sca/samples/calculator-osgi/build.xml Fri Feb 6 17:24:06 2009
@@ -0,0 +1,78 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project name="calculator-osgi" 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="../../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>
+
Propchange: tuscany/java/sca/samples/calculator-osgi/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/java/sca/samples/calculator-osgi/build.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date