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

[sv...@apache.org]

Author: svieujot
Date: Tue Sep  6 15:31:34 2005
New Revision: 279165

URL: http://svn.apache.org/viewcvs?rev=279165&view=rev
Log:
Add tomahawk & sandbox merged tld fils (uri : http://myfaces.apache.org/all) and skip.sandbox bugfix.

Modified:
    myfaces/build/trunk/build.xml

Modified: myfaces/build/trunk/build.xml
URL: http://svn.apache.org/viewcvs/myfaces/build/trunk/build.xml?rev=279165&r1=279164&r2=279165&view=diff
==============================================================================
--- myfaces/build/trunk/build.xml (original)
+++ myfaces/build/trunk/build.xml Tue Sep  6 15:31:34 2005
@@ -729,9 +729,14 @@
             <zipfileset dir="../sandbox/build/temp/tlds" prefix="META-INF">
                 <include name="**" unless="skip.sandbox"/>
             </zipfileset>
+        	<zipfileset dir="${dist.dir}/temp" prefix="META-INF/">
+        		<include name="myfaces_all.tld" unless="skip.sandbox"/>
+        	</zipfileset>
 
             <!-- additional resources -->
-            <zipfileset file="${dist.dir}/temp/faces-config.xml" prefix="META-INF/"/>
+			<zipfileset dir="${dist.dir}/temp" prefix="META-INF/">
+				<include name="faces-config.xml" unless="skip.sandbox"/>
+			</zipfileset>
             <fileset dir="../impl/src/java" excludes="**/*.java **/package.html"/>
             <fileset dir="../tomahawk/src/java" excludes="**/*.java **/*.properties"/>
             <fileset dir="../sandbox/src/java">
@@ -768,6 +773,34 @@
 			overwrite="true">
 			<filterchain>
 				<concatfilter prepend="${dist.dir}/temp/faces-config.xml.1"/>
+			</filterchain>
+		</move>
+    	
+    	<!-- Make a concatenated version of tomahawk & sandbox's tld files  -->
+    	<copy file="../sandbox/tld/myfaces_sandbox.tld"
+			tofile="${dist.dir}/temp/myfaces_all.tld.1"
+			overwrite="true">
+			<filterchain>
+    			<replacestring
+    				from="&lt;uri&gt;http://myfaces.apache.org/sandbox&lt;/uri&gt;"
+    				to="&lt;uri&gt;http://myfaces.apache.org/all&lt;/uri&gt;"/>
+    			<replacestring
+    				from="&lt;/taglib&gt;"
+    				to=""/>
+			</filterchain>
+		</copy>
+    	<copy file="../tomahawk/tld/tomahawk.tld"
+			tofile="${dist.dir}/temp/myfaces_all.tld.2"
+			overwrite="true">
+			<filterchain>
+				<headfilter lines="-1" skip="86"/>
+			</filterchain>
+		</copy>
+    	<move file="${dist.dir}/temp/myfaces_all.tld.2"
+			tofile="${dist.dir}/temp/myfaces_all.tld"
+			overwrite="true">
+			<filterchain>
+				<concatfilter prepend="${dist.dir}/temp/myfaces_all.tld.1"/>
 			</filterchain>
 		</move>
     </target>