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/09/14 00:55:26 UTC

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

Author: svieujot
Date: Tue Sep 13 15:55:24 2005
New Revision: 280708

URL: http://svn.apache.org/viewcvs?rev=280708&view=rev
Log:
Restore proper zipfileset paths to avoid having files in subdirectories of META-INF.

Modified:
    myfaces/build/trunk/build.xml

Modified: myfaces/build/trunk/build.xml
URL: http://svn.apache.org/viewcvs/myfaces/build/trunk/build.xml?rev=280708&r1=280707&r2=280708&view=diff
==============================================================================
--- myfaces/build/trunk/build.xml (original)
+++ myfaces/build/trunk/build.xml Tue Sep 13 15:55:24 2005
@@ -726,16 +726,16 @@
             <!-- tlds -->
             <zipfileset dir="../impl/build/temp/tlds" prefix="META-INF/"/>
             <zipfileset dir="../tomahawk/build/temp/tlds" prefix="META-INF/"/>
-            <zipfileset dir="../" prefix="META-INF">
-                <include name="sandbox/build/temp/tlds/**" unless="skip.sandbox"/>
+            <zipfileset dir="../sandbox/build/temp/tlds" prefix="META-INF">
+                <include name="**" unless="skip.sandbox"/>
             </zipfileset>
-            <zipfileset dir="${dist.dir}" prefix="META-INF/">
-                <include name="temp/myfaces_all.tld" unless="skip.sandbox"/>
+            <zipfileset dir="${dist.dir}/temp" prefix="META-INF/">
+                <include name="myfaces_all.tld" unless="skip.sandbox"/>
             </zipfileset>
 
             <!-- additional resources -->
-            <zipfileset dir="${dist.dir}" prefix="META-INF/">
-                <include name="temp/faces-config.xml" unless="skip.sandbox"/>
+            <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"/>