cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r785310 - in /cxf/branches/2.1.x-fixes: ./ distribution/src/main/release/samples/common_build.xml
Date Tue, 16 Jun 2009 17:27:42 GMT
Author: dkulp
Date: Tue Jun 16 17:27:42 2009
New Revision: 785310

URL: http://svn.apache.org/viewvc?rev=785310&view=rev
Log:
Merged revisions 785301 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes

................
  r785301 | dkulp | 2009-06-16 13:09:45 -0400 (Tue, 16 Jun 2009) | 10 lines
  
  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.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/common_build.xml

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 16 17:27:42 2009
@@ -1,2 +1,2 @@
-/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299
-/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785281
+/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301
+/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/common_build.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/common_build.xml?rev=785310&r1=785309&r2=785310&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/common_build.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/common_build.xml Tue Jun
16 17:27:42 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">



Mime
View raw message