Author: niallp
Date: Thu May 5 22:42:30 2005
New Revision: 168525
URL: http://svn.apache.org/viewcvs?rev=168525&view=rev
Log:
Include the JSTL tlds in the struts-el distro.
Modified:
struts/el/branches/STRUTS_1_2_BRANCH/build.xml
Modified: struts/el/branches/STRUTS_1_2_BRANCH/build.xml
URL:
http://svn.apache.org/viewcvs/struts/el/branches/STRUTS_1_2_BRANCH/build.xml?rev=168525&r1=168524&r2=168525&view=diff
==============================================================================
--- struts/el/branches/STRUTS_1_2_BRANCH/build.xml (original)
+++ struts/el/branches/STRUTS_1_2_BRANCH/build.xml Thu May 5 22:42:30 2005
@@ -158,7 +158,6 @@
<property name="jstl.jar" value="${libdir}/jstl-1.0.6.jar"/>
<property name="jstl-standard.jar" value="${libdir}/standard-1.0.6.jar"/>
- <property name="jstl.tld.dir" value="${libdir}/tld"/>
<property name="servlet.jar" value="${libdir}/servlet.jar"/>
@@ -217,10 +216,25 @@
<copy file="${jdbc20ext.jar}"
tofile="${build.home}/library/jdbc2_0-stdext.jar"/>
-->
+
+ <!-- Extract JSTL tlds -->
+ <unjar src="${jstl-standard.jar}" dest="${build.home}/library">
+ <patternset>
+ <include name="**/c*.tld"/>
+ <include name="**/f*.tld"/>
+ <include name="**/sql*.tld"/>
+ <include name="**/x*.tld"/>
+ </patternset>
+ </unjar>
+
+ <!-- Copy all tlds -->
<copy todir="${build.home}/library">
- <fileset dir="${jstl.tld.dir}" includes="*.tld"/>
+ <fileset dir="${build.home}/library/META-INF" includes="*.tld"/>
<fileset dir="${struts.core.home}/dist/lib" includes="*.tld"/>
</copy>
+
+ <!-- Remove JSLT META-INF directory -->
+ <delete dir="${build.home}/library/META-INF"/>
</target>
<!--
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
