You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sc...@apache.org on 2005/09/06 23:36:53 UTC
svn commit: r279124 - /myfaces/build/tags/1_0_10/build.xml
Author: schof
Date: Tue Sep 6 14:36:51 2005
New Revision: 279124
URL: http://svn.apache.org/viewcvs?rev=279124&view=rev
Log:
build was searching for Sylvain's hacked up faces-config.xml even when we were supposed to be skipping the sandbox stuff
Modified:
myfaces/build/tags/1_0_10/build.xml
Modified: myfaces/build/tags/1_0_10/build.xml
URL: http://svn.apache.org/viewcvs/myfaces/build/tags/1_0_10/build.xml?rev=279124&r1=279123&r2=279124&view=diff
==============================================================================
--- myfaces/build/tags/1_0_10/build.xml (original)
+++ myfaces/build/tags/1_0_10/build.xml Tue Sep 6 14:36:51 2005
@@ -701,7 +701,7 @@
</tstamp>
<ant target="merge-sandbox"/>
-
+<echo message="***** dist.dir: ${dist.dir}"/>
<!-- build the jar -->
<jar destfile="${dist.dir}/myfaces-all.jar">
@@ -716,6 +716,7 @@
</manifest>
<!-- classes -->
+
<fileset dir="../api/build/temp/classes"/>
<fileset dir="../impl/build/temp/classes"/>
<fileset dir="../tomahawk/build/temp/classes"/>
@@ -724,6 +725,7 @@
</fileset>
<!-- tlds -->
+
<zipfileset dir="../impl/build/temp/tlds" prefix="META-INF/"/>
<zipfileset dir="../tomahawk/build/temp/tlds" prefix="META-INF/"/>
<zipfileset dir="../" prefix="META-INF">
@@ -731,13 +733,16 @@
</zipfileset>
<!-- additional resources -->
- <zipfileset file="${dist.dir}/temp/faces-config.xml" prefix="META-INF/"/>
+ <zipfileset dir="${dist.dir}" prefix="META-INF/" >
+ <include name="temp/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="../">
<include name="sandbox/src/java/**" unless="skip.sandbox"/>
- <exclude name="**/*.java"/>
+ <exclude name="sandbox/src/java/**/*.java"/>
</fileset>
+
</jar>
</target>