You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sv...@apache.org on 2005/08/19 21:36:36 UTC

svn commit: r233547 - /myfaces/build/trunk/build.xml

Author: svieujot
Date: Fri Aug 19 12:36:31 2005
New Revision: 233547

URL: http://svn.apache.org/viewcvs?rev=233547&view=rev
Log:
Build.xml : Hack to merge faces-config.xml files.

Modified:
    myfaces/build/trunk/build.xml

Modified: myfaces/build/trunk/build.xml
URL: http://svn.apache.org/viewcvs/myfaces/build/trunk/build.xml?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- myfaces/build/trunk/build.xml (original)
+++ myfaces/build/trunk/build.xml Fri Aug 19 12:36:31 2005
@@ -689,6 +689,35 @@
         <tstamp>
             <format property="TODAY" pattern="yyyy-MM-dd HH:mm z"/>
         </tstamp>
+    	
+    	<!-- Hack to concatenate tomahawk & sandbox's faces-config.xml files -->
+    	<mkdir dir="${dist.dir}/temp"/>
+    	<copy file="../tomahawk/conf/faces-config.xml"
+    		tofile="${dist.dir}/temp/faces-config.xml.1"
+    		overwrite="true">
+    		<filterchain>
+				<!--tailfilter lines="-1" skip="3"/-->
+    			<replacestring from="&lt;/faces-config&gt;" to=""/>
+			</filterchain>
+		</copy>
+		<copy file="../sandbox/conf/faces-config.xml"
+			tofile="${dist.dir}/temp/faces-config.xml.2"
+			overwrite="true">
+			<filterchain>
+				<headfilter lines="-1" skip="24"/>
+				<!--tokenfilter>
+					<replaceregex pattern="\&lt;\?xml .+&lt;faces-config xmlns=&quot;http://java.sun.com/JSF/Configuration&quot;\&gt;" replace="" flags="m"/>
+				</tokenfilter-->
+			</filterchain>
+		</copy>
+		<move file="${dist.dir}/temp/faces-config.xml.2"
+			tofile="${dist.dir}/temp/faces-config.xml"
+			overwrite="true">
+			<filterchain>
+				<concatfilter prepend="${dist.dir}/temp/faces-config.xml.1"/>
+			</filterchain>
+		</move>
+    	
 
         <!-- build the jar -->
         <jar destfile="${dist.dir}/myfaces-all.jar">
@@ -715,11 +744,12 @@
             <zipfileset dir="../sandbox/build/temp/tlds" prefix="META-INF/"/>
 
             <!-- additional resources -->
-            <zipfileset dir="../tomahawk/conf" includes="*.xml" prefix="META-INF/"/>
+            <!-- <zipfileset dir="../tomahawk/conf" includes="*.xml" prefix="META-INF/"/> -->
+            <zipfileset file="${dist.dir}/temp/faces-config.xml" prefix="META-INF/"/>
             <fileset dir="../impl/src/java" excludes="**/*.java **/package.html"/>
             <fileset dir="../tomahawk/src/java" excludes="**/*.java **/*.properties"/>
             <fileset dir="../sandbox/src/java" excludes="**/*.java "/>
-
+        	
             <!-- properties -->
             <!--
             <fileset dir="../impl/src/java" includes="**/*.properties"/>