You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/06/16 19:09:45 UTC
svn commit: r785301 - in /cxf/branches/2.2.x-fixes: ./
distribution/src/main/release/samples/common_build.xml
Author: dkulp
Date: Tue Jun 16 17:09:45 2009
New Revision: 785301
URL: http://svn.apache.org/viewvc?rev=785301&view=rev
Log:
Merged revisions 785282 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r785282 | dkulp | 2009-06-16 12:21:41 -0400 (Tue, 16 Jun 2009) | 2 lines
[CXF-2209] Add support for tomcat's context.xml in cxf webapp samples.
Modified patch from Dave Stanley applied
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/common_build.xml
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 16 17:09:45 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784183,784895,785279-785281
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784183,784895,785279-785282
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun 16 17:09:45 2009
@@ -1 +1 @@
-/cxf/trunk:1-782619,782728-782730,783097,783294,783396,784059,784181-784183,784895,785279-785281
+/cxf/trunk:1-782619,782728-782730,783097,783294,783396,784059,784181-784183,784895,785279-785282
Modified: cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/common_build.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/common_build.xml?rev=785301&r1=785300&r2=785301&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/common_build.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/common_build.xml Tue Jun 16 17:09:45 2009
@@ -40,10 +40,10 @@
value="../../../../../target/srcbuild_env.ant"
file="target/srcbuild_env.ant"
filepath="../../../../.."/>
- <available property="srcbuild_paths.file"
- value="../../../../../../target/srcbuild_env.ant"
- file="target/srcbuild_env.ant"
- filepath="../../../../../.."/>
+ <available property="srcbuild_paths.file"
+ value="../../../../../../target/srcbuild_env.ant"
+ file="target/srcbuild_env.ant"
+ filepath="../../../../../.."/>
<property name="srcbuild_paths.file" value="${build.dir}/notsrcbuildpath"/>
<mkdir dir="${build.dir}"/>
<touch file="${build.dir}/notsrcbuildpath" verbose="false"/>
@@ -64,8 +64,8 @@
<condition property="is.java.version.15">
<or>
- <equals arg1="${ant.java.version}" arg2="1.5"/>
- <equals arg1="${ant.java.version}" arg2="1.6"/>
+ <equals arg1="${ant.java.version}" arg2="1.5"/>
+ <equals arg1="${ant.java.version}" arg2="1.6"/>
</or>
</condition>
@@ -226,7 +226,7 @@
<arg line="@{servicename.arg}"/>
<arg line="${package.arg.@{file}}"/>
<arg line="${databinding.arg}"/>
- <arg line="${binding.arg}"/>
+ <arg line="${binding.arg}"/>
<arg value="-verbose"/>
<arg value="-d"/>
<arg value="@{srcdestdir}"/>
@@ -235,8 +235,11 @@
</sequential>
</macrodef>
- <property name="war-lib" value="${basedir}/libs" />
- <property name="config.dir" value="${basedir}/config" />
+
+ <property name="war-lib" value="${basedir}/libs" />
+ <property name="config.dir" value="${basedir}/config" />
+
+
<macrodef name="cxfwar">
<attribute name="filename"/>
<attribute name="wsdl" default=""/>
@@ -247,11 +250,14 @@
<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" />
-
+ <available property="has.config.webinf" file="${basedir}/webapp/WEB-INF" type="dir" />
+ <available property="has.config.metainf" file="${basedir}/webapp/META-INF" type="dir" />
+ <antcall target="copy-config-files-webinf" />
+ <antcall target="copy-config-files-metainf" />
+
<delete file="@{dir}/@{filename}" />
<war destfile="@{dir}/@{filename}" webxml="@{webxml}">
<classes dir="@{classesdir}"/>
@@ -262,36 +268,51 @@
<include name="wsdl/@{wsdl}"/>
</webinf>
<webinf dir="${config.dir}">
- <include name="*.*" />
- </webinf>
+ <include name="*.*" />
+ <exclude name="context.xml"/>
+ </webinf>
+
+ <metainf dir="${config.dir}">
+ <include name="context.xml" />
+ </metainf>
+
<lib dir="${war-lib}">
- <include name="*.jar"/>
- </lib>
+ <include name="*.jar"/>
+ </lib>
</war>
+
<delete dir="${war-lib}" />
<delete dir="${config.dir}" />
</sequential>
</macrodef>
+
<target name="copy-war-libs" unless="without.libs">
- <copy todir="${war-lib}">
- <fileset dir="${cxf.home}/lib">
- <exclude name="servlet-api-*.jar" />
- <exclude name="geronimo-servlet_*.jar" />
- <exclude name="jetty-*.jar"/>
- <exclude name="WHICH_JARS" />
- </fileset>
- </copy>
+ <copy todir="${war-lib}">
+ <fileset dir="${cxf.home}/lib">
+ <exclude name="servlet-api-*.jar" />
+ <exclude name="geronimo-servlet_*.jar" />
+ <exclude name="jetty-*.jar"/>
+ <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 name="copy-config-files-webinf" if="has.config.webinf">
+ <copy todir="${config.dir}" >
+ <fileset dir="${basedir}/webapp/WEB-INF">
+ <include name="*.xml" />
+ <exclude name="web.xml" />
+ </fileset>
+ </copy>
+ </target>
+ <target name="copy-config-files-metainf" if="has.config.metainf">
+ <copy todir="${config.dir}" >
+ <fileset dir="${basedir}/webapp/META-INF">
+ <include name="context.xml" />
+ </fileset>
+ </copy>
</target>
<target name="deploy" description="deploy the application into the container">