Author: peterjones
Date: Wed Jan 10 08:43:47 2007
New Revision: 494887
URL: http://svn.apache.org/viewvc?view=rev&rev=494887
Log:
Couple of common_build.xml changes.
Fix/cleanup for samples without a wsdl subdirectory.
Change to allow building samples inside the src tree.
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/README.txt
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml?view=diff&rev=494887&r1=494886&r2=494887
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
Wed Jan 10 08:43:47 2007
@@ -25,20 +25,24 @@
<property name="build.src.dir" location ="${build.dir}/src"/>
<property name="build.var.dir" location ="${build.dir}/var"/>
<property name="codegen.timestamp.file"
value="${build.src.dir}/.CODEGEN_DONE"/>
- <property name="wsdl.dir" location="${basedir}/wsdl"/>
<property name="war.dir" location="${build.dir}/war"/>
+ <available property="wsdl.dir" value="${basedir}/wsdl"
+ file="${basedir}/wsdl"/>
+ <property name="wsdl.dir" location="."/>
<!-- Setup for building in a source build-->
- <!-- NOTE if the distribution plase less the 3 level relates to root
directory ant will be failed, now just comment out it>
- <property name="srcbuild_paths.file"
value="../../../../target/srcbuild_paths.xml"/>
-
- <import file="${srcbuild_paths.file}" optional="true"/-->
+ <available property="srcbuild_paths.file"
+ value="../../../../target/srcbuild_paths.xml"
+ file="target/srcbuild_paths.xml"
+ filepath="../../../.."/>
+ <property name="srcbuild_paths.file" value="notsrcbuildpath"/>
+ <import file="${srcbuild_paths.file}" optional="true"/>
<property name="srcbuild.classpath" value=""/>
<uptodate property="codegen.notrequired" value="true">
- <srcfiles dir="${basedir}" includes="wsdl/**/*.wsdl"/>
- <srcfiles dir="${basedir}" includes="wsdl/**/*.xsd"/>
+ <srcfiles dir="${wsdl.dir}" includes="**/*.wsdl"/>
+ <srcfiles dir="${wsdl.dir}" includes="**/*.xsd"/>
<mapper type="merge" to="${codegen.timestamp.file}"/>
</uptodate>
@@ -191,7 +195,7 @@
</not>
</condition>
<property name="binding.arg" value=""/>
-
+
<java failonerror="true"
classname="org.apache.cxf.tools.wsdl2java.WSDLToJava" fork="yes">
<classpath>
<path refid="cxf.classpath" />
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/README.txt
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/README.txt?view=diff&rev=494887&r1=494886&r2=494887
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/README.txt
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/README.txt
Wed Jan 10 08:43:47 2007
@@ -24,10 +24,10 @@
please make sure you have installed the ActiveMQ 4.X and
set ACTIVEMQ_HOME and ACTIVEMQ_VERSION environment variables.
-Befor you run this demo, please start up the JMS message broker first.
+Before you run this demo, please start up the JMS message broker first.
-From ActiveMQ 4.X insallation launch ActiveMQ JMS broker in seperate window
-or in background using the commandline:
+From your ActiveMQ 4.X installation launch ActiveMQ JMS broker in a
+separate window or in the background using the commandline:
For Unix:
