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 2004/12/30 16:54:42 UTC
cvs commit: incubator-myfaces/build build.default.properties
svieujot 2004/12/30 07:54:42
Modified: doc KnownIssues.txt release-notes.txt
build/examples-webapp build.xml
build build.default.properties
Log:
bug fix examples webapp libraries for tomcat version > 5.5
Revision Changes Path
1.21 +1 -3 incubator-myfaces/doc/KnownIssues.txt
Index: KnownIssues.txt
===================================================================
RCS file: /home/cvs/incubator-myfaces/doc/KnownIssues.txt,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- KnownIssues.txt 30 Dec 2004 14:37:09 -0000 1.20
+++ KnownIssues.txt 30 Dec 2004 15:54:42 -0000 1.21
@@ -13,8 +13,6 @@
characters) in id attributes.
* to make the examples webapp war file for a version of tomcat less than 5.5,
- you need to uncomment the lines including the connons-el.jar and jsp-2.0.jar.
- Those 2 commented lines can be found around line 100 in the
- /build/examples-webapp/build.xml file.
+ you have to set the property tomcat.pre.5.5.version=true
TODO... (Many others!)
1.155 +2 -1 incubator-myfaces/doc/release-notes.txt
Index: release-notes.txt
===================================================================
RCS file: /home/cvs/incubator-myfaces/doc/release-notes.txt,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- release-notes.txt 30 Dec 2004 09:35:06 -0000 1.154
+++ release-notes.txt 30 Dec 2004 15:54:42 -0000 1.155
@@ -3,9 +3,10 @@
----------------------------------------------------------------------
Changes in Release 1.0.8 beta_RC2
-* added a new RenderKit, that renders WML. Thanks to Jir� �aloudek for his contribution
+* added a new RenderKit, that renders WML. Thanks to Jir� �aloudek for his contribution
* upgrade the components use the ExtensionsFilter
this means you don't need to include the myfaces javascripts and style sheets in your app anymore.
+* bug fix examples webapp libraries for tomcat version > 5.5
----------------------------------------------------------------------
Changes in Release 1.0.8 beta_RC1
* move to Apache Incubator (root package is now "org.apache.myfaces")
1.33 +20 -3 incubator-myfaces/build/examples-webapp/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/incubator-myfaces/build/examples-webapp/build.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- build.xml 28 Dec 2004 21:17:20 -0000 1.32
+++ build.xml 30 Dec 2004 15:54:42 -0000 1.33
@@ -79,10 +79,28 @@
</target>
- <target name="-war" depends="-compile-and-copy-libs">
+ <target name="-set-tomcat-includes-init">
+ <condition property="tomcat.pre.5.5">
+ <istrue value="${tomcat.pre.5.5.version}"/>
+ </condition>
+ </target>
+ <target name="-set-tomcat-pre-5.5-includes" if="tomcat.pre.5.5">
+ <echo message="Setting war libraries for tomcat version < to 5.5."/>
+ <property name="tomcat.special.include" value="commons-el.jar,jsp-2.0.jar"/>
+ </target>
+ <target name="-set-tomcat-post-5.5-includes" unless="tomcat.pre.5.5">
+ <echo message="Setting war libraries for tomcat version > to 5.5."/>
+ <property name="tomcat.special.include" value="nothingToInclude"/>
+ </target>
+ <target name="-set-tomcat-compatibility-includes" depends="-set-tomcat-includes-init,-set-tomcat-pre-5.5-includes,-set-tomcat-post-5.5-includes">
+ </target>
+
+
+ <target name="-war" depends="-compile-and-copy-libs,-set-tomcat-compatibility-includes">
<tstamp>
<format property="TODAY" pattern="yyyy-MM-dd HH:mm" locale="en"/>
</tstamp>
+
<war destfile="${temp.dir}/myfaces-examples.war"
webxml="${project.dir}/conf/web.xml">
<manifest>
@@ -92,8 +110,8 @@
<attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
</section>
</manifest>
+ <lib dir="${project.dir}/lib" includes="${tomcat.special.include}"/>
<lib file="${commons-codec.jar}"/>
- <!-- lib file="${commons-el.jar}"/ -->
<lib file="${commons-fileupload.jar}"/>
<lib file="${commons-logging.jar}"/>
<lib file="${commons-validator.jar}"/>
@@ -101,7 +119,6 @@
<lib file="${commons-collections.jar}"/>
<lib file="${commons-digester.jar}"/>
<lib file="${jakarta-oro.jar}"/>
- <!-- lib file="${jsp-2.0.jar}"/ -->
<lib file="${jstl.jar}"/>
<lib file="${myfaces.jar}"/>
<lib file="${log4j.jar}"/>
1.22 +2 -0 incubator-myfaces/build/build.default.properties
Index: build.default.properties
===================================================================
RCS file: /home/cvs/incubator-myfaces/build/build.default.properties,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- build.default.properties 30 Dec 2004 09:35:06 -0000 1.21
+++ build.default.properties 30 Dec 2004 15:54:42 -0000 1.22
@@ -103,6 +103,8 @@
tomcat.manager.password=admin
# Define the following tomcat.remote.deploy to deploy on a server that isn't local
# tomcat.remote.deploy=true
+# Set this to true if you want to deply the examples webapp on a tomcat version < 5.5
+tomcat.pre.5.5.version=false
# temp dir
env.TEMP=${project.dir}/build/temp