diff options
| -rw-r--r-- | java/sca/samples/build-common.xml | 79 | ||||
| -rw-r--r-- | java/sca/samples/host-webapp-calculator/build.xml | 50 | ||||
| -rw-r--r-- | java/sca/samples/implementation-java-calculator/build.xml | 55 |
3 files changed, 89 insertions, 95 deletions
diff --git a/java/sca/samples/build-common.xml b/java/sca/samples/build-common.xml index 67da6879b1..69a467d215 100644 --- a/java/sca/samples/build-common.xml +++ b/java/sca/samples/build-common.xml @@ -31,4 +31,83 @@ <target name="common-init" depends="common-set-development, common-set-distribution" > <mkdir dir="${sample.root}/target/classes"/> </target> + + <target name="common-jar-compile" depends="common-init"> + <javac srcdir="${sample.root}/src/main/java" + destdir="${sample.root}/target/classes" + debug="on" + source="1.5" + target="1.5"> + <classpath> + <!--pathelement location="${distro.root}/tuscany-distribution-core/manifest.jar"/--> + <fileset dir="${distro.root}/modules"> + <include name="*.jar" /> + <include name="*/*.jar" /> + </fileset> + </classpath> + </javac> + <copy todir="${sample.root}/target/classes"> + <fileset dir="${sample.root}/src/main/resources"/> + </copy> + <jar destfile="${sample.jar}" basedir="${sample.root}/target/classes"> + </jar> + </target> + + <target name="common-war-compile" depends="common-init"> + <javac srcdir="${sample.root}/src/main/java" + destdir="${sample.root}/target/classes" + debug="on" + source="1.5" + target="1.5"> + <classpath> + <!--pathelement location="${distro.root}/tuscany-distribution-all/manifest.jar"/--> + <fileset dir="${distro.root}/modules"> + <include name="*.jar" /> + <include name="*/*.jar" /> + </fileset> + </classpath> + </javac> + <copy todir="${sample.root}/target/classes"> + <fileset dir="${sample.root}/src/main/resources"/> + </copy> + <fileset id="tuscany.jars" dir="${distro.root}/modules"> + <include name="*.jar" /> + <include name="*/*.jar" /> + </fileset> + <war destfile="${sample.war}" webxml="${sample.root}/src/main/webapp/WEB-INF/web.xml"> + <fileset dir="${sample.root}/src/main/webapp"/> + <lib refid="tuscany.jars"/> + <classes dir="${sample.root}/target/classes"/> + </war> + </target> + + <target name="common-run-jse" depends="compile"> + <java jar="${distro.root}/modules/tuscany-node-launcher-2.0-SNAPSHOT.jar" + fork="true" + inputstring="q"> + <jvmarg value="-Djava.util.logging.config.file=${sample.root}/../../logging.properties"/> + <arg value="${sample.composite}"/> + <!-- would be good to have the node launcher run the first deployable + composite if this is not specified so I don't have to put it here --> + <arg value="${sample.jar}"/> + </java> + </target> + + <target name="common-run-equinox" depends="compile"> + <java jar="${distro.root}/modules/tuscany-node-launcher-equinox-2.0-SNAPSHOT.jar" + fork="true" + inputstring="q"> + <jvmarg value="-Djava.util.logging.config.file=${sample.root}/../../logging.properties"/> + <arg value="${sample.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="common-clean"> + <delete quiet="true" includeemptydirs="true"> + <fileset dir="target"/> + </delete> + </target> </project> diff --git a/java/sca/samples/host-webapp-calculator/build.xml b/java/sca/samples/host-webapp-calculator/build.xml index 839ead7038..bef3f946e9 100644 --- a/java/sca/samples/host-webapp-calculator/build.xml +++ b/java/sca/samples/host-webapp-calculator/build.xml @@ -18,56 +18,14 @@ --> <project name="sample-host-webapp-calculator" default="compile"> + <import file="../build-common.xml"/> + <property name="sample.name" value="${ant.project.name}"/> <property name="sample.root" value="."/> <property name="sample.war" value="${sample.root}/target/${sample.name}.war" /> - <available file="../../distribution/pom.xml" property="running.in.development"/> - <target name="set-development" if="running.in.development"> - <property name="distro.root" value="../../distribution/all/target"/> - </target> - - <target name="set-distribution" unless="running.in.development"> - <property name="distro.root" value="../.."/> - </target> - - <target name="init" depends="set-development, set-distribution" > - - <mkdir dir="${sample.root}/target/classes"/> - </target> - - <target name="compile" depends="init"> - <javac srcdir="${sample.root}/src/main/java" - destdir="${sample.root}/target/classes" - debug="on" - source="1.5" - target="1.5"> - <classpath> - <!--pathelement location="${distro.root}/tuscany-distribution-all/manifest.jar"/--> - <fileset dir="${distro.root}/modules"> - <include name="*.jar" /> - <include name="*/*.jar" /> - </fileset> - </classpath> - </javac> - <copy todir="${sample.root}/target/classes"> - <fileset dir="${sample.root}/src/main/resources"/> - </copy> - <fileset id="tuscany.jars" dir="${distro.root}/modules"> - <include name="*.jar" /> - <include name="*/*.jar" /> - </fileset> - <war destfile="${sample.war}" webxml="${sample.root}/src/main/webapp/WEB-INF/web.xml"> - <fileset dir="${sample.root}/src/main/webapp"/> - <lib refid="tuscany.jars"/> - <classes dir="${sample.root}/target/classes"/> - </war> - </target> + <target name="compile" depends="common-war-compile"/> - <target name="clean"> - <delete includeemptydirs="true"> - <fileset dir="target"/> - </delete> - </target> + <target name="clean" depends="common-clean"/> </project> diff --git a/java/sca/samples/implementation-java-calculator/build.xml b/java/sca/samples/implementation-java-calculator/build.xml index 5d38aa7441..7edda08a7c 100644 --- a/java/sca/samples/implementation-java-calculator/build.xml +++ b/java/sca/samples/implementation-java-calculator/build.xml @@ -17,61 +17,18 @@ * under the License. --> -<project name="implementation-java-calculator" default="run-jse"> <!-- could dertmine the same name autmatically --> +<project name="implementation-java-calculator" default="run"> <!-- could dertmine the same name autmatically --> <import file="../build-common.xml"/> <property name="sample.name" value="${ant.project.name}"/> <property name="sample.root" value="."/> <property name="sample.jar" value="${sample.root}/target/sample-${sample.name}.jar" /> + <property name="sample.composite" value="Calculator.composite"/> - <target name="compile" depends="common-init"> - <javac srcdir="${sample.root}/src/main/java" - destdir="${sample.root}/target/classes" - debug="on" - source="1.5" - target="1.5"> - <classpath> - <!--pathelement location="${distro.root}/tuscany-distribution-core/manifest.jar"/--> - <fileset dir="${distro.root}/modules"> - <include name="*.jar" /> - <include name="*/*.jar" /> - </fileset> - </classpath> - </javac> - <copy todir="${sample.root}/target/classes"> - <fileset dir="${sample.root}/src/main/resources"/> - </copy> - <jar destfile="${sample.jar}" basedir="${sample.root}/target/classes"> - </jar> - </target> + <target name="compile" depends="common-jar-compile"/> - <target name="run-jse" depends="compile"> - <java jar="${distro.root}/modules/tuscany-node-launcher-2.0-SNAPSHOT.jar" - fork="true" - inputstring="q"> - <jvmarg value="-Djava.util.logging.config.file=${sample.root}/../../logging.properties"/> - <arg value="Calculator.composite"/> - <!-- would be good to have the node launcher run the first deployable - composite if this is not specified so I don't have to put it here --> - <arg value="${sample.jar}"/> - </java> - </target> + <target name="run" depends="common-run-equinox"/> - <target name="run-equinox" depends="compile"> - <java jar="${distro.root}/modules/tuscany-node-launcher-equinox-2.0-SNAPSHOT.jar" - fork="true" - inputstring="q"> - <jvmarg value="-Djava.util.logging.config.file=${sample.root}/../../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> + <target name="clean" depends="common-clean"/> + </project> |