Author: dkulp
Date: Fri Jun 19 14:10:46 2009
New Revision: 786517
URL: http://svn.apache.org/viewvc?rev=786517&view=rev
Log:
Merged revisions 786514 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r786514 | dkulp | 2009-06-19 10:07:23 -0400 (Fri, 19 Jun 2009) | 1 line
Fix non-maven based demos not compiling correctly
........
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 Fri Jun 19 14:10:46 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785624,785651,785734,786142
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785624,785651,785734,786142,786514
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jun 19 14:10:46 2009
@@ -1 +1 @@
-/cxf/trunk:1-782619,782728-782730,783097,783294,783396,784059,784181-784184,784893-785620,785622-785624,785651,785734,785932,786142
+/cxf/trunk:1-782619,782728-782730,783097,783294,783396,784059,784181-784184,784893-785620,785622-785624,785651,785734,785932,786142,786514
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=786517&r1=786516&r2=786517&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
Fri Jun 19 14:10:46 2009
@@ -124,6 +124,13 @@
<copy todir="${build.classes.dir}">
<fileset dir="${src.dir}" excludes="**/*.java" />
<fileset dir="${build.src.dir}" includes="**/*.java" />
+ </copy>
+ <available property="maven.resources.dir.exists"
file="${basedir}/src/main/resources" type="dir" />
+ <antcall target="copy.maven.resources"/>
+ </target>
+
+ <target name="copy.maven.resources" if="maven.resources.dir.exists">
+ <copy todir="${build.classes.dir}">
<fileset dir="${basedir}/src/main/resources" includes="**/*" />
</copy>
</target>
