Author: blin
Date: Thu Aug 23 18:24:28 2007
New Revision: 569210
URL: http://svn.apache.org/viewvc?rev=569210&view=rev
Log:
Apply Jeff's patch for samples improvement - [cxf-901]. Thanks Jeff.
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
incubator/cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/build.xml
incubator/cxf/trunk/distribution/src/main/release/samples/wsdl_first/wsdl/cxf-servlet.xml
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?rev=569210&r1=569209&r2=569210&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
Thu Aug 23 18:24:28 2007
@@ -218,18 +218,24 @@
</macrodef>
<property name="war-lib" value="${basedir}/libs" />
+ <property name="config.dir" value="${basedir}/config" />
<macrodef name="cxfwar">
<attribute name="filename"/>
<attribute name="wsdl" default=""/>
<attribute name="dir" default="${war.dir}"/>
<attribute name="classesdir" default="${build.classes.dir}"/>
+ <attribute name="webxml" default="${cxf.home}/etc/web.xml" />
<sequential>
<mkdir dir="@{dir}"/>
<mkdir dir="${war-lib}"/>
+ <mkdir dir="${config.dir}"/>
<antcall target="copy-war-libs"/>
+ <available property="has.config" file="${basedir}/webapp/WEB-INF"
type="dir" />
+ <antcall target="copy-config-files" />
+
<delete file="@{dir}/@{filename}" />
- <war destfile="@{dir}/@{filename}"
webxml="${cxf.home}/etc/web.xml">
+ <war destfile="@{dir}/@{filename}" webxml="@{webxml}">
<classes dir="@{classesdir}"/>
<webinf dir="${wsdl.dir}">
<include name="cxf-servlet.xml"/>
@@ -237,12 +243,16 @@
<webinf dir="${wsdl.dir}/..">
<include name="wsdl/@{wsdl}"/>
</webinf>
+ <webinf dir="${config.dir}">
+ <include name="*.*" />
+ </webinf>
<lib dir="${war-lib}">
<include name="*.jar"/>
</lib>
</war>
<delete dir="${war-lib}" />
+ <delete dir="${config.dir}" />
</sequential>
</macrodef>
@@ -255,6 +265,15 @@
<exclude name="WHICH_JARS" />
</fileset>
</copy>
+ </target>
+
+ <target name="copy-config-files" if="has.config">
+ <copy todir="${config.dir}" >
+ <fileset dir="${basedir}/webapp/WEB-INF">
+ <include name="*.xml" />
+ <exclude name="web.xml" />
+ </fileset>
+ </copy>
</target>
<target name="deploy" description="deploy the application into the
container">
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/build.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/build.xml?rev=569210&r1=569209&r2=569210&view=diff
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/build.xml
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/build.xml
Thu Aug 23 18:24:28 2007
@@ -33,6 +33,6 @@
<property name="cxf.war.file.name" value="spring_http"/>
<target name="war" depends="build">
- <cxfwar filename="${cxf.war.file.name}.war"/>
+ <cxfwar filename="${cxf.war.file.name}.war"
webxml="webapp/WEB-INF/web.xml" />
</target>
</project>
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/wsdl_first/wsdl/cxf-servlet.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/wsdl_first/wsdl/cxf-servlet.xml?rev=569210&r1=569209&r2=569210&view=diff
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/wsdl_first/wsdl/cxf-servlet.xml
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/wsdl_first/wsdl/cxf-servlet.xml
Thu Aug 23 18:24:28 2007
@@ -27,7 +27,7 @@
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd";>
<jaxws:endpoint
- id="hello_world_xml_bare"
+ id="hello_world"
implementor="demo.hw.server.GreeterImpl"
wsdlLocation="WEB-INF/wsdl/hello_world.wsdl"
address="/hello_world">
