Author: nash
Date: Wed May 19 22:10:22 2010
New Revision: 946454
URL: http://svn.apache.org/viewvc?rev=946454&view=rev
Log:
Merge revision r946288 from 1.0 release branch
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/antdefs.xml
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/antdefs.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/antdefs.xml?rev=946454&r1=946453&r2=946454&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/antdefs.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/antdefs.xml Wed May 19
22:10:22 2010
@@ -508,27 +508,10 @@
</condition>
</target>
- <!-- check whether the Tuscany SCA version is 1.7-SNAPSHOT -->
- <target name="#find-tuscany-1.7-SNAPSHOT" unless="#tuscany-version">
- <fileset id="#tuscany-assembly-1.7-SNAPSHOT"
dir="${env.TUSCANY_HOME}/modules">
- <include name="tuscany-assembly-1.7-SNAPSHOT.jar"/>
- </fileset>
- <condition property="#tuscany-version" value="1.7-SNAPSHOT">
- <resourcecount refid="#tuscany-assembly-1.7-SNAPSHOT"
when="greater" count="0"/>
- </condition>
- <condition property="#tuscany-baseversion" value="1.7">
- <resourcecount refid="#tuscany-assembly-1.7-SNAPSHOT"
when="greater" count="0"/>
- </condition>
- <condition property="#tuscany-repo" value="m2-snapshot-repository">
- <resourcecount refid="#tuscany-assembly-1.7-SNAPSHOT"
when="greater" count="0"/>
- </condition>
- </target>
-
- <!-- find the Tuscany SCA version that matches the JAVA_HOME environment
variable -->
- <target name="#find-tuscany-version" depends="#find-tuscany-1.5.1,
#find-tuscany-1.6-SNAPSHOT,
- #find-tuscany-1.6,
#find-tuscany-1.7-SNAPSHOT">
+ <!-- find the Tuscany SCA version that matches the TUSCANY_HOME
environment variable -->
+ <target name="#find-tuscany-version" depends="#find-tuscany-1.5.1,
#find-tuscany-1.6-SNAPSHOT, #find-tuscany-1.6">
<fail unless="#tuscany-version">
- Error: Unknown Tuscany version for JAVA_HOME environment variable.
+ Error: Unable to copy implementation.web jars for this Tuscany
version.
</fail>
</target>
