Added: tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/c-1_0.tld URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/c-1_0.tld?rev=1651034&view=auto ============================================================================== --- tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/c-1_0.tld (added) +++ tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/c-1_0.tld Mon Jan 12 04:20:20 2015 @@ -0,0 +1,432 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to You under the Apache License, Version 2.0 + ~ (the "License"); you may not use this file except in compliance with + ~ the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> +<!DOCTYPE taglib + 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>c</short-name> + <uri>http://java.sun.com/jstl/core</uri> + <display-name>JSTL core</display-name> + <description>JSTL 1.0 core library</description> + + <validator> + <validator-class> + org.apache.taglibs.standard.tlv.compat.JstlELCoreTLV + </validator-class> + <init-param> + <param-name>expressionAttributes</param-name> + <param-value> + out:value + out:default + out:escapeXml + if:test + import:url + import:context + import:charEncoding + forEach:items + forEach:begin + forEach:end + forEach:step + forTokens:items + forTokens:begin + forTokens:end + forTokens:step + param:encode + param:name + param:value + redirect:context + redirect:url + set:property + set:target + set:value + url:context + url:value + when:test + </param-value> + <description> + Whitespace-separated list of colon-separated token pairs + describing tag:attribute combinations that accept expressions. + The validator uses this information to determine which + attributes need their syntax validated. + </description> + </init-param> + </validator> + + <tag> + <name>catch</name> + <tag-class>org.apache.taglibs.standard.tag.common.core.CatchTag</tag-class> + <body-content>JSP</body-content> + <description> + Catches any Throwable that occurs in its body and optionally + exposes it. + </description> + <attribute> + <name>var</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>choose</name> + <tag-class>org.apache.taglibs.standard.tag.common.core.ChooseTag</tag-class> + <body-content>JSP</body-content> + <description> + Simple conditional tag that establishes a context for + mutually exclusive conditional operations, marked by + <when> and <otherwise> + </description> + </tag> + + <tag> + <name>out</name> + <tag-class>org.apache.taglibs.standard.tag.compat.core.OutTag</tag-class> + <body-content>JSP</body-content> + <description> + Like <%= ... >, but for expressions. + </description> + <attribute> + <name>value</name> + <required>true</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>default</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>escapeXml</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>if</name> + <tag-class>org.apache.taglibs.standard.tag.compat.core.IfTag</tag-class> + <body-content>JSP</body-content> + <description> + Simple conditional tag, which evalutes its body if the + supplied condition is true and optionally exposes a Boolean + scripting variable representing the evaluation of this condition + </description> + <attribute> + <name>test</name> + <required>true</required> + <rtexprvalue>false</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>import</name> + <tag-class>org.apache.taglibs.standard.tag.compat.core.ImportTag</tag-class> + <tei-class>org.apache.taglibs.standard.tei.ImportTEI</tei-class> + <body-content>JSP</body-content> + <description> + Retrieves an absolute or relative URL and exposes its contents + to either the page, a String in 'var', or a Reader in 'varReader'. + </description> + <attribute> + <name>url</name> + <required>true</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>var</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>scope</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>varReader</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>context</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>charEncoding</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>forEach</name> + <tag-class>org.apache.taglibs.standard.tag.compat.core.ForEachTag</tag-class> + <tei-class>org.apache.taglibs.standard.tei.ForEachTEI</tei-class> + <body-content>JSP</body-content> + <description> + The basic iteration tag, accepting many different + collection types and supporting subsetting and other + functionality + </description> + <attribute> + <name>items</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>begin</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>end</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>step</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>var</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>varStatus</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>forTokens</name> + <tag-class>org.apache.taglibs.standard.tag.compat.core.ForTokensTag</tag-class> + <body-content>JSP</body-content> + <description> + Iterates over tokens, separated by the supplied delimeters + </description> + <attribute> + <name>items</name> + <required>true</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>delims</name> + <required>true</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>begin</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>end</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>step</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>var</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>varStatus</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>otherwise</name> + <tag-class>org.apache.taglibs.standard.tag.common.core.OtherwiseTag</tag-class> + <body-content>JSP</body-content> + <description> + Subtag of <choose> that follows <when> tags + and runs only if all of the prior conditions evaluated to + 'false' + </description> + </tag> + + <tag> + <name>param</name> + <tag-class>org.apache.taglibs.standard.tag.compat.core.ParamTag</tag-class> + <body-content>JSP</body-content> + <description> + Adds a parameter to a containing 'import' tag's URL. + </description> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>value</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>redirect</name> + <tag-class>org.apache.taglibs.standard.tag.compat.core.RedirectTag</tag-class> + <body-content>JSP</body-content> + <description> + Redirects to a new URL. + </description> + <attribute> + <name>var</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>scope</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>url</name> + <required>true</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>context</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>remove</name> + <tag-class>org.apache.taglibs.standard.tag.common.core.RemoveTag</tag-class> + <body-content>empty</body-content> + <description> + Removes a scoped variable (from a particular scope, if specified). + </description> + <attribute> + <name>var</name> + <required>true</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>scope</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>set</name> + <tag-class>org.apache.taglibs.standard.tag.compat.core.SetTag</tag-class> + <body-content>JSP</body-content> + <description> + Sets the result of an expression evaluation in a 'scope' + </description> + <attribute> + <name>var</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>value</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>target</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>property</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>scope</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>url</name> + <tag-class>org.apache.taglibs.standard.tag.compat.core.UrlTag</tag-class> + <body-content>JSP</body-content> + <description> + Prints or exposes a URL with optional query parameters + (via the c:param tag). + </description> + <attribute> + <name>var</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>scope</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>value</name> + <required>true</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>context</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>when</name> + <tag-class>org.apache.taglibs.standard.tag.compat.core.WhenTag</tag-class> + <body-content>JSP</body-content> + <description> + Subtag of <choose> that includes its body if its + condition evalutes to 'true' + </description> + <attribute> + <name>test</name> + <required>true</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + </tag> + +</taglib>
Added: tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/fmt-1_0.tld URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/fmt-1_0.tld?rev=1651034&view=auto ============================================================================== --- tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/fmt-1_0.tld (added) +++ tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/fmt-1_0.tld Mon Jan 12 04:20:20 2015 @@ -0,0 +1,458 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to You under the Apache License, Version 2.0 + ~ (the "License"); you may not use this file except in compliance with + ~ the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> +<!DOCTYPE taglib + 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</short-name> + <uri>http://java.sun.com/jstl/fmt</uri> + <display-name>JSTL fmt</display-name> + <description>JSTL 1.0 i18n-capable formatting library</description> + + <validator> + <validator-class> + org.apache.taglibs.standard.tlv.compat.JstlELFmtTLV + </validator-class> + <init-param> + <param-name>expressionAttributes</param-name> + <param-value> + requestEncoding:value + setLocale:value + setLocale:variant + timeZone:value + setTimeZone:value + bundle:basename + bundle:prefix + setBundle:basename + message:key + message:bundle + param:value + formatNumber:value + formatNumber:pattern + formatNumber:currencyCode + formatNumber:currencySymbol + formatNumber:groupingUsed + formatNumber:maxIntegerDigits + formatNumber:minIntegerDigits + formatNumber:maxFractionDigits + formatNumber:minFractionDigits + parseNumber:value + parseNumber:pattern + parseNumber:parseLocale + parseNumber:integerOnly + formatDate:value + formatDate:pattern + formatDate:timeZone + parseDate:value + parseDate:pattern + parseDate:timeZone + parseDate:parseLocale + </param-value> + <description> + Whitespace-separated list of colon-separated token pairs + describing tag:attribute combinations that accept expressions. + The validator uses this information to determine which + attributes need their syntax validated. + </description> + </init-param> + </validator> + + <tag> + <name>requestEncoding</name> + <tag-class>org.apache.taglibs.standard.tag.compat.fmt.RequestEncodingTag</tag-class> + <body-content>empty</body-content> + <description> + Sets the request character encoding + </description> + <attribute> + <name>value</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>setLocale</name> + <tag-class>org.apache.taglibs.standard.tag.compat.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>false</rtexprvalue> + </attribute> + <attribute> + <name>variant</name> + <required>false</required> + <rtexprvalue>false</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.compat.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>false</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>setTimeZone</name> + <tag-class>org.apache.taglibs.standard.tag.compat.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>false</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.compat.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>false</rtexprvalue> + </attribute> + <attribute> + <name>prefix</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>setBundle</name> + <tag-class>org.apache.taglibs.standard.tag.compat.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>false</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.compat.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>false</rtexprvalue> + </attribute> + <attribute> + <name>bundle</name> + <required>false</required> + <rtexprvalue>false</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.compat.fmt.ParamTag</tag-class> + <body-content>JSP</body-content> + <description> + Supplies an argument for parametric replacement to a containing + <message> tag + </description> + <attribute> + <name>value</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>formatNumber</name> + <tag-class>org.apache.taglibs.standard.tag.compat.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>false</rtexprvalue> + </attribute> + <attribute> + <name>type</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>pattern</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>currencyCode</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>currencySymbol</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>groupingUsed</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>maxIntegerDigits</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>minIntegerDigits</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>maxFractionDigits</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>minFractionDigits</name> + <required>false</required> + <rtexprvalue>false</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.compat.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>false</rtexprvalue> + </attribute> + <attribute> + <name>type</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>pattern</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>parscompatocale</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>integerOnly</name> + <required>false</required> + <rtexprvalue>false</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.compat.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>false</rtexprvalue> + </attribute> + <attribute> + <name>type</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>dateStyle</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>timeStyle</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>pattern</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>timeZone</name> + <required>false</required> + <rtexprvalue>false</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.compat.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>false</rtexprvalue> + </attribute> + <attribute> + <name>type</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>dateStyle</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>timeStyle</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>pattern</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>timeZone</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>parscompatocale</name> + <required>false</required> + <rtexprvalue>false</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> Added: tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/sql-1_0.tld URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/sql-1_0.tld?rev=1651034&view=auto ============================================================================== --- tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/sql-1_0.tld (added) +++ tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/sql-1_0.tld Mon Jan 12 04:20:20 2015 @@ -0,0 +1,229 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to You under the Apache License, Version 2.0 + ~ (the "License"); you may not use this file except in compliance with + ~ the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> +<!DOCTYPE taglib + 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>sql</short-name> + <uri>http://java.sun.com/jstl/sql</uri> + <display-name>JSTL sql</display-name> + <description>JSTL 1.0 sql library</description> + + <validator> + <validator-class> + org.apache.taglibs.standard.tlv.compat.JstlELSqlTLV + </validator-class> + <init-param> + <param-name>expressionAttributes</param-name> + <param-value> + transaction:dataSource + transaction:isolation + query:sql + query:dataSource + query:startRow + query:maxRows + update:sql + update:dataSource + param:value + dateParam:value + dateParam:type + setDataSource:dataSource + setDataSource:driver + setDataSource:url + setDataSource:user + setDataSource:password + </param-value> + <description> + Whitespace-separated list of colon-separated token pairs + describing tag:attribute combinations that accept expressions. + The validator uses this information to determine which + attributes need their syntax validated. + </description> + </init-param> + </validator> + + <tag> + <name>transaction</name> + <tag-class>org.apache.taglibs.standard.tag.compat.sql.TransactionTag</tag-class> + <body-content>JSP</body-content> + <description> + Provides nested database action elements with a shared Connection, + set up to execute all statements as one transaction. + </description> + <attribute> + <name>dataSource</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>isolation</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>query</name> + <tag-class>org.apache.taglibs.standard.tag.compat.sql.QueryTag</tag-class> + <body-content>JSP</body-content> + <description> + Executes the SQL query defined in its body or through the + sql attribute. + </description> + <attribute> + <name>var</name> + <required>true</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>scope</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>sql</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>dataSource</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>startRow</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>maxRows</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>update</name> + <tag-class>org.apache.taglibs.standard.tag.compat.sql.UpdateTag</tag-class> + <body-content>JSP</body-content> + <description> + Executes the SQL update defined in its body or through the + sql attribute. + </description> + <attribute> + <name>var</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>scope</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>sql</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>dataSource</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>param</name> + <tag-class>org.apache.taglibs.standard.tag.compat.sql.ParamTag</tag-class> + <body-content>JSP</body-content> + <description> + Sets a parameter in an SQL statement to the specified value. + </description> + <attribute> + <name>value</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>dateParam</name> + <tag-class>org.apache.taglibs.standard.tag.compat.sql.DateParamTag</tag-class> + <body-content>empty</body-content> + <description> + Sets a parameter in an SQL statement to the specified java.util.Date val + ue. + </description> + <attribute> + <name>value</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>type</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>setDataSource</name> + <tag-class>org.apache.taglibs.standard.tag.compat.sql.SetDataSourceTag</tag-class> + <body-content>empty</body-content> + <description> + Creates a simple DataSource suitable only for prototyping. + </description> + <attribute> + <name>var</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>scope</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>dataSource</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>driver</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>url</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>user</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>password</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + </tag> +</taglib> Added: tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/x-1_0.tld URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/x-1_0.tld?rev=1651034&view=auto ============================================================================== --- tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/x-1_0.tld (added) +++ tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/x-1_0.tld Mon Jan 12 04:20:20 2015 @@ -0,0 +1,289 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to You under the Apache License, Version 2.0 + ~ (the "License"); you may not use this file except in compliance with + ~ the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> +<!DOCTYPE taglib + 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>x</short-name> + <uri>http://java.sun.com/jstl/xml</uri> + <display-name>JSTL XML</display-name> + <description>JSTL 1.0 XML library</description> + + <validator> + <validator-class> + org.apache.taglibs.standard.tlv.compat.JstlELXmlTLV + </validator-class> + <init-param> + <param-name>expressionAttributes</param-name> + <param-value> + out:escapeXml + parse:xml + parse:systemId + parse:filter + transform:xml + transform:xmlSystemId + transform:xslt + transform:xsltSystemId + transform:result + </param-value> + <description> + Whitespace-separated list of colon-separated token pairs + describing tag:attribute combinations that accept expressions. + The validator uses this information to determine which + attributes need their syntax validated. + </description> + </init-param> + </validator> + + <tag> + <name>choose</name> + <tag-class>org.apache.taglibs.standard.tag.common.core.ChooseTag</tag-class> + <body-content>JSP</body-content> + <description> + Simple conditional tag that establishes a context for + mutually exclusive conditional operations, marked by + <when> and <otherwise> + </description> + </tag> + + <tag> + <name>out</name> + <tag-class>org.apache.taglibs.standard.tag.compat.xml.ExprTag</tag-class> + <body-content>empty</body-content> + <description> + Like <%= ... >, but for XPath expressions. + </description> + <attribute> + <name>select</name> + <required>true</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>escapeXml</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>if</name> + <tag-class>org.apache.taglibs.standard.tag.common.xml.IfTag</tag-class> + <body-content>JSP</body-content> + <description> + XML conditional tag, which evalutes its body if the + supplied XPath expression evalutes to 'true' as a boolean + </description> + <attribute> + <name>select</name> + <required>true</required> + <rtexprvalue>false</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>forEach</name> + <tag-class>org.apache.taglibs.standard.tag.common.xml.ForEachTag</tag-class> + <body-content>JSP</body-content> + <description> + XML iteration tag. + </description> + <attribute> + <name>var</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>select</name> + <required>true</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>otherwise</name> + <tag-class>org.apache.taglibs.standard.tag.common.core.OtherwiseTag</tag-class> + <body-content>JSP</body-content> + <description> + Subtag of <choose> that follows <when> tags + and runs only if all of the prior conditions evaluated to + 'false' + </description> + </tag> + + <tag> + <name>param</name> + <tag-class>org.apache.taglibs.standard.tag.compat.xml.ParamTag</tag-class> + <body-content>JSP</body-content> + <description> + Adds a parameter to a containing 'transform' tag's Transformer + </description> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>value</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>parse</name> + <tag-class>org.apache.taglibs.standard.tag.compat.xml.ParseTag</tag-class> + <tei-class>org.apache.taglibs.standard.tei.XmlParseTEI</tei-class> + <body-content>JSP</body-content> + <description> + Parses XML content from 'source' attribute or 'body' + </description> + <attribute> + <name>var</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>varDom</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>scope</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>scopeDom</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>xml</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>systemId</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>filter</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>set</name> + <tag-class>org.apache.taglibs.standard.tag.common.xml.SetTag</tag-class> + <body-content>empty</body-content> + <description> + Saves the result of an XPath expression evaluation in a 'scope' + </description> + <attribute> + <name>var</name> + <required>true</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>select</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>scope</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>transform</name> + <tag-class>org.apache.taglibs.standard.tag.compat.xml.TransformTag</tag-class> + <tei-class>org.apache.taglibs.standard.tei.XmlTransformTEI</tei-class> + <body-content>JSP</body-content> + <description> + Conducts a transformation given a source XML document + and an XSLT stylesheet + </description> + <attribute> + <name>var</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>scope</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>result</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>xml</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>xmlSystemId</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>xslt</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + <attribute> + <name>xsltSystemId</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>when</name> + <tag-class>org.apache.taglibs.standard.tag.common.xml.WhenTag</tag-class> + <body-content>JSP</body-content> + <description> + Subtag of <choose> that includes its body if its + expression evalutes to 'true' + </description> + <attribute> + <name>select</name> + <required>true</required> + <rtexprvalue>false</rtexprvalue> + </attribute> + </tag> + +</taglib> Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/ExpressionUtil.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/ExpressionUtil.java?rev=1651034&r1=1651033&r2=1651034&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/ExpressionUtil.java (original) +++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/ExpressionUtil.java Mon Jan 12 04:20:20 2015 @@ -50,4 +50,38 @@ public class ExpressionUtil { JspApplicationContext appContext = JspFactory.getDefaultFactory().getJspApplicationContext(pageContext.getServletContext()); return appContext.getExpressionFactory(); } + + /** + * Evaluate a value expression. To support optional attributes, if the expression is null then + * null will be returned. + * + * @param expression the expression + * @param pageContext the context for the JSP + * @param <T> the expected type of the expression + * @return the result of evaluating the expression + */ + public static <T> T evaluate(ValueExpression expression, PageContext pageContext) { + if (expression == null) { + return null; + } + @SuppressWarnings("unchecked") + T value = (T) expression.getValue(pageContext.getELContext()); + return value; + } + + public static boolean evaluate(ValueExpression expression, PageContext pageContext, boolean fallback) { + if (expression == null) { + return fallback; + } + Boolean result = (Boolean) expression.getValue(pageContext.getELContext()); + return result == null ? fallback : result.booleanValue(); + } + + public static int evaluate(ValueExpression expression, PageContext pageContext, int fallback) { + if (expression == null) { + return fallback; + } + Integer result = (Integer) expression.getValue(pageContext.getELContext()); + return result == null ? fallback : result.intValue(); + } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
