You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bd...@apache.org on 2005/09/23 20:31:15 UTC
svn commit: r291186 - in /myfaces: build/branches/1_1_0/build.xml
build/branches/1_1_0/manifest.properties
examples/branches/1_1_0/simple/home.jsp
Author: bdudney
Date: Fri Sep 23 11:31:13 2005
New Revision: 291186
URL: http://svn.apache.org/viewcvs?rev=291186&view=rev
Log:
fix for 598
Modified:
myfaces/build/branches/1_1_0/build.xml
myfaces/build/branches/1_1_0/manifest.properties
myfaces/examples/branches/1_1_0/simple/home.jsp
Modified: myfaces/build/branches/1_1_0/build.xml
URL: http://svn.apache.org/viewcvs/myfaces/build/branches/1_1_0/build.xml?rev=291186&r1=291185&r2=291186&view=diff
==============================================================================
--- myfaces/build/branches/1_1_0/build.xml (original)
+++ myfaces/build/branches/1_1_0/build.xml Fri Sep 23 11:31:13 2005
@@ -694,6 +694,7 @@
<!-- create the myfaces-all.jar which contains everything -->
<mkdir dir="${dist.dir}"/>
+ <mkdir dir="${dist.dir}/temp"/>
<!-- timestamp for the manifest -->
<tstamp>
@@ -716,18 +717,18 @@
</manifest>
<!-- classes -->
- <fileset dir="../api/build/temp/classes"/>
- <fileset dir="../impl/build/temp/classes"/>
- <fileset dir="../tomahawk/build/temp/classes"/>
- <fileset dir="../">
- <include name="sandbox/build/temp/classes/**" unless="skip.sandbox"/>
+ <fileset dir="${build.dir}/../api/build/temp/classes"/>
+ <fileset dir="${build.dir}/../impl/build/temp/classes"/>
+ <fileset dir="${build.dir}/../tomahawk/build/temp/classes"/>
+ <fileset dir="${build.dir}">
+ <include name="../sandbox/build/temp/classes/**" unless="skip.sandbox"/>
</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">
- <include name="sandbox/build/temp/tlds/**" unless="skip.sandbox"/>
+ <zipfileset dir="${build.dir}/../impl/build/temp/tlds" prefix="META-INF/"/>
+ <zipfileset dir="${build.dir}/../tomahawk/build/temp/tlds" prefix="META-INF/"/>
+ <zipfileset dir="${build.dir}" prefix="META-INF">
+ <include name="../sandbox/build/temp/tlds/**" unless="skip.sandbox"/>
</zipfileset>
<zipfileset dir="${dist.dir}/temp" prefix="META-INF/">
<include name="myfaces_all.tld" unless="skip.sandbox"/>
@@ -737,11 +738,14 @@
<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="sandbox/src/java/**/*.java"/>
+ <zipfileset dir="${build.dir}/../tomahawk/conf" prefix="META-INF/">
+ <include name="faces-config.xml" if="skip.sandbox"/>
+ </zipfileset>
+ <fileset dir="${build.dir}/../impl/src/java" excludes="**/*.java **/package.html"/>
+ <fileset dir="${build.dir}/../tomahawk/src/java" excludes="**/*.java **/*.properties"/>
+ <fileset dir="${build.dir}/..">
+ <include name="sandbox/src/java/sandbox/src/java/**" unless="skip.sandbox"/>
+ <exclude name="sandbox/src/java/sandbox/src/java/**/*.java"/>
</fileset>
</jar>
@@ -749,7 +753,6 @@
<target name="merge-sandbox" unless="skip.sandbox">
<!-- 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">
Modified: myfaces/build/branches/1_1_0/manifest.properties
URL: http://svn.apache.org/viewcvs/myfaces/build/branches/1_1_0/manifest.properties?rev=291186&r1=291185&r2=291186&view=diff
==============================================================================
--- myfaces/build/branches/1_1_0/manifest.properties (original)
+++ myfaces/build/branches/1_1_0/manifest.properties Fri Sep 23 11:31:13 2005
@@ -1,5 +1,5 @@
manifest.impl.title=MyFaces
manifest.impl.vendor=MyFaces Project Team (http://myfaces.apache.org)
-# don't forget to update version in examples/web/inc/page_header.jsp !
-manifest.impl.version=1.1.0
\ No newline at end of file
+# don't forget to update version in examples/simple/home.jsp !
+manifest.impl.version=1.1.0.1
\ No newline at end of file
Modified: myfaces/examples/branches/1_1_0/simple/home.jsp
URL: http://svn.apache.org/viewcvs/myfaces/examples/branches/1_1_0/simple/home.jsp?rev=291186&r1=291185&r2=291186&view=diff
==============================================================================
Binary files - no diff available.