Author: ningjiang
Date: Thu Sep 28 19:02:22 2006
New Revision: 451085
URL: http://svn.apache.org/viewvc?view=rev&rev=451085
Log:
[CXF-121] updated the tools build.xml templet to fit the new distribution
Modified:
incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/frontend/jaxws/template/build.vm
Modified:
incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/frontend/jaxws/template/build.vm
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/frontend/jaxws/template/build.vm?view=diff&rev=451085&r1=451084&r2=451085
==============================================================================
---
incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/frontend/jaxws/template/build.vm
(original)
+++
incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/frontend/jaxws/template/build.vm
Thu Sep 28 19:02:22 2006
@@ -30,28 +30,28 @@
<fail message="cxf requires Java version 1.5 or higher. You are currently
using Java version ${ant.java.version}."
unless="is.java.version.15"/>
- <!-- Determine cxf.home, either from the environment variable cxf_HOME
+ <!-- Determine cxf.home, either from the environment variable CXF_HOME
- or using ../..
-->
- <condition property="cxf.home" value="${env.cxf_HOME}">
- <isset property="env.cxf_HOME"/>
+ <condition property="cxf.home" value="${env.CXF_HOME}">
+ <isset property="env.CXF_HOME"/>
</condition>
- <fail message="Please set cxf_HOME environment variable."
unless="cxf.home"/>
+ <fail message="Please set CXF_HOME environment variable."
unless="cxf.home"/>
<!-- Determine cxf.jar.file, either ${cxf.home}/build/lib/cxf.jar
- - in a source distribution, or ${cxf.home}/lib/cxf.jar in a binary
+ - in a source distribution, or ${cxf.home}/lib/cxf-incubator.jar in a
binary
- distribution.
-->
- <condition property="cxf.jar.file" value="${cxf.home}/build/lib/cxf.jar">
- <available file="cxf.jar" type="file" filepath="${cxf.home}/build/lib"/>
+ <condition property="cxf-incubator.jar.file"
value="${cxf.home}/build/lib/cxf-incubator.jar">
+ <available file="cxf-incubator.jar" type="file"
filepath="${cxf.home}/build/lib"/>
</condition>
- <property name="cxf.jar.file" value="${cxf.home}/lib/cxf.jar"/>
+ <property name="cxf-incubator.jar.file"
value="${cxf.home}/lib/cxf-incubator.jar"/>
<fail message="The location ${cxf.home} does not seem to contain a cxf
installation; if you are importing this common build file from a location other
than the cxf samples directory then you need to set the cxf_HOME environment
variable.">
<condition>
<not>
- <isset property="cxf.jar.file" />
+ <isset property="cxf-incubator.jar.file" />
</not>
</condition>
</fail>
@@ -72,7 +72,7 @@
<path id="cxf.classpath">
<pathelement location="${build.classes.dir}"/>
- <pathelement location="${cxf.jar.file}"/>
+ <pathelement location="${cxf-incubator.jar.file}"/>
</path>
#foreach ($interface in $intfs)
