Author: rfeng
Date: Thu Jan 29 01:36:47 2009
New Revision: 738703
URL: http://svn.apache.org/viewvc?rev=738703&view=rev
Log:
Align the build-common.xml to use the build-path.xml from the distro
Modified:
tuscany/java/sca/samples/build-common.xml
Modified: tuscany/java/sca/samples/build-common.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/samples/build-common.xml?rev=738703&r1=738702&r2=738703&view=diff
==============================================================================
--- tuscany/java/sca/samples/build-common.xml (original)
+++ tuscany/java/sca/samples/build-common.xml Thu Jan 29 01:36:47 2009
@@ -18,17 +18,19 @@
-->
<project name="common">
- <available file="../../distribution/pom.xml"
property="running.in.development"/>
-
- <target name="common-set-development" if="running.in.development">
- <property name="distro.root" value="../../distribution/all/target"/>
- </target>
-
- <target name="common-set-distribution" unless="running.in.development">
- <property name="distro.root" value="../.."/>
- </target>
+ <!-- Set the distro path based on the existence of the pom.xml -->
+ <condition property="distro.path" value="../../distribution/all/target"
else="../..">
+ <available file="../../distribution/pom.xml"/>
+ </condition>
+
+ <!-- Convert the path to an absolute location -->
+ <property name="distro.root" location="${distro.path}"/>
+ <echo>Distribution: ${distro.root}</echo>
+
+ <!-- @file is relative to the enclosing file -->
+ <import file="${distro.root}/features/build-path.xml"/>
- <target name="common-init" depends="common-set-development,
common-set-distribution" >
+ <target name="common-init">
<mkdir dir="${sample.root}/target/classes"/>
</target>
@@ -38,13 +40,7 @@
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>
+ <classpath refid="tuscany.path"/>
</javac>
<copy todir="${sample.root}/target/classes">
<fileset dir="${sample.root}/src/main/resources"/>
@@ -59,24 +55,14 @@
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>
+ <classpath refid="tuscany.path"/>
</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"/>
+ <lib refid="tuscany.path"/>
<classes dir="${sample.root}/target/classes"/>
</war>
</target>
