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 17:56:55 UTC
cvs commit: incubator-myfaces/build/wap-webapp build.xml
svieujot 2004/12/30 08:56:55
Modified: build/wap-webapp build.xml
Log:
bug fix examples wap-webapp libraries for tomcat version > 5.5
Revision Changes Path
1.2 +20 -2 incubator-myfaces/build/wap-webapp/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/incubator-myfaces/build/wap-webapp/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 30 Dec 2004 09:35:06 -0000 1.1
+++ build.xml 30 Dec 2004 16:56:55 -0000 1.2
@@ -79,7 +79,25 @@
</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">
<mkdir dir="${temp.dir}" />
<tstamp>
<format property="TODAY" pattern="yyyy-MM-dd HH:mm" locale="en"/>
@@ -93,8 +111,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-logging.jar}"/>
<lib file="${commons-beanutils.jar}"/>
<lib file="${commons-collections.jar}"/>