tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
Subject svn commit: r1037279 [9/10] - in /tomcat/taglibs/standard/trunk/impl: ./ src/main/java/org/apache/taglibs/standard/ src/main/java/org/apache/taglibs/standard/functions/ src/main/java/org/apache/taglibs/standard/tag/common/core/ src/main/java/org/apache...
Date Sat, 20 Nov 2010 17:57:49 GMT
Modified: tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fmt-1_0-rt.tld
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fmt-1_0-rt.tld?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fmt-1_0-rt.tld (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fmt-1_0-rt.tld Sat Nov 20 17:57:45 2010
@@ -1,403 +1,403 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE taglib
-  PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
-  "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+        PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+        "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
 <taglib>
-  <tlib-version>1.0</tlib-version>
-  <jsp-version>1.2</jsp-version>
-  <short-name>fmt_rt</short-name>
-  <uri>http://java.sun.com/jstl/fmt_rt</uri>
-  <display-name>JSTL fmt RT</display-name>
-  <description>JSTL 1.0 i18n-capable formatting library</description>
-
-  <validator>
-    <validator-class>
-        org.apache.taglibs.standard.tlv.JstlFmtTLV
-    </validator-class>
-    <description>
-        Provides core validation features for JSTL tags.
-    </description>
-  </validator>
-
-  <tag>
-    <name>requestEncoding</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.RequestEncodingTag</tag-class>
-    <body-content>empty</body-content>
-    <description>
-        Sets the request character encoding
-    </description>
-    <attribute>
-        <name>value</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>setLocale</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.SetLocaleTag</tag-class>
-    <body-content>empty</body-content>
-    <description>
-        Stores the given locale in the locale configuration variable
-    </description>
-    <attribute>
-        <name>value</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>variant</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>timeZone</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.TimeZoneTag</tag-class>
-    <body-content>JSP</body-content>
-    <description>
-        Specifies the time zone for any time formatting or parsing actions
-        nested in its body
-    </description>
-    <attribute>
-        <name>value</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>setTimeZone</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.SetTimeZoneTag</tag-class>
-    <body-content>empty</body-content>
-    <description>
-        Stores the given time zone in the time zone configuration variable
-    </description>
-    <attribute>
-        <name>value</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>bundle</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.BundleTag</tag-class>
-    <body-content>JSP</body-content>
-    <description>
-        Loads a resource bundle to be used by its tag body
-    </description>
-    <attribute>
-        <name>basename</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>prefix</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>setBundle</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.SetBundleTag</tag-class>
-    <body-content>empty</body-content>
-    <description>
-        Loads a resource bundle and stores it in the named scoped variable or
-        the bundle configuration variable
-    </description>
-    <attribute>
-        <name>basename</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>message</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.MessageTag</tag-class>
-    <body-content>JSP</body-content>
-    <description>
-        Maps key to localized message and performs parametric replacement
-    </description>
-    <attribute>
-        <name>key</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>bundle</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>param</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.ParamTag</tag-class>
-    <body-content>JSP</body-content>
-    <description>
-        Supplies an argument for parametric replacement to a containing
-        &lt;message&gt; tag
-    </description>
-    <attribute>
-        <name>value</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>formatNumber</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.FormatNumberTag</tag-class>
-    <body-content>JSP</body-content>
-    <description>
-        Formats a numeric value as a number, currency, or percentage
-    </description>
-    <attribute>
-        <name>value</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>type</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>pattern</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>currencyCode</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>currencySymbol</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>groupingUsed</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>maxIntegerDigits</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>minIntegerDigits</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>maxFractionDigits</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>minFractionDigits</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>parseNumber</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.ParseNumberTag</tag-class>
-    <body-content>JSP</body-content>
-    <description>
-        Parses the string representation of a number, currency, or percentage
-    </description>
-    <attribute>
-        <name>value</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>type</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>pattern</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>parseLocale</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>integerOnly</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>formatDate</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.FormatDateTag</tag-class>
-    <body-content>empty</body-content>
-    <description>
-        Formats a date and/or time using the supplied styles and pattern
-    </description>
-    <attribute>
-        <name>value</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>type</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>dateStyle</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>timeStyle</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>pattern</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>timeZone</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>parseDate</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.ParseDateTag</tag-class>
-    <body-content>JSP</body-content>
-    <description>
-        Parses the string representation of a date and/or time
-    </description>
-    <attribute>
-        <name>value</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>type</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>dateStyle</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>timeStyle</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>pattern</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
+    <tlib-version>1.0</tlib-version>
+    <jsp-version>1.2</jsp-version>
+    <short-name>fmt_rt</short-name>
+    <uri>http://java.sun.com/jstl/fmt_rt</uri>
+    <display-name>JSTL fmt RT</display-name>
+    <description>JSTL 1.0 i18n-capable formatting library</description>
+
+    <validator>
+        <validator-class>
+            org.apache.taglibs.standard.tlv.JstlFmtTLV
+        </validator-class>
+        <description>
+            Provides core validation features for JSTL tags.
+        </description>
+    </validator>
+
+    <tag>
+        <name>requestEncoding</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.fmt.RequestEncodingTag</tag-class>
+        <body-content>empty</body-content>
+        <description>
+            Sets the request character encoding
+        </description>
+        <attribute>
+            <name>value</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>setLocale</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.fmt.SetLocaleTag</tag-class>
+        <body-content>empty</body-content>
+        <description>
+            Stores the given locale in the locale configuration variable
+        </description>
+        <attribute>
+            <name>value</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>variant</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
         <name>timeZone</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>parseLocale</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
+        <tag-class>org.apache.taglibs.standard.tag.rt.fmt.TimeZoneTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>
+            Specifies the time zone for any time formatting or parsing actions
+            nested in its body
+        </description>
+        <attribute>
+            <name>value</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>setTimeZone</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.fmt.SetTimeZoneTag</tag-class>
+        <body-content>empty</body-content>
+        <description>
+            Stores the given time zone in the time zone configuration variable
+        </description>
+        <attribute>
+            <name>value</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>bundle</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.fmt.BundleTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>
+            Loads a resource bundle to be used by its tag body
+        </description>
+        <attribute>
+            <name>basename</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>prefix</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>setBundle</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.fmt.SetBundleTag</tag-class>
+        <body-content>empty</body-content>
+        <description>
+            Loads a resource bundle and stores it in the named scoped variable or
+            the bundle configuration variable
+        </description>
+        <attribute>
+            <name>basename</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>message</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.fmt.MessageTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>
+            Maps key to localized message and performs parametric replacement
+        </description>
+        <attribute>
+            <name>key</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>bundle</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>param</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.fmt.ParamTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>
+            Supplies an argument for parametric replacement to a containing
+            &lt;message&gt; tag
+        </description>
+        <attribute>
+            <name>value</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>formatNumber</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.fmt.FormatNumberTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>
+            Formats a numeric value as a number, currency, or percentage
+        </description>
+        <attribute>
+            <name>value</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>type</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>pattern</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>currencyCode</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>currencySymbol</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>groupingUsed</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>maxIntegerDigits</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>minIntegerDigits</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>maxFractionDigits</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>minFractionDigits</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>parseNumber</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.fmt.ParseNumberTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>
+            Parses the string representation of a number, currency, or percentage
+        </description>
+        <attribute>
+            <name>value</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>type</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>pattern</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>parseLocale</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>integerOnly</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>formatDate</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.fmt.FormatDateTag</tag-class>
+        <body-content>empty</body-content>
+        <description>
+            Formats a date and/or time using the supplied styles and pattern
+        </description>
+        <attribute>
+            <name>value</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>type</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>dateStyle</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>timeStyle</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>pattern</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>timeZone</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>parseDate</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.fmt.ParseDateTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>
+            Parses the string representation of a date and/or time
+        </description>
+        <attribute>
+            <name>value</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>type</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>dateStyle</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>timeStyle</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>pattern</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>timeZone</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>parseLocale</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
 
 </taglib>

Modified: tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fmt.tld
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fmt.tld?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fmt.tld (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fmt.tld Sat Nov 20 17:57:45 2010
@@ -1,671 +1,671 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <taglib xmlns="http://java.sun.com/xml/ns/j2ee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
-    version="2.0">
-    
-  <description>JSTL 1.1 i18n-capable formatting library</description>
-  <display-name>JSTL fmt</display-name>
-  <tlib-version>1.1</tlib-version>
-  <short-name>fmt</short-name>
-  <uri>http://java.sun.com/jsp/jstl/fmt</uri>
-
-  <validator>
-    <description>
-        Provides core validation features for JSTL tags.
-    </description>
-    <validator-class>
-        org.apache.taglibs.standard.tlv.JstlFmtTLV
-    </validator-class>
-  </validator>
-
-  <tag>
-    <description>
-        Sets the request character encoding
-    </description>
-    <name>requestEncoding</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.RequestEncodingTag</tag-class>
-    <body-content>empty</body-content>
-    <attribute>
-        <description>
-Name of character encoding to be applied when
-decoding request parameters.
-        </description>
-        <name>value</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-        Stores the given locale in the locale configuration variable
-    </description>
-    <name>setLocale</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.SetLocaleTag</tag-class>
-    <body-content>empty</body-content>
-    <attribute>
-        <description>
-A String value is interpreted as the
-printable representation of a locale, which
-must contain a two-letter (lower-case)
-language code (as defined by ISO-639),
-and may contain a two-letter (upper-case)
-country code (as defined by ISO-3166).
-Language and country codes must be
-separated by hyphen (-) or underscore
-(_).        
-	</description>
-        <name>value</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Vendor- or browser-specific variant.
-See the java.util.Locale javadocs for
-more information on variants.
-        </description>
-        <name>variant</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Scope of the locale configuration variable.
-        </description>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-        Specifies the time zone for any time formatting or parsing actions
-        nested in its body
-    </description>
-    <name>timeZone</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.TimeZoneTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-The time zone. A String value is interpreted as
-a time zone ID. This may be one of the time zone
-IDs supported by the Java platform (such as
-"America/Los_Angeles") or a custom time zone
-ID (such as "GMT-8"). See
-java.util.TimeZone for more information on
-supported time zone formats.
-        </description>
-        <name>value</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-        Stores the given time zone in the time zone configuration variable
-    </description>
-    <name>setTimeZone</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.SetTimeZoneTag</tag-class>
-    <body-content>empty</body-content>
-    <attribute>
-        <description>
-The time zone. A String value is interpreted as
-a time zone ID. This may be one of the time zone
-IDs supported by the Java platform (such as
-"America/Los_Angeles") or a custom time zone
-ID (such as "GMT-8"). See java.util.TimeZone for
-more information on supported time zone
-formats.
-        </description>
-        <name>value</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Name of the exported scoped variable which
-stores the time zone of type
-java.util.TimeZone.
-        </description>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Scope of var or the time zone configuration
-variable.
-        </description>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-        Loads a resource bundle to be used by its tag body
-    </description>
-    <name>bundle</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.BundleTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-Resource bundle base name. This is the bundle's
-fully-qualified resource name, which has the same
-form as a fully-qualified class name, that is, it uses
-"." as the package component separator and does not
-have any file type (such as ".class" or ".properties")
-suffix.
-        </description>
-        <name>basename</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Prefix to be prepended to the value of the message
-key of any nested &lt;fmt:message&gt; action.
-        </description>
-        <name>prefix</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-        Loads a resource bundle and stores it in the named scoped variable or
-        the bundle configuration variable
-    </description>
-    <name>setBundle</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.SetBundleTag</tag-class>
-    <body-content>empty</body-content>
-    <attribute>
-        <description>
-Resource bundle base name. This is the bundle's
-fully-qualified resource name, which has the same
-form as a fully-qualified class name, that is, it uses
-"." as the package component separator and does not
-have any file type (such as ".class" or ".properties")
-suffix.
-        </description>
-        <name>basename</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Name of the exported scoped variable which stores
-the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
-ontext.
-        </description>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Scope of var or the localization context
-configuration variable.
-        </description>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-        Maps key to localized message and performs parametric replacement
-    </description>
-    <name>message</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.MessageTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-Message key to be looked up.
-        </description>
-        <name>key</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Localization context in whose resource
-bundle the message key is looked up.
-        </description>
-        <name>bundle</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Name of the exported scoped variable
-which stores the localized message.
-        </description>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Scope of var.
-        </description>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-        Supplies an argument for parametric replacement to a containing
-        &lt;message&gt; tag
-    </description>
-    <name>param</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.ParamTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-Argument used for parametric replacement.
-        </description>
-        <name>value</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-        Formats a numeric value as a number, currency, or percentage
-    </description>
-    <name>formatNumber</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.FormatNumberTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-Numeric value to be formatted.
-        </description>
-        <name>value</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Specifies whether the value is to be
-formatted as number, currency, or
-percentage.
-        </description>
-        <name>type</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Custom formatting pattern.
-        </description>
-        <name>pattern</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-ISO 4217 currency code. Applied only
-when formatting currencies (i.e. if type is
-equal to "currency"); ignored otherwise.
-        </description>
-        <name>currencyCode</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Currency symbol. Applied only when
-formatting currencies (i.e. if type is equal
-to "currency"); ignored otherwise.
-        </description>
-        <name>currencySymbol</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Specifies whether the formatted output
-will contain any grouping separators.
-        </description>
-        <name>groupingUsed</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Maximum number of digits in the integer
-portion of the formatted output.
-        </description>
-        <name>maxIntegerDigits</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Minimum number of digits in the integer
-portion of the formatted output.
-        </description>
-        <name>minIntegerDigits</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Maximum number of digits in the
-fractional portion of the formatted output.
-        </description>
-        <name>maxFractionDigits</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Minimum number of digits in the
-fractional portion of the formatted output.
-        </description>
-        <name>minFractionDigits</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Name of the exported scoped variable
-which stores the formatted result as a
-String.
-        </description>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Scope of var.
-        </description>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-        Parses the string representation of a number, currency, or percentage
-    </description>
-    <name>parseNumber</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.ParseNumberTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-String to be parsed.
-        </description>
-        <name>value</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Specifies whether the string in the value
-attribute should be parsed as a number,
-currency, or percentage.
-        </description>
-        <name>type</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Custom formatting pattern that determines
-how the string in the value attribute is to be
-parsed.
-        </description>
-        <name>pattern</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Locale whose default formatting pattern (for
-numbers, currencies, or percentages,
-respectively) is to be used during the parse
-operation, or to which the pattern specified
-via the pattern attribute (if present) is
-applied.
-        </description>
-        <name>parseLocale</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Specifies whether just the integer portion of
-the given value should be parsed.
-        </description>
-        <name>integerOnly</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Name of the exported scoped variable which
-stores the parsed result (of type
-java.lang.Number).
-        </description>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Scope of var.
-        </description>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-        Formats a date and/or time using the supplied styles and pattern
-    </description>
-    <name>formatDate</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.FormatDateTag</tag-class>
-    <body-content>empty</body-content>
-    <attribute>
-        <description>
-Date and/or time to be formatted.
-        </description>
-        <name>value</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Specifies whether the time, the date, or both
-the time and date components of the given
-date are to be formatted. 
-        </description>
-        <name>type</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Predefined formatting style for dates. Follows
-the semantics defined in class
-java.text.DateFormat. Applied only
-when formatting a date or both a date and
-time (i.e. if type is missing or is equal to
-"date" or "both"); ignored otherwise.
-        </description>
-        <name>dateStyle</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Predefined formatting style for times. Follows
-the semantics defined in class
-java.text.DateFormat. Applied only
-when formatting a time or both a date and
-time (i.e. if type is equal to "time" or "both");
-ignored otherwise.
-        </description>
-        <name>timeStyle</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Custom formatting style for dates and times.
-        </description>
-        <name>pattern</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+        version="2.0">
+
+    <description>JSTL 1.1 i18n-capable formatting library</description>
+    <display-name>JSTL fmt</display-name>
+    <tlib-version>1.1</tlib-version>
+    <short-name>fmt</short-name>
+    <uri>http://java.sun.com/jsp/jstl/fmt</uri>
+
+    <validator>
+        <description>
+            Provides core validation features for JSTL tags.
+        </description>
+        <validator-class>
+            org.apache.taglibs.standard.tlv.JstlFmtTLV
+        </validator-class>
+    </validator>
+
+    <tag>
+        <description>
+            Sets the request character encoding
+        </description>
+        <name>requestEncoding</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.fmt.RequestEncodingTag</tag-class>
+        <body-content>empty</body-content>
+        <attribute>
+            <description>
+                Name of character encoding to be applied when
+                decoding request parameters.
+            </description>
+            <name>value</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <description>
+            Stores the given locale in the locale configuration variable
+        </description>
+        <name>setLocale</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.fmt.SetLocaleTag</tag-class>
+        <body-content>empty</body-content>
+        <attribute>
+            <description>
+                A String value is interpreted as the
+                printable representation of a locale, which
+                must contain a two-letter (lower-case)
+                language code (as defined by ISO-639),
+                and may contain a two-letter (upper-case)
+                country code (as defined by ISO-3166).
+                Language and country codes must be
+                separated by hyphen (-) or underscore
+                (_).
+            </description>
+            <name>value</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Vendor- or browser-specific variant.
+                See the java.util.Locale javadocs for
+                more information on variants.
+            </description>
+            <name>variant</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Scope of the locale configuration variable.
+            </description>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
         <description>
-Time zone in which to represent the formatted
-time.
+            Specifies the time zone for any time formatting or parsing actions
+            nested in its body
         </description>
         <name>timeZone</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Name of the exported scoped variable which
-stores the formatted result as a String.
-        </description>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Scope of var.
-        </description>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-        Parses the string representation of a date and/or time
-    </description>
-    <name>parseDate</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.ParseDateTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-Date string to be parsed.
-        </description>
-        <name>value</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Specifies whether the date string in the
-value attribute is supposed to contain a
-time, a date, or both.
-        </description>
-        <name>type</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Predefined formatting style for days
-which determines how the date
-component of the date string is to be
-parsed. Applied only when formatting a
-date or both a date and time (i.e. if type
-is missing or is equal to "date" or "both");
-ignored otherwise.
-        </description>
-        <name>dateStyle</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Predefined formatting styles for times
-which determines how the time
-component in the date string is to be
-parsed. Applied only when formatting a
-time or both a date and time (i.e. if type
-is equal to "time" or "both"); ignored
-otherwise.
-        </description>
-        <name>timeStyle</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Custom formatting pattern which
-determines how the date string is to be
-parsed.
-        </description>
-        <name>pattern</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
+        <tag-class>org.apache.taglibs.standard.tag.rt.fmt.TimeZoneTag</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <description>
+                The time zone. A String value is interpreted as
+                a time zone ID. This may be one of the time zone
+                IDs supported by the Java platform (such as
+                "America/Los_Angeles") or a custom time zone
+                ID (such as "GMT-8"). See
+                java.util.TimeZone for more information on
+                supported time zone formats.
+            </description>
+            <name>value</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <description>
+            Stores the given time zone in the time zone configuration variable
+        </description>
+        <name>setTimeZone</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.fmt.SetTimeZoneTag</tag-class>
+        <body-content>empty</body-content>
+        <attribute>
+            <description>
+                The time zone. A String value is interpreted as
+                a time zone ID. This may be one of the time zone
+                IDs supported by the Java platform (such as
+                "America/Los_Angeles") or a custom time zone
+                ID (such as "GMT-8"). See java.util.TimeZone for
+                more information on supported time zone
+                formats.
+            </description>
+            <name>value</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Name of the exported scoped variable which
+                stores the time zone of type
+                java.util.TimeZone.
+            </description>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Scope of var or the time zone configuration
+                variable.
+            </description>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
         <description>
-Time zone in which to interpret any time
-information in the date string.
+            Loads a resource bundle to be used by its tag body
         </description>
-        <name>timeZone</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Locale whose predefined formatting styles
-for dates and times are to be used during
-the parse operation, or to which the
-pattern specified via the pattern
-attribute (if present) is applied.
-        </description>
-        <name>parseLocale</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Name of the exported scoped variable in
-which the parsing result (of type
-java.util.Date) is stored.
-        </description>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Scope of var.
-        </description>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
+        <name>bundle</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.fmt.BundleTag</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <description>
+                Resource bundle base name. This is the bundle's
+                fully-qualified resource name, which has the same
+                form as a fully-qualified class name, that is, it uses
+                "." as the package component separator and does not
+                have any file type (such as ".class" or ".properties")
+                suffix.
+            </description>
+            <name>basename</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Prefix to be prepended to the value of the message
+                key of any nested &lt;fmt:message&gt; action.
+            </description>
+            <name>prefix</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <description>
+            Loads a resource bundle and stores it in the named scoped variable or
+            the bundle configuration variable
+        </description>
+        <name>setBundle</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.fmt.SetBundleTag</tag-class>
+        <body-content>empty</body-content>
+        <attribute>
+            <description>
+                Resource bundle base name. This is the bundle's
+                fully-qualified resource name, which has the same
+                form as a fully-qualified class name, that is, it uses
+                "." as the package component separator and does not
+                have any file type (such as ".class" or ".properties")
+                suffix.
+            </description>
+            <name>basename</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Name of the exported scoped variable which stores
+                the i18n localization context of type
+                javax.servlet.jsp.jstl.fmt.LocalizationC
+                ontext.
+            </description>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Scope of var or the localization context
+                configuration variable.
+            </description>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <description>
+            Maps key to localized message and performs parametric replacement
+        </description>
+        <name>message</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.fmt.MessageTag</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <description>
+                Message key to be looked up.
+            </description>
+            <name>key</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Localization context in whose resource
+                bundle the message key is looked up.
+            </description>
+            <name>bundle</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Name of the exported scoped variable
+                which stores the localized message.
+            </description>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Scope of var.
+            </description>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <description>
+            Supplies an argument for parametric replacement to a containing
+            &lt;message&gt; tag
+        </description>
+        <name>param</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.fmt.ParamTag</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <description>
+                Argument used for parametric replacement.
+            </description>
+            <name>value</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <description>
+            Formats a numeric value as a number, currency, or percentage
+        </description>
+        <name>formatNumber</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.fmt.FormatNumberTag</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <description>
+                Numeric value to be formatted.
+            </description>
+            <name>value</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Specifies whether the value is to be
+                formatted as number, currency, or
+                percentage.
+            </description>
+            <name>type</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Custom formatting pattern.
+            </description>
+            <name>pattern</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                ISO 4217 currency code. Applied only
+                when formatting currencies (i.e. if type is
+                equal to "currency"); ignored otherwise.
+            </description>
+            <name>currencyCode</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Currency symbol. Applied only when
+                formatting currencies (i.e. if type is equal
+                to "currency"); ignored otherwise.
+            </description>
+            <name>currencySymbol</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Specifies whether the formatted output
+                will contain any grouping separators.
+            </description>
+            <name>groupingUsed</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Maximum number of digits in the integer
+                portion of the formatted output.
+            </description>
+            <name>maxIntegerDigits</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Minimum number of digits in the integer
+                portion of the formatted output.
+            </description>
+            <name>minIntegerDigits</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Maximum number of digits in the
+                fractional portion of the formatted output.
+            </description>
+            <name>maxFractionDigits</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Minimum number of digits in the
+                fractional portion of the formatted output.
+            </description>
+            <name>minFractionDigits</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Name of the exported scoped variable
+                which stores the formatted result as a
+                String.
+            </description>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Scope of var.
+            </description>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <description>
+            Parses the string representation of a number, currency, or percentage
+        </description>
+        <name>parseNumber</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.fmt.ParseNumberTag</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <description>
+                String to be parsed.
+            </description>
+            <name>value</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Specifies whether the string in the value
+                attribute should be parsed as a number,
+                currency, or percentage.
+            </description>
+            <name>type</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Custom formatting pattern that determines
+                how the string in the value attribute is to be
+                parsed.
+            </description>
+            <name>pattern</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Locale whose default formatting pattern (for
+                numbers, currencies, or percentages,
+                respectively) is to be used during the parse
+                operation, or to which the pattern specified
+                via the pattern attribute (if present) is
+                applied.
+            </description>
+            <name>parseLocale</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Specifies whether just the integer portion of
+                the given value should be parsed.
+            </description>
+            <name>integerOnly</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Name of the exported scoped variable which
+                stores the parsed result (of type
+                java.lang.Number).
+            </description>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Scope of var.
+            </description>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <description>
+            Formats a date and/or time using the supplied styles and pattern
+        </description>
+        <name>formatDate</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.fmt.FormatDateTag</tag-class>
+        <body-content>empty</body-content>
+        <attribute>
+            <description>
+                Date and/or time to be formatted.
+            </description>
+            <name>value</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Specifies whether the time, the date, or both
+                the time and date components of the given
+                date are to be formatted.
+            </description>
+            <name>type</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Predefined formatting style for dates. Follows
+                the semantics defined in class
+                java.text.DateFormat. Applied only
+                when formatting a date or both a date and
+                time (i.e. if type is missing or is equal to
+                "date" or "both"); ignored otherwise.
+            </description>
+            <name>dateStyle</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Predefined formatting style for times. Follows
+                the semantics defined in class
+                java.text.DateFormat. Applied only
+                when formatting a time or both a date and
+                time (i.e. if type is equal to "time" or "both");
+                ignored otherwise.
+            </description>
+            <name>timeStyle</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Custom formatting style for dates and times.
+            </description>
+            <name>pattern</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Time zone in which to represent the formatted
+                time.
+            </description>
+            <name>timeZone</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Name of the exported scoped variable which
+                stores the formatted result as a String.
+            </description>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Scope of var.
+            </description>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <description>
+            Parses the string representation of a date and/or time
+        </description>
+        <name>parseDate</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.fmt.ParseDateTag</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <description>
+                Date string to be parsed.
+            </description>
+            <name>value</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Specifies whether the date string in the
+                value attribute is supposed to contain a
+                time, a date, or both.
+            </description>
+            <name>type</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Predefined formatting style for days
+                which determines how the date
+                component of the date string is to be
+                parsed. Applied only when formatting a
+                date or both a date and time (i.e. if type
+                is missing or is equal to "date" or "both");
+                ignored otherwise.
+            </description>
+            <name>dateStyle</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Predefined formatting styles for times
+                which determines how the time
+                component in the date string is to be
+                parsed. Applied only when formatting a
+                time or both a date and time (i.e. if type
+                is equal to "time" or "both"); ignored
+                otherwise.
+            </description>
+            <name>timeStyle</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Custom formatting pattern which
+                determines how the date string is to be
+                parsed.
+            </description>
+            <name>pattern</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Time zone in which to interpret any time
+                information in the date string.
+            </description>
+            <name>timeZone</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Locale whose predefined formatting styles
+                for dates and times are to be used during
+                the parse operation, or to which the
+                pattern specified via the pattern
+                attribute (if present) is applied.
+            </description>
+            <name>parseLocale</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Name of the exported scoped variable in
+                which the parsing result (of type
+                java.util.Date) is stored.
+            </description>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Scope of var.
+            </description>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
 
 </taglib>

Modified: tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fn.tld
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fn.tld?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fn.tld (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fn.tld Sat Nov 20 17:57:45 2010
@@ -1,207 +1,208 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <taglib xmlns="http://java.sun.com/xml/ns/j2ee"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
-  version="2.0">
-    
-  <description>JSTL 1.1 functions library</description>
-  <display-name>JSTL functions</display-name>
-  <tlib-version>1.1</tlib-version>
-  <short-name>fn</short-name>
-  <uri>http://java.sun.com/jsp/jstl/functions</uri>
-
-  <function>
-    <description>
-      Tests if an input string contains the specified substring.
-    </description>
-    <name>contains</name>
-    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
-    <function-signature>boolean contains(java.lang.String, java.lang.String)</function-signature>
-    <example>
-      &lt;c:if test="${fn:contains(name, searchString)}">
-    </example>
-  </function>
-
-  <function>
-    <description>
-      Tests if an input string contains the specified substring in a case insensitive way.
-    </description>
-    <name>containsIgnoreCase</name>
-    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
-    <function-signature>boolean containsIgnoreCase(java.lang.String, java.lang.String)</function-signature>
-    <example>
-      &lt;c:if test="${fn:containsIgnoreCase(name, searchString)}">
-    </example>
-  </function>
-
-  <function>
-    <description>
-      Tests if an input string ends with the specified suffix.
-    </description>
-    <name>endsWith</name>
-    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
-    <function-signature>boolean endsWith(java.lang.String, java.lang.String)</function-signature>
-    <example>
-      &lt;c:if test="${fn:endsWith(filename, ".txt")}">
-    </example>
-  </function>
-
-  <function>
-    <description>
-      Escapes characters that could be interpreted as XML markup.
-    </description>
-    <name>escapeXml</name>
-    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
-    <function-signature>java.lang.String escapeXml(java.lang.String)</function-signature>
-    <example>
-      ${fn:escapeXml(param:info)}
-    </example>
-  </function>
-
-  <function>
-    <description>
-      Returns the index withing a string of the first occurrence of a specified substring.
-    </description>
-    <name>indexOf</name>
-    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
-    <function-signature>int indexOf(java.lang.String, java.lang.String)</function-signature>
-    <example>
-      ${fn:indexOf(name, "-")}
-    </example>
-  </function>
-
-  <function>
-    <description>
-      Joins all elements of an array into a string.
-    </description>
-    <name>join</name>
-    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
-    <function-signature>java.lang.String join(java.lang.String[], java.lang.String)</function-signature>
-    <example>
-      ${fn:join(array, ";")}
-    </example>
-  </function>
-
-  <function>
-    <description>
-      Returns the number of items in a collection, or the number of characters in a string.
-    </description>
-    <name>length</name>
-    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
-    <function-signature>int length(java.lang.Object)</function-signature>
-    <example>
-      You have ${fn:length(shoppingCart.products)} in your shopping cart.
-    </example>
-  </function>
-
-  <function>
-    <description>
-      Returns a string resulting from replacing in an input string all occurrences
-      of a "before" string into an "after" substring.
-    </description>
-    <name>replace</name>
-    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
-    <function-signature>java.lang.String replace(java.lang.String, java.lang.String, java.lang.String)</function-signature>
-    <example>
-      ${fn:replace(text, "-", "&#149;")}
-    </example>
-  </function>
-
-  <function>
-    <description>
-      Splits a string into an array of substrings.
-    </description>
-    <name>split</name>
-    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
-    <function-signature>java.lang.String[] split(java.lang.String, java.lang.String)</function-signature>
-    <example>
-      ${fn:split(customerNames, ";")}
-    </example>
-  </function>
-
-  <function>
-    <description>
-      Tests if an input string starts with the specified prefix.
-    </description>
-    <name>startsWith</name>
-    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
-    <function-signature>boolean startsWith(java.lang.String, java.lang.String)</function-signature>
-    <example>
-      &lt;c:if test="${fn:startsWith(product.id, "100-")}">
-    </example>
-  </function>
-
-  <function>
-    <description>
-      Returns a subset of a string.
-    </description>
-    <name>substring</name>
-    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
-    <function-signature>java.lang.String substring(java.lang.String, int, int)</function-signature>
-    <example>
-      P.O. Box: ${fn:substring(zip, 6, -1)}
-    </example>
-  </function>
-
-  <function>
-    <description>
-      Returns a subset of a string following a specific substring.
-    </description>
-    <name>substringAfter</name>
-    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
-    <function-signature>java.lang.String substringAfter(java.lang.String, java.lang.String)</function-signature>
-    <example>
-      P.O. Box: ${fn:substringAfter(zip, "-")}
-    </example>
-  </function>
-
-  <function>
-    <description>
-      Returns a subset of a string before a specific substring.
-    </description>
-    <name>substringBefore</name>
-    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
-    <function-signature>java.lang.String substringBefore(java.lang.String, java.lang.String)</function-signature>
-    <example>
-      Zip (without P.O. Box): ${fn:substringBefore(zip, "-")}
-    </example>
-  </function>
-
-  <function>
-    <description>
-      Converts all of the characters of a string to lower case.
-    </description>
-    <name>toLowerCase</name>
-    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
-    <function-signature>java.lang.String toLowerCase(java.lang.String)</function-signature>
-    <example>
-      Product name: ${fn.toLowerCase(product.name)}
-    </example>
-  </function>
-
-  <function>
-    <description>
-      Converts all of the characters of a string to upper case.
-    </description>
-    <name>toUpperCase</name>
-    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
-    <function-signature>java.lang.String toUpperCase(java.lang.String)</function-signature>
-    <example>
-      Product name: ${fn.UpperCase(product.name)}
-    </example>
-  </function>
-
-  <function>
-    <description>
-      Removes white spaces from both ends of a string.
-    </description>
-    <name>trim</name>
-    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
-    <function-signature>java.lang.String trim(java.lang.String)</function-signature>
-    <example>
-      Name: ${fn.trim(name)}
-    </example>  
-  </function>
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+        version="2.0">
+
+    <description>JSTL 1.1 functions library</description>
+    <display-name>JSTL functions</display-name>
+    <tlib-version>1.1</tlib-version>
+    <short-name>fn</short-name>
+    <uri>http://java.sun.com/jsp/jstl/functions</uri>
+
+    <function>
+        <description>
+            Tests if an input string contains the specified substring.
+        </description>
+        <name>contains</name>
+        <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+        <function-signature>boolean contains(java.lang.String, java.lang.String)</function-signature>
+        <example>
+            &lt;c:if test="${fn:contains(name, searchString)}">
+        </example>
+    </function>
+
+    <function>
+        <description>
+            Tests if an input string contains the specified substring in a case insensitive way.
+        </description>
+        <name>containsIgnoreCase</name>
+        <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+        <function-signature>boolean containsIgnoreCase(java.lang.String, java.lang.String)</function-signature>
+        <example>
+            &lt;c:if test="${fn:containsIgnoreCase(name, searchString)}">
+        </example>
+    </function>
+
+    <function>
+        <description>
+            Tests if an input string ends with the specified suffix.
+        </description>
+        <name>endsWith</name>
+        <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+        <function-signature>boolean endsWith(java.lang.String, java.lang.String)</function-signature>
+        <example>
+            &lt;c:if test="${fn:endsWith(filename, ".txt")}">
+        </example>
+    </function>
+
+    <function>
+        <description>
+            Escapes characters that could be interpreted as XML markup.
+        </description>
+        <name>escapeXml</name>
+        <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+        <function-signature>java.lang.String escapeXml(java.lang.String)</function-signature>
+        <example>
+            ${fn:escapeXml(param:info)}
+        </example>
+    </function>
+
+    <function>
+        <description>
+            Returns the index withing a string of the first occurrence of a specified substring.
+        </description>
+        <name>indexOf</name>
+        <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+        <function-signature>int indexOf(java.lang.String, java.lang.String)</function-signature>
+        <example>
+            ${fn:indexOf(name, "-")}
+        </example>
+    </function>
+
+    <function>
+        <description>
+            Joins all elements of an array into a string.
+        </description>
+        <name>join</name>
+        <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+        <function-signature>java.lang.String join(java.lang.String[], java.lang.String)</function-signature>
+        <example>
+            ${fn:join(array, ";")}
+        </example>
+    </function>
+
+    <function>
+        <description>
+            Returns the number of items in a collection, or the number of characters in a string.
+        </description>
+        <name>length</name>
+        <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+        <function-signature>int length(java.lang.Object)</function-signature>
+        <example>
+            You have ${fn:length(shoppingCart.products)} in your shopping cart.
+        </example>
+    </function>
+
+    <function>
+        <description>
+            Returns a string resulting from replacing in an input string all occurrences
+            of a "before" string into an "after" substring.
+        </description>
+        <name>replace</name>
+        <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+        <function-signature>java.lang.String replace(java.lang.String, java.lang.String, java.lang.String)
+        </function-signature>
+        <example>
+            ${fn:replace(text, "-", "&#149;")}
+        </example>
+    </function>
+
+    <function>
+        <description>
+            Splits a string into an array of substrings.
+        </description>
+        <name>split</name>
+        <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+        <function-signature>java.lang.String[] split(java.lang.String, java.lang.String)</function-signature>
+        <example>
+            ${fn:split(customerNames, ";")}
+        </example>
+    </function>
+
+    <function>
+        <description>
+            Tests if an input string starts with the specified prefix.
+        </description>
+        <name>startsWith</name>
+        <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+        <function-signature>boolean startsWith(java.lang.String, java.lang.String)</function-signature>
+        <example>
+            &lt;c:if test="${fn:startsWith(product.id, "100-")}">
+        </example>
+    </function>
+
+    <function>
+        <description>
+            Returns a subset of a string.
+        </description>
+        <name>substring</name>
+        <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+        <function-signature>java.lang.String substring(java.lang.String, int, int)</function-signature>
+        <example>
+            P.O. Box: ${fn:substring(zip, 6, -1)}
+        </example>
+    </function>
+
+    <function>
+        <description>
+            Returns a subset of a string following a specific substring.
+        </description>
+        <name>substringAfter</name>
+        <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+        <function-signature>java.lang.String substringAfter(java.lang.String, java.lang.String)</function-signature>
+        <example>
+            P.O. Box: ${fn:substringAfter(zip, "-")}
+        </example>
+    </function>
+
+    <function>
+        <description>
+            Returns a subset of a string before a specific substring.
+        </description>
+        <name>substringBefore</name>
+        <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+        <function-signature>java.lang.String substringBefore(java.lang.String, java.lang.String)</function-signature>
+        <example>
+            Zip (without P.O. Box): ${fn:substringBefore(zip, "-")}
+        </example>
+    </function>
+
+    <function>
+        <description>
+            Converts all of the characters of a string to lower case.
+        </description>
+        <name>toLowerCase</name>
+        <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+        <function-signature>java.lang.String toLowerCase(java.lang.String)</function-signature>
+        <example>
+            Product name: ${fn.toLowerCase(product.name)}
+        </example>
+    </function>
+
+    <function>
+        <description>
+            Converts all of the characters of a string to upper case.
+        </description>
+        <name>toUpperCase</name>
+        <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+        <function-signature>java.lang.String toUpperCase(java.lang.String)</function-signature>
+        <example>
+            Product name: ${fn.UpperCase(product.name)}
+        </example>
+    </function>
+
+    <function>
+        <description>
+            Removes white spaces from both ends of a string.
+        </description>
+        <name>trim</name>
+        <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+        <function-signature>java.lang.String trim(java.lang.String)</function-signature>
+        <example>
+            Name: ${fn.trim(name)}
+        </example>
+    </function>
 
 </taglib>

Modified: tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/permittedTaglibs.tld
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/permittedTaglibs.tld?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/permittedTaglibs.tld (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/permittedTaglibs.tld Sat Nov 20 17:57:45 2010
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <taglib xmlns="http://java.sun.com/xml/ns/j2ee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
-    version="2.0">
-  <description>
-    Restricts JSP pages to the JSTL tag libraries
-  </description>    
-  <display-name>permittedTaglibs</display-name>
-  <tlib-version>1.1</tlib-version>
-  <short-name>permittedTaglibs</short-name>
-  <uri>http://jakarta.apache.org/taglibs/standard/permittedTaglibs</uri>
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+        version="2.0">
+    <description>
+        Restricts JSP pages to the JSTL tag libraries
+    </description>
+    <display-name>permittedTaglibs</display-name>
+    <tlib-version>1.1</tlib-version>
+    <short-name>permittedTaglibs</short-name>
+    <uri>http://jakarta.apache.org/taglibs/standard/permittedTaglibs</uri>
 
-  <validator>
-    <validator-class>
-	javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
-    </validator-class>        
-    <init-param>
-      <description>
-        Whitespace-separated list of taglib URIs to permit.  This example
-	TLD for the Standard Taglib allows only JSTL 'el' taglibs to be
-	imported.
-      </description>        
-      <param-name>permittedTaglibs</param-name>
-      <param-value>
-	http://java.sun.com/jsp/jstl/core
-	http://java.sun.com/jsp/jstl/fmt
-	http://java.sun.com/jsp/jstl/sql
-	http://java.sun.com/jsp/jstl/xml
-      </param-value>
-    </init-param>
-  </validator>
+    <validator>
+        <validator-class>
+            javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
+        </validator-class>
+        <init-param>
+            <description>
+                Whitespace-separated list of taglib URIs to permit. This example
+                TLD for the Standard Taglib allows only JSTL 'el' taglibs to be
+                imported.
+            </description>
+            <param-name>permittedTaglibs</param-name>
+            <param-value>
+                http://java.sun.com/jsp/jstl/core
+                http://java.sun.com/jsp/jstl/fmt
+                http://java.sun.com/jsp/jstl/sql
+                http://java.sun.com/jsp/jstl/xml
+            </param-value>
+        </init-param>
+    </validator>
 </taglib>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message