[taglibs-standard] 06/12: Merge tag 'upstream/1.2.5'

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Jul 26 09:31:21 UTC 2016


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository taglibs-standard.

commit b6840da68cb4a0233f687bccb1fe91cc933ddee0
Merge: 19a1369 9366b72
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jul 20 17:07:42 2016 +0200

    Merge tag 'upstream/1.2.5'
    
    Upstream version 1.2.5

 CHANGES.txt                                        |   89 +
 DEPENDENCIES                                       |   11 +
 NOTICE                                             |    5 +-
 README_bin.txt                                     |  116 +
 README_src.txt                                     |   59 +
 RELEASING                                          |   42 +
 build-tools/pom.xml                                |   43 +
 .../src/main/resources/taglibs/checkstyle.xml      |   64 +
 common.properties                                  |  104 -
 compat/pom.xml                                     |  185 ++
 .../standard/tag/compat/core/ForEachTag.java       |   90 +
 .../standard/tag/compat/core/ForTokensTag.java     |  100 +
 .../taglibs/standard/tag/compat/core/IfTag.java    |   48 +
 .../standard/tag/compat/core/ImportTag.java        |   67 +
 .../taglibs/standard/tag/compat/core/OutTag.java   |   79 +
 .../taglibs/standard/tag/compat/core/ParamTag.java |   56 +
 .../standard/tag/compat/core/RedirectTag.java      |   58 +
 .../taglibs/standard/tag/compat/core/SetTag.java   |   75 +
 .../taglibs/standard/tag/compat/core/UrlTag.java   |   58 +
 .../taglibs/standard/tag/compat/core/WhenTag.java  |   48 +
 .../taglibs/standard/tag/compat/fmt/BundleTag.java |   56 +
 .../standard/tag/compat/fmt/FormatDateTag.java     |   86 +
 .../standard/tag/compat/fmt/FormatNumberTag.java   |  119 +
 .../standard/tag/compat/fmt/MessageTag.java        |   60 +
 .../taglibs/standard/tag/compat/fmt/ParamTag.java  |   50 +
 .../standard/tag/compat/fmt/ParseDateTag.java      |   94 +
 .../standard/tag/compat/fmt/ParseNumberTag.java    |   82 +
 .../tag/compat/fmt/RequestEncodingTag.java         |   49 +
 .../standard/tag/compat/fmt/SetBundleTag.java      |   49 +
 .../standard/tag/compat/fmt/SetLocaleTag.java      |   56 +
 .../standard/tag/compat/fmt/SetTimeZoneTag.java    |   49 +
 .../standard/tag/compat/fmt/TimeZoneTag.java       |   49 +
 .../standard/tag/compat/sql/DateParamTag.java      |   58 +
 .../taglibs/standard/tag/compat/sql/ParamTag.java  |   49 +
 .../taglibs/standard/tag/compat/sql/QueryTag.java  |   72 +
 .../standard/tag/compat/sql/SetDataSourceTag.java  |   78 +
 .../standard/tag/compat/sql/TransactionTag.java    |   59 +
 .../taglibs/standard/tag/compat/sql/UpdateTag.java |   57 +
 .../taglibs/standard/tag/compat/xml/ExprTag.java   |   49 +
 .../taglibs/standard/tag/compat/xml/ParamTag.java  |   56 +
 .../taglibs/standard/tag/compat/xml/ParseTag.java  |   64 +
 .../standard/tag/compat/xml/TransformTag.java      |   79 +
 .../taglibs/standard/tlv/compat/JstlELCoreTLV.java |   28 +
 .../taglibs/standard/tlv/compat/JstlELFmtTLV.java  |   28 +
 .../taglibs/standard/tlv/compat/JstlELSqlTLV.java  |   28 +
 .../taglibs/standard/tlv/compat/JstlELXmlTLV.java  |   28 +
 compat/src/main/resources/META-INF/c-1_0.tld       |  432 ++++
 compat/src/main/resources/META-INF/fmt-1_0.tld     |  458 ++++
 compat/src/main/resources/META-INF/sql-1_0.tld     |  229 ++
 compat/src/main/resources/META-INF/x-1_0.tld       |  289 +++
 impl/pom.xml                                       |  181 ++
 .../java/org/apache/taglibs/standard/Version.java  |  121 +
 .../taglibs/standard/functions/Functions.java      |  338 +++
 .../taglibs/standard/resources/Resources.java      |   77 +
 .../taglibs/standard/tag/common/core/CatchTag.java |   27 +-
 .../standard/tag/common/core/ChooseTag.java        |   27 +-
 .../standard/tag/common/core/DeclareTag.java       |   19 +-
 .../standard/tag/common/core/ForEachSupport.java   |  237 ++
 .../standard/tag/common/core/ForTokensSupport.java |   57 +-
 .../standard/tag/common/core/ImportSupport.java    |  572 +++++
 .../tag/common/core/NullAttributeException.java    |   15 +-
 .../standard/tag/common/core/OtherwiseTag.java     |   15 +-
 .../standard/tag/common/core/OutSupport.java       |  138 ++
 .../standard/tag/common/core/ParamParent.java      |   13 +-
 .../standard/tag/common/core/ParamSupport.java     |  196 ++
 .../standard/tag/common/core/RedirectSupport.java  |   73 +-
 .../standard/tag/common/core/RemoveTag.java        |   47 +-
 .../standard/tag/common/core/SetSupport.java       |  291 +++
 .../standard/tag/common/core/UrlSupport.java       |  136 +-
 .../taglibs/standard/tag/common/core/Util.java     |  175 ++
 .../standard/tag/common/core/WhenTagSupport.java   |   37 +-
 .../standard/tag/common/fmt/BundleSupport.java     |  332 +++
 .../standard/tag/common/fmt/FormatDateSupport.java |  198 ++
 .../tag/common/fmt/FormatNumberSupport.java        |  352 +++
 .../standard/tag/common/fmt/LocaleUtil.java        |  103 +
 .../standard/tag/common/fmt/MessageSupport.java    |  223 ++
 .../standard/tag/common/fmt/ParamSupport.java      |   79 +-
 .../standard/tag/common/fmt/ParseDateSupport.java  |  238 ++
 .../tag/common/fmt/ParseNumberSupport.java         |  208 ++
 .../tag/common/fmt/RequestEncodingSupport.java     |   80 +-
 .../standard/tag/common/fmt/SetBundleSupport.java  |   48 +-
 .../standard/tag/common/fmt/SetLocaleSupport.java  |  401 ++++
 .../tag/common/fmt/SetTimeZoneSupport.java         |   75 +-
 .../standard/tag/common/fmt/TimeZoneSupport.java   |  108 +-
 .../standard/tag/common/sql/DataSourceUtil.java    |   73 +-
 .../standard/tag/common/sql/DataSourceWrapper.java |  157 ++
 .../tag/common/sql/DateParamTagSupport.java        |   68 +-
 .../standard/tag/common/sql/ParamTagSupport.java   |   62 +
 .../standard/tag/common/sql/QueryTagSupport.java   |  325 +++
 .../standard/tag/common/sql/ResultImpl.java        |   75 +-
 .../tag/common/sql/SetDataSourceTagSupport.java    |   55 +-
 .../tag/common/sql/TransactionTagSupport.java      |  209 ++
 .../standard/tag/common/sql/UpdateTagSupport.java  |  201 +-
 .../standard/tag/common/xml/ExprSupport.java       |   73 +
 .../standard/tag/common/xml/ForEachTag.java        |  129 ++
 .../taglibs/standard/tag/common/xml/IfTag.java     |   61 +
 .../standard/tag/common/xml/JSTLVariableStack.java |  132 ++
 .../standard/tag/common/xml/ParamSupport.java      |   55 +-
 .../standard/tag/common/xml/ParseSupport.java      |  208 ++
 .../taglibs/standard/tag/common/xml/SetTag.java    |   87 +
 .../standard/tag/common/xml/TransformSupport.java  |  268 +++
 .../taglibs/standard/tag/common/xml/WhenTag.java   |   60 +
 .../taglibs/standard/tag/common/xml/XalanUtil.java |   90 +
 .../taglibs/standard/tag/rt/core/ForEachTag.java   |   32 +-
 .../taglibs/standard/tag/rt/core/ForTokensTag.java |   41 +-
 .../apache/taglibs/standard/tag/rt/core/IfTag.java |   19 +-
 .../taglibs/standard/tag/rt/core/ImportTag.java    |   16 +-
 .../taglibs/standard/tag/rt/core/OutTag.java       |   49 +-
 .../taglibs/standard/tag/rt/core/ParamTag.java     |   15 +-
 .../taglibs/standard/tag/rt/core/RedirectTag.java  |   15 +-
 .../taglibs/standard/tag/rt/core/SetTag.java       |   78 +
 .../taglibs/standard/tag/rt/core/UrlTag.java       |   15 +-
 .../taglibs/standard/tag/rt/core/WhenTag.java      |   19 +-
 .../taglibs/standard/tag/rt/fmt/BundleTag.java     |   15 +-
 .../taglibs/standard/tag/rt/fmt/FormatDateTag.java |   19 +-
 .../standard/tag/rt/fmt/FormatNumberTag.java       |   39 +-
 .../taglibs/standard/tag/rt/fmt/MessageTag.java    |   17 +-
 .../taglibs/standard/tag/rt/fmt/ParamTag.java      |   16 +-
 .../taglibs/standard/tag/rt/fmt/ParseDateTag.java  |   38 +-
 .../standard/tag/rt/fmt/ParseNumberTag.java        |   38 +-
 .../standard/tag/rt/fmt/RequestEncodingTag.java    |   14 +-
 .../taglibs/standard/tag/rt/fmt/SetBundleTag.java  |   14 +-
 .../taglibs/standard/tag/rt/fmt/SetLocaleTag.java  |   15 +-
 .../standard/tag/rt/fmt/SetTimeZoneTag.java        |   14 +-
 .../taglibs/standard/tag/rt/fmt/TimeZoneTag.java   |   14 +-
 .../taglibs/standard/tag/rt/sql/DateParamTag.java  |   19 +-
 .../taglibs/standard/tag/rt/sql/ParamTag.java      |   17 +-
 .../taglibs/standard/tag/rt/sql/QueryTag.java      |   23 +-
 .../standard/tag/rt/sql/SetDataSourceTag.java      |   26 +-
 .../standard/tag/rt/sql/TransactionTag.java        |   28 +-
 .../taglibs/standard/tag/rt/sql/UpdateTag.java     |   21 +-
 .../taglibs/standard/tag/rt/xml/ExprTag.java       |   16 +-
 .../taglibs/standard/tag/rt/xml/ParamTag.java      |   15 +-
 .../taglibs/standard/tag/rt/xml/ParseTag.java      |   20 +-
 .../taglibs/standard/tag/rt/xml/TransformTag.java  |   23 +-
 .../apache/taglibs/standard/tei/DeclareTEI.java    |   27 +-
 .../apache/taglibs/standard/tei/ForEachTEI.java    |   21 +-
 .../org/apache/taglibs/standard/tei/ImportTEI.java |   21 +-
 .../org/apache/taglibs/standard/tei/Util.java      |   13 +-
 .../apache/taglibs/standard/tei/XmlParseTEI.java   |   59 +
 .../taglibs/standard/tei/XmlTransformTEI.java      |   28 +-
 .../apache/taglibs/standard/tlv/JstlBaseTLV.java   |  352 +++
 .../apache/taglibs/standard/tlv/JstlCoreTLV.java   |  355 +++
 .../apache/taglibs/standard/tlv/JstlFmtTLV.java    |  275 +++
 .../apache/taglibs/standard/tlv/JstlSqlTLV.java    |  251 ++
 .../apache/taglibs/standard/tlv/JstlXmlTLV.java    |  334 +++
 .../apache/taglibs/standard/util/EscapeXML.java    |  207 ++
 .../taglibs/standard/util/ExpressionUtil.java      |   87 +
 .../taglibs/standard/util/UnclosableWriter.java    |   47 +
 .../org/apache/taglibs/standard/util/UrlUtil.java  |   95 +
 .../org/apache/taglibs/standard/util/XmlUtil.java  |  403 ++++
 impl/src/main/resources/META-INF/c-1_0-rt.tld      |  409 ++++
 impl/src/main/resources/META-INF/c-1_1.tld         |  578 +++++
 impl/src/main/resources/META-INF/c.tld             |  587 +++++
 impl/src/main/resources/META-INF/fmt-1_0-rt.tld    |  419 ++++
 impl/src/main/resources/META-INF/fmt.tld           |  686 ++++++
 impl/src/main/resources/META-INF/fn.tld            |  222 ++
 .../main/resources/META-INF/permittedTaglibs.tld   |   49 +
 impl/src/main/resources/META-INF/scriptfree.tld    |   66 +
 impl/src/main/resources/META-INF/sql-1_0-rt.tld    |  204 ++
 impl/src/main/resources/META-INF/sql.tld           |  304 +++
 impl/src/main/resources/META-INF/x-1_0-rt.tld      |  272 +++
 impl/src/main/resources/META-INF/x.tld             |  463 ++++
 .../standard/resources/Resources.properties        |   68 +-
 .../standard/resources/Resources_ja.properties     |   15 +
 .../org/apache/taglibs/standard/VersionTest.java   |   41 +-
 .../taglibs/standard/functions/FunctionsTest.java  |  137 ++
 .../taglibs/standard/resources/ResourcesTest.java  |   40 +
 .../standard/tag/common/core/SetSupportTest.java   |  424 ++++
 .../standard/tag/common/fmt/BundleSupportTest.java |   47 +
 .../standard/tag/common/fmt/LocaleUtilTest.java    |   61 +
 .../standard/tag/common/xml/ExprSupportTest.java   |  106 +
 .../standard/tag/common/xml/ForEachTagTest.java    |  251 ++
 .../tag/common/xml/JSTLVariableStackTest.java      |  164 ++
 .../tag/common/xml/TransformSupportTest.java       |   58 +
 .../standard/tag/common/xml/XalanUtilTest.java     |   72 +
 .../taglibs/standard/tag/rt/core/OutTagTest.java   |   34 +
 .../taglibs/standard/util/EscapeXMLTest.java       |  221 ++
 .../apache/taglibs/standard/util/XmlUtilTest.java  |   52 +
 .../taglibs/standard/tag/common/xml/test.xml       |   25 +
 jstlel/pom.xml                                     |  186 ++
 .../taglibs/standard/lang/jstl/AndOperator.java    |   96 +
 .../standard/lang/jstl/ArithmeticOperator.java     |   60 +
 .../taglibs/standard/lang/jstl/ArraySuffix.java    |  307 +++
 .../lang/jstl/BeanInfoIndexedProperty.java         |   87 +
 .../standard/lang/jstl/BeanInfoManager.java        |  369 +++
 .../standard/lang/jstl/BeanInfoProperty.java       |   80 +
 .../taglibs/standard/lang/jstl/BinaryOperator.java |   76 +
 .../lang/jstl/BinaryOperatorExpression.java        |  145 ++
 .../taglibs/standard/lang/jstl/BooleanLiteral.java |   68 +
 .../taglibs/standard/lang/jstl/Coercions.java      |  918 ++++++++
 .../taglibs/standard/lang/jstl/ComplexValue.java   |  118 +
 .../taglibs/standard/lang/jstl/Constants.java      |  199 ++
 .../taglibs/standard/lang/jstl/DivideOperator.java |   97 +
 .../taglibs/standard/lang/jstl/ELEvaluator.java    |  513 +++++
 .../taglibs/standard/lang/jstl/ELException.java    |   99 +
 .../apache/taglibs/standard/lang/jstl/ELParser.jj  |   34 +
 .../taglibs/standard/lang/jstl/EmptyOperator.java  |  165 ++
 .../taglibs/standard/lang/jstl/EnumeratedMap.java  |  175 ++
 .../standard/lang/jstl/EqualityOperator.java       |   51 +
 .../taglibs/standard/lang/jstl/EqualsOperator.java |   66 +
 .../taglibs/standard/lang/jstl/Evaluator.java      |  161 ++
 .../taglibs/standard/lang/jstl/Expression.java     |   56 +
 .../standard/lang/jstl/ExpressionString.java       |  109 +
 .../standard/lang/jstl/FloatingPointLiteral.java   |   59 +
 .../standard/lang/jstl/FunctionInvocation.java     |  159 ++
 .../standard/lang/jstl/GreaterThanOperator.java    |  108 +
 .../lang/jstl/GreaterThanOrEqualsOperator.java     |  108 +
 .../standard/lang/jstl/ImplicitObjects.java        |  588 +++++
 .../standard/lang/jstl/IntegerDivideOperator.java  |   97 +
 .../taglibs/standard/lang/jstl/IntegerLiteral.java |   59 +
 .../standard/lang/jstl/JSTLVariableResolver.java   |   95 +
 .../standard/lang/jstl/LessThanOperator.java       |  108 +
 .../lang/jstl/LessThanOrEqualsOperator.java        |  108 +
 .../apache/taglibs/standard/lang/jstl/Literal.java |   72 +
 .../apache/taglibs/standard/lang/jstl/Logger.java  |  737 ++++++
 .../taglibs/standard/lang/jstl/MinusOperator.java  |   77 +
 .../standard/lang/jstl/ModulusOperator.java        |  125 +
 .../standard/lang/jstl/MultiplyOperator.java       |   77 +
 .../taglibs/standard/lang/jstl/NamedValue.java     |   86 +
 .../standard/lang/jstl/NotEqualsOperator.java      |   66 +
 .../taglibs/standard/lang/jstl/NotOperator.java    |   70 +
 .../taglibs/standard/lang/jstl/NullLiteral.java    |   55 +
 .../taglibs/standard/lang/jstl/OrOperator.java     |   96 +
 .../taglibs/standard/lang/jstl/PlusOperator.java   |   77 +
 .../standard/lang/jstl/PrimitiveObjects.java       |  226 ++
 .../taglibs/standard/lang/jstl/PropertySuffix.java |   93 +
 .../standard/lang/jstl/RelationalOperator.java     |   70 +
 .../taglibs/standard/lang/jstl/StringLiteral.java  |  167 ++
 .../standard/lang/jstl/UnaryMinusOperator.java     |  118 +
 .../taglibs/standard/lang/jstl/UnaryOperator.java  |   55 +
 .../lang/jstl/UnaryOperatorExpression.java         |  137 ++
 .../taglibs/standard/lang/jstl/ValueSuffix.java    |   54 +
 .../standard/lang/jstl/VariableResolver.java       |   80 +-
 .../standard/lang/jstl/parser/ELParser.java        |    1 +
 .../lang/jstl/parser/ELParserConstants.java        |    1 +
 .../lang/jstl/parser/ELParserTokenManager.java     |    1 +
 .../standard/lang/jstl/parser/ParseException.java  |    1 +
 .../lang/jstl/parser/SimpleCharStream.java         |    1 +
 .../taglibs/standard/lang/jstl/parser/Token.java   |    1 +
 .../standard/lang/jstl/parser/TokenMgrError.java   |    1 +
 .../standard/lang/support/ExpressionEvaluator.java |   46 +-
 .../lang/support/ExpressionEvaluatorManager.java   |  133 ++
 .../standard/tag/el/core/ExpressionUtil.java       |   60 +
 .../taglibs/standard/tag/el/core/ForEachTag.java   |   65 +-
 .../taglibs/standard/tag/el/core/ForTokensTag.java |   80 +-
 .../apache/taglibs/standard/tag/el/core/IfTag.java |   34 +-
 .../taglibs/standard/tag/el/core/ImportTag.java    |   49 +-
 .../taglibs/standard/tag/el/core/OutTag.java       |   95 +
 .../taglibs/standard/tag/el/core/ParamTag.java     |   34 +-
 .../taglibs/standard/tag/el/core/RedirectTag.java  |   35 +-
 .../taglibs/standard/tag/el/core/SetTag.java       |   82 +
 .../taglibs/standard/tag/el/core/UrlTag.java       |   35 +-
 .../taglibs/standard/tag/el/core/WhenTag.java      |   34 +-
 .../taglibs/standard/tag/el/fmt/BundleTag.java     |   43 +-
 .../taglibs/standard/tag/el/fmt/FormatDateTag.java |  103 +-
 .../standard/tag/el/fmt/FormatNumberTag.java       |  265 +++
 .../taglibs/standard/tag/el/fmt/MessageTag.java    |   51 +-
 .../taglibs/standard/tag/el/fmt/ParamTag.java      |   34 +-
 .../taglibs/standard/tag/el/fmt/ParseDateTag.java  |  142 +-
 .../standard/tag/el/fmt/ParseNumberTag.java        |  120 +-
 .../standard/tag/el/fmt/RequestEncodingTag.java    |   32 +-
 .../taglibs/standard/tag/el/fmt/SetBundleTag.java  |   30 +-
 .../taglibs/standard/tag/el/fmt/SetLocaleTag.java  |   41 +-
 .../standard/tag/el/fmt/SetTimeZoneTag.java        |   32 +-
 .../taglibs/standard/tag/el/fmt/TimeZoneTag.java   |   30 +-
 .../taglibs/standard/tag/el/sql/DateParamTag.java  |   36 +-
 .../taglibs/standard/tag/el/sql/ParamTag.java      |   29 +-
 .../taglibs/standard/tag/el/sql/QueryTag.java      |   60 +-
 .../standard/tag/el/sql/SetDataSourceTag.java      |   47 +-
 .../standard/tag/el/sql/TransactionTag.java        |   45 +-
 .../taglibs/standard/tag/el/sql/UpdateTag.java     |   41 +-
 .../taglibs/standard/tag/el/xml/ExprTag.java       |   41 +-
 .../taglibs/standard/tag/el/xml/ParamTag.java      |   34 +-
 .../taglibs/standard/tag/el/xml/ParseTag.java      |   52 +-
 .../taglibs/standard/tag/el/xml/TransformTag.java  |   61 +-
 .../taglibs/standard/tlv/el/JstlELCoreTLV.java     |   28 +
 .../taglibs/standard/tlv/el/JstlELFmtTLV.java      |   28 +
 .../taglibs/standard/tlv/el/JstlELSqlTLV.java      |   28 +
 .../taglibs/standard/tlv/el/JstlELXmlTLV.java      |   28 +
 .../taglibs/standard/tlv/el/ValidationUtil.java    |   32 +
 jstlel/src/main/resources/META-INF/c-1_0.tld       |  432 ++++
 jstlel/src/main/resources/META-INF/fmt-1_0.tld     |  458 ++++
 jstlel/src/main/resources/META-INF/sql-1_0.tld     |  229 ++
 jstlel/src/main/resources/META-INF/x-1_0.tld       |  289 +++
 .../standard/lang/jstl/Resources.properties        |   15 +
 .../standard/lang/jstl/Resources_ja.properties     |   15 +
 .../taglibs/standard/lang/jstl/test/Bean1.java     |  370 +++
 .../taglibs/standard/lang/jstl/test/Bean2.java     |   63 +
 .../standard/lang/jstl/test/Bean2Editor.java       |   42 +
 .../standard/lang/jstl/test/EvaluationTest.java    |  736 ++++++
 .../standard/lang/jstl/test/PageContextImpl.java   |  299 +++
 .../standard/lang/jstl/test/ParserTest.java        |  132 ++
 .../lang/jstl/test/StaticFunctionTest.java         |   96 +
 .../standard/lang/jstl/test/beans/Factory.java     |   54 +
 .../lang/jstl/test/beans/PrivateBean1a.java        |   22 +-
 .../lang/jstl/test/beans/PrivateBean2b.java        |   26 +-
 .../lang/jstl/test/beans/PrivateBean2c.java        |   22 +-
 .../lang/jstl/test/beans/PrivateBean2d.java        |   22 +-
 .../standard/lang/jstl/test/beans/PublicBean1.java |   26 +-
 .../lang/jstl/test/beans/PublicBean1b.java         |   22 +-
 .../lang/jstl/test/beans/PublicBean2a.java         |   26 +-
 .../lang/jstl/test/beans/PublicInterface2.java     |   24 +-
 .../standard/lang/jstl/test/parserTests.txt        |   43 +-
 .../standard/lang/jstl/test/parserTestsOutput.txt  |   20 +-
 pom.xml                                            |  117 +
 spec/pom.xml                                       |  129 ++
 .../jsp/jstl/core/ConditionalTagSupport.java       |   86 +-
 .../java}/javax/servlet/jsp/jstl/core/Config.java  |  278 ++-
 .../jsp/jstl/core/IndexedValueExpression.java      |  109 +
 .../servlet/jsp/jstl/core/IteratedExpression.java  |  162 ++
 .../jsp/jstl/core/IteratedValueExpression.java     |   94 +
 .../java}/javax/servlet/jsp/jstl/core/LoopTag.java |   14 +-
 .../javax/servlet/jsp/jstl/core/LoopTagStatus.java |   29 +-
 .../servlet/jsp/jstl/core/LoopTagSupport.java      |  253 ++-
 .../javax/servlet/jsp/jstl/fmt/JakartaInline.java  |  437 ++++
 .../javax/servlet/jsp/jstl/fmt/LocaleSupport.java  |  157 +-
 .../servlet/jsp/jstl/fmt/LocalizationContext.java  |   49 +-
 .../java}/javax/servlet/jsp/jstl/sql/Result.java   |   54 +-
 .../javax/servlet/jsp/jstl/sql/ResultImpl.java     |   48 +-
 .../javax/servlet/jsp/jstl/sql/ResultSupport.java  |   31 +-
 .../servlet/jsp/jstl/sql/SQLExecutionTag.java      |   27 +-
 .../javax/servlet/jsp/jstl/tlv/PageParser.java     |   85 +
 .../servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java  |  166 ++
 .../javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java  |  243 ++
 .../jsp/jstl/tlv/PermittedTaglibsTLVTest.java      |  100 +
 src/assembly/bin.xml                               |   43 +
 src/assembly/src.xml                               |   36 +
 standard-test/pom.xml                              |  233 ++
 standard-test/src/main/webapp/WEB-INF/web.xml      |   25 +
 .../taglibs/standard/functions/TestEndsWith.jsp    |   21 +
 .../taglibs/standard/tag/el/core/Test34109.jsp     |   21 +
 .../taglibs/standard/tag/el/core/Test37466.jsp     |   39 +
 .../taglibs/standard/tag/el/core/Test37466.xml     |   19 +
 .../taglibs/standard/tag/el/core/TestOutTag.jsp    |   33 +
 .../taglibs/standard/tag/el/core/TestSetTag.jsp    |   20 +
 .../taglibs/standard/tag/el/fmt/TestDateTag.jsp    |   34 +
 .../taglibs/standard/tag/el/sql/Test33054.jsp      |   33 +
 .../taglibs/standard/tag/el/sql/Test43831.jsp      |   37 +
 .../taglibs/standard/tag/el/xml/Test30068.jsp      |   46 +
 .../taglibs/standard/tag/el/xml/Test30068.xml      |   20 +
 .../taglibs/standard/tag/el/xml/Test35216.jsp      |   24 +
 .../taglibs/standard/functions/TestEndsWith.java   |   27 +-
 .../taglibs/standard/tag/el/core/Test34109.java    |   48 +
 .../taglibs/standard/tag/el/core/Test37466.java    |   55 +
 .../taglibs/standard/tag/el/core/TestOutTag.java   |   40 +
 .../taglibs/standard/tag/el/core/TestSetTag.java   |   13 +-
 .../taglibs/standard/tag/el/fmt/TestDateTag.java   |   52 +
 .../taglibs/standard/tag/el/sql/Test33054.java     |   71 +
 .../taglibs/standard/tag/el/sql/Test43831.java     |   73 +
 .../taglibs/standard/tag/el/xml/Test30068.java     |   50 +
 .../taglibs/standard/tag/el/xml/Test35216.java     |   31 +-
 .../apache/taglibs/standard/testutil/TestUtil.java |   60 +
 .../taglibs/standard/tag/el/core/TestOutTag.txt    |   16 +
 standard/.#build.xml.1.43                          |  490 ----
 standard/README_bin.txt                            |  138 --
 standard/README_src.txt                            |  344 ---
 standard/build-tests.xml                           |  393 ----
 standard/build.xml                                 |  488 ----
 standard/build_sample_standard.properties          |   80 -
 standard/conf/c-1_0-rt.tld                         |  393 ----
 standard/conf/c-1_0.tld                            |  416 ----
 standard/conf/c.tld                                |  563 -----
 standard/conf/fmt-1_0-rt.tld                       |  403 ----
 standard/conf/fmt-1_0.tld                          |  442 ----
 standard/conf/fmt.tld                              |  671 ------
 standard/conf/fn.tld                               |  207 --
 standard/conf/permittedTaglibs.tld                 |   34 -
 standard/conf/scriptfree.tld                       |   51 -
 standard/conf/sql-1_0-rt.tld                       |  188 --
 standard/conf/sql-1_0.tld                          |  213 --
 standard/conf/sql.tld                              |  289 ---
 standard/conf/x-1_0-rt.tld                         |  256 ---
 standard/conf/x-1_0.tld                            |  273 ---
 standard/conf/x.tld                                |  448 ----
 standard/doc/conf/web.xml                          |   18 -
 standard/doc/web/GettingStarted.html               |  343 ---
 standard/doc/web/ReleaseNotes.html                 |  750 ------
 standard/doc/web/index.html                        |   83 -
 .../taglibs/standard/examples/beans/Address.java   |  162 --
 .../taglibs/standard/examples/beans/Customer.java  |  221 --
 .../taglibs/standard/examples/beans/Customers.java |  101 -
 .../taglibs/standard/examples/i18n/Resources.java  |   23 -
 .../standard/examples/i18n/Resources_de.java       |   23 -
 .../standard/examples/i18n/Resources_fr.java       |   23 -
 .../standard/examples/i18n/Resources_it.java       |   17 -
 .../taglibs/standard/examples/startup/Init.java    |  147 --
 .../standard/examples/taglib/CustomerFmtTag.java   |  117 -
 .../standard/examples/taglib/DefaultLocaleTag.java |   42 -
 .../standard/examples/taglib/EscapeHtmlTag.java    |  136 --
 .../taglibs/standard/examples/taglib/EvenTag.java  |   45 -
 .../taglibs/standard/examples/taglib/FileTag.java  |  120 -
 .../standard/examples/taglib/Functions.java        |   70 -
 .../standard/examples/taglib/LocalesTag.java       |   62 -
 .../examples/taglib/NullAttributeException.java    |   42 -
 .../taglibs/standard/examples/taglib/OddTag.java   |   49 -
 .../standard/examples/taglib/ResourceTag.java      |  139 --
 .../standard/examples/taglib/UsCustomerTag.java    |   93 -
 .../taglibs/standard/examples/util/IOBean.java     |   59 -
 .../util/ServletResponseWrapperForWriter.java      |   62 -
 .../taglibs/standard/examples/util/Util.java       |   56 -
 standard/examples/web/ShowSource.jsp               |   36 -
 .../examples/web/Templates/ExamplesTemplate.dwt    |   38 -
 .../examples/web/WEB-INF/tlds/jstl-examples.tld    |  165 --
 standard/examples/web/WEB-INF/web.xml              |   22 -
 standard/examples/web/conditionals/Choose.jsp      |   27 -
 .../examples/web/conditionals/CustomLogicTag.jsp   |   36 -
 .../examples/web/conditionals/FailureLocal.jsp     |   27 -
 standard/examples/web/conditionals/If.jsp          |   19 -
 standard/examples/web/conditionals/index.html      |   59 -
 standard/examples/web/elsupport/Out.jsp            |   34 -
 standard/examples/web/elsupport/Set.jsp            |   33 -
 standard/examples/web/elsupport/Set2.jsp           |   16 -
 standard/examples/web/elsupport/index.html         |   60 -
 standard/examples/web/format/Demo.jsp              |  118 -
 standard/examples/web/format/FormatDateTime.jsp    |   74 -
 .../web/format/FormatDateTimeBrowserLocale.jsp     |   73 -
 standard/examples/web/format/FormatNumber.jsp      |   41 -
 .../web/format/FormatNumberBrowserLocale.jsp       |   52 -
 standard/examples/web/format/GermanLocale.jsp      |   18 -
 .../examples/web/format/GermanUmlautCorrect.jsp    |   20 -
 .../examples/web/format/GermanUmlautIncorrect.jsp  |   18 -
 standard/examples/web/format/ItalianLocale.jsp     |   15 -
 .../examples/web/format/MissingResourceBundle.jsp  |   22 -
 .../examples/web/format/ParametricReplacement.jsp  |   66 -
 standard/examples/web/format/PrefixAttribute.jsp   |   16 -
 standard/examples/web/format/RequestEncoding.jsp   |   18 -
 standard/examples/web/format/UndefinedKey.jsp      |   15 -
 standard/examples/web/format/index.html            |   89 -
 standard/examples/web/functions/EscapeXml.jsp      |   39 -
 standard/examples/web/functions/Length.jsp         |   37 -
 standard/examples/web/functions/Replace.jsp        |   55 -
 standard/examples/web/functions/SplitJoin.jsp      |   87 -
 .../web/functions/StringCapitalization.jsp         |   55 -
 standard/examples/web/functions/StringSubset.jsp   |  183 --
 .../examples/web/functions/SubstringContained.jsp  |  227 --
 standard/examples/web/functions/Trim.jsp           |   48 -
 standard/examples/web/functions/index.html         |   90 -
 standard/examples/web/global.css                   |    4 -
 standard/examples/web/images/code.gif              |  Bin 292 -> 0 bytes
 standard/examples/web/images/execute.gif           |  Bin 1242 -> 0 bytes
 standard/examples/web/images/return.gif            |  Bin 1231 -> 0 bytes
 standard/examples/web/import/Absolute.jsp          |   19 -
 standard/examples/web/import/AbsoluteFtp.jsp       |   18 -
 standard/examples/web/import/ContextRelative.jsp   |   20 -
 standard/examples/web/import/Encode.jsp            |   47 -
 .../examples/web/import/EncodeContextRelative.jsp  |   20 -
 standard/examples/web/import/ExposeString.jsp      |   20 -
 .../examples/web/import/ExposeStringRelative.jsp   |   17 -
 standard/examples/web/import/LocalSample.jsp       |   14 -
 standard/examples/web/import/Param.jsp             |   13 -
 standard/examples/web/import/Relative.jsp          |   18 -
 standard/examples/web/import/StartSlash.jsp        |   16 -
 standard/examples/web/import/index.html            |   99 -
 standard/examples/web/import/index.jsp             |   94 -
 standard/examples/web/import/links.html            |   46 -
 standard/examples/web/import/relativeLinks.html    |   10 -
 standard/examples/web/import/session.jsp           |   33 -
 standard/examples/web/index.html                   |  142 --
 standard/examples/web/iterators/Collaboration.jsp  |   42 -
 standard/examples/web/iterators/DataTypes.jsp      |   40 -
 standard/examples/web/iterators/Extensability.jsp  |   45 -
 standard/examples/web/iterators/ForTokens.jsp      |   25 -
 standard/examples/web/iterators/Simple.jsp         |   18 -
 standard/examples/web/iterators/SimpleRange.jsp    |   16 -
 standard/examples/web/iterators/Status.jsp         |   53 -
 standard/examples/web/iterators/index.html         |   78 -
 standard/examples/web/misc/IteratorTest.jsp        |   60 -
 standard/examples/web/misc/index.html              |   46 -
 standard/examples/web/sql/DriverSetup.jsp          |   22 -
 standard/examples/web/sql/QueryDirect.jsp          |   86 -
 standard/examples/web/sql/QueryIterate.jsp         |  104 -
 standard/examples/web/sql/QueryParam.jsp           |   72 -
 standard/examples/web/sql/Transaction.jsp          |   60 -
 standard/examples/web/sql/Update.jsp               |  115 -
 standard/examples/web/sql/index.jsp                |  100 -
 standard/examples/web/sql/links.html               |   32 -
 standard/examples/web/sql/session.jsp              |   17 -
 .../examples/web/tlv/PermittedTaglibsError.jsp     |   26 -
 standard/examples/web/tlv/PermittedTaglibsOk.jsp   |   30 -
 standard/examples/web/tlv/ScriptFreeError.jsp      |   15 -
 standard/examples/web/tlv/ScriptFreeOk.jsp         |   25 -
 standard/examples/web/tlv/index.html               |   67 -
 standard/examples/web/xml/Filter.jsp               |   33 -
 standard/examples/web/xml/ForEach.jsp              |   83 -
 standard/examples/web/xml/ForEachDoc.xml           |   15 -
 standard/examples/web/xml/If.jsp                   |   42 -
 standard/examples/web/xml/Out.jsp                  |   66 -
 standard/examples/web/xml/Parse.jsp                |   30 -
 standard/examples/web/xml/ParseWithEntities.jsp    |   27 -
 standard/examples/web/xml/Set.jsp                  |   31 -
 standard/examples/web/xml/Transform.jsp            |   58 -
 .../examples/web/xml/TransformWithInclusion.jsp    |   32 -
 standard/examples/web/xml/When.jsp                 |   68 -
 standard/examples/web/xml/games.xml                |   31 -
 standard/examples/web/xml/included.xml             |    3 -
 standard/examples/web/xml/includedStylesheet.xsl   |    8 -
 standard/examples/web/xml/index.html               |   81 -
 .../servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java  |  194 --
 .../javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java  |  245 --
 .../src/org/apache/taglibs/standard/Version.java   |  130 --
 .../standard/extra/spath/ASCII_CharStream.java     |  377 ---
 .../extra/spath/ASCII_UCodeESC_CharStream.java     |  520 -----
 .../taglibs/standard/extra/spath/AbsolutePath.java |   49 -
 .../standard/extra/spath/AttributePredicate.java   |   56 -
 .../standard/extra/spath/ParseException.java       |  191 --
 .../apache/taglibs/standard/extra/spath/Path.java  |   36 -
 .../taglibs/standard/extra/spath/Predicate.java    |   27 -
 .../taglibs/standard/extra/spath/RelativePath.java |   56 -
 .../taglibs/standard/extra/spath/SPathFilter.java  |  272 ---
 .../taglibs/standard/extra/spath/SPathParser.java  |  533 -----
 .../taglibs/standard/extra/spath/SPathParser.jj    |  297 ---
 .../standard/extra/spath/SPathParserConstants.java |   52 -
 .../extra/spath/SPathParserTokenManager.java       |  683 ------
 .../taglibs/standard/extra/spath/SPathTag.java     |   87 -
 .../apache/taglibs/standard/extra/spath/Step.java  |  131 --
 .../apache/taglibs/standard/extra/spath/Token.java |   81 -
 .../standard/extra/spath/TokenMgrError.java        |  133 --
 .../apache/taglibs/standard/extra/spath/spath.tld  |   35 -
 .../taglibs/standard/functions/Functions.java      |  234 --
 .../taglibs/standard/lang/jstl/AndOperator.java    |  103 -
 .../standard/lang/jstl/ArithmeticOperator.java     |   63 -
 .../taglibs/standard/lang/jstl/ArraySuffix.java    |  315 ---
 .../lang/jstl/BeanInfoIndexedProperty.java         |  144 --
 .../standard/lang/jstl/BeanInfoManager.java        |  382 ----
 .../standard/lang/jstl/BeanInfoProperty.java       |   77 -
 .../taglibs/standard/lang/jstl/BinaryOperator.java |   81 -
 .../lang/jstl/BinaryOperatorExpression.java        |  138 --
 .../taglibs/standard/lang/jstl/BooleanLiteral.java |   73 -
 .../taglibs/standard/lang/jstl/Coercions.java      | 1024 ---------
 .../taglibs/standard/lang/jstl/ComplexValue.java   |  115 -
 .../taglibs/standard/lang/jstl/Constants.java      |  203 --
 .../taglibs/standard/lang/jstl/DivideOperator.java |  102 -
 .../taglibs/standard/lang/jstl/ELEvaluator.java    |  473 ----
 .../taglibs/standard/lang/jstl/ELException.java    |  109 -
 .../taglibs/standard/lang/jstl/EmptyOperator.java  |  107 -
 .../taglibs/standard/lang/jstl/EnumeratedMap.java  |  182 --
 .../standard/lang/jstl/EqualityOperator.java       |   54 -
 .../taglibs/standard/lang/jstl/EqualsOperator.java |   71 -
 .../taglibs/standard/lang/jstl/Evaluator.java      |  167 --
 .../taglibs/standard/lang/jstl/Expression.java     |   58 -
 .../standard/lang/jstl/ExpressionString.java       |  112 -
 .../standard/lang/jstl/FloatingPointLiteral.java   |   64 -
 .../standard/lang/jstl/FunctionInvocation.java     |  144 --
 .../standard/lang/jstl/GreaterThanOperator.java    |  118 -
 .../lang/jstl/GreaterThanOrEqualsOperator.java     |  118 -
 .../standard/lang/jstl/ImplicitObjects.java        | 1142 ----------
 .../standard/lang/jstl/IntegerDivideOperator.java  |  102 -
 .../taglibs/standard/lang/jstl/IntegerLiteral.java |   64 -
 .../standard/lang/jstl/JSTLVariableResolver.java   |  108 -
 .../standard/lang/jstl/LessThanOperator.java       |  118 -
 .../lang/jstl/LessThanOrEqualsOperator.java        |  118 -
 .../apache/taglibs/standard/lang/jstl/Literal.java |   72 -
 .../apache/taglibs/standard/lang/jstl/Logger.java  |  776 -------
 .../taglibs/standard/lang/jstl/MinusOperator.java  |   83 -
 .../standard/lang/jstl/ModulusOperator.java        |  131 --
 .../standard/lang/jstl/MultiplyOperator.java       |   83 -
 .../taglibs/standard/lang/jstl/NamedValue.java     |   90 -
 .../standard/lang/jstl/NotEqualsOperator.java      |   71 -
 .../taglibs/standard/lang/jstl/NotOperator.java    |   75 -
 .../taglibs/standard/lang/jstl/NullLiteral.java    |   59 -
 .../taglibs/standard/lang/jstl/OrOperator.java     |  103 -
 .../taglibs/standard/lang/jstl/PlusOperator.java   |   83 -
 .../standard/lang/jstl/PrimitiveObjects.java       |  242 --
 .../taglibs/standard/lang/jstl/PropertySuffix.java |   95 -
 .../standard/lang/jstl/RelationalOperator.java     |   73 -
 .../taglibs/standard/lang/jstl/StringLiteral.java  |  183 --
 .../standard/lang/jstl/UnaryMinusOperator.java     |  135 --
 .../taglibs/standard/lang/jstl/UnaryOperator.java  |   58 -
 .../lang/jstl/UnaryOperatorExpression.java         |  132 --
 .../taglibs/standard/lang/jstl/ValueSuffix.java    |   56 -
 .../taglibs/standard/lang/jstl/test/Bean1.java     |  276 ---
 .../taglibs/standard/lang/jstl/test/Bean2.java     |   62 -
 .../standard/lang/jstl/test/Bean2Editor.java       |   45 -
 .../standard/lang/jstl/test/EvaluationTest.java    |  413 ----
 .../standard/lang/jstl/test/PageContextImpl.java   |  301 ---
 .../standard/lang/jstl/test/ParserTest.java        |  254 ---
 .../lang/jstl/test/StaticFunctionTests.java        |   96 -
 .../standard/lang/jstl/test/beans/Factory.java     |   63 -
 .../standard/lang/jstl/test/evaluationTests.txt    | 1056 ---------
 .../lang/jstl/test/evaluationTestsOutput.txt       | 2390 --------------------
 .../lang/support/ExpressionEvaluatorManager.java   |  149 --
 .../taglibs/standard/resources/Resources.java      |  126 --
 .../standard/tag/common/core/ForEachSupport.java   |  400 ----
 .../standard/tag/common/core/ImportSupport.java    |  552 -----
 .../standard/tag/common/core/OutSupport.java       |  204 --
 .../standard/tag/common/core/ParamSupport.java     |  178 --
 .../standard/tag/common/core/SetSupport.java       |  210 --
 .../taglibs/standard/tag/common/core/Util.java     |  293 ---
 .../standard/tag/common/fmt/BundleSupport.java     |  328 ---
 .../standard/tag/common/fmt/FormatDateSupport.java |  207 --
 .../tag/common/fmt/FormatNumberSupport.java        |  338 ---
 .../standard/tag/common/fmt/MessageSupport.java    |  216 --
 .../standard/tag/common/fmt/ParseDateSupport.java  |  232 --
 .../tag/common/fmt/ParseNumberSupport.java         |  201 --
 .../standard/tag/common/fmt/SetLocaleSupport.java  |  463 ----
 .../standard/tag/common/sql/DataSourceWrapper.java |  115 -
 .../taglibs/standard/tag/common/sql/DriverTag.java |  137 --
 .../standard/tag/common/sql/ParamTagSupport.java   |   61 -
 .../standard/tag/common/sql/QueryTagSupport.java   |  299 ---
 .../tag/common/sql/TransactionTagSupport.java      |  206 --
 .../standard/tag/common/xml/ExprSupport.java       |   86 -
 .../standard/tag/common/xml/ForEachTag.java        |  122 -
 .../taglibs/standard/tag/common/xml/IfTag.java     |   76 -
 .../tag/common/xml/JSTLPrefixResolver.java         |  153 --
 .../standard/tag/common/xml/JSTLXPathAPI.java      |  303 ---
 .../standard/tag/common/xml/ParseSupport.java      |  314 ---
 .../taglibs/standard/tag/common/xml/SetTag.java    |  107 -
 .../standard/tag/common/xml/TransformSupport.java  |  381 ----
 .../tag/common/xml/UnresolvableException.java      |   45 -
 .../taglibs/standard/tag/common/xml/WhenTag.java   |   76 -
 .../taglibs/standard/tag/common/xml/XPathUtil.java |  887 --------
 .../standard/tag/el/core/ExpressionUtil.java       |   56 -
 .../taglibs/standard/tag/el/core/OutTag.java       |  118 -
 .../taglibs/standard/tag/el/core/SetTag.java       |  129 --
 .../standard/tag/el/fmt/FormatNumberTag.java       |  250 --
 .../taglibs/standard/tag/rt/core/SetTag.java       |   47 -
 .../apache/taglibs/standard/tei/XmlParseTEI.java   |   53 -
 .../apache/taglibs/standard/tlv/JstlBaseTLV.java   |  337 ---
 .../apache/taglibs/standard/tlv/JstlCoreTLV.java   |  326 ---
 .../apache/taglibs/standard/tlv/JstlFmtTLV.java    |  255 ---
 .../apache/taglibs/standard/tlv/JstlSqlTLV.java    |  230 --
 .../apache/taglibs/standard/tlv/JstlXmlTLV.java    |  306 ---
 standard/test/conf/cactus.properties               |    6 -
 .../apache/taglibs/standard/testutil/TestUtil.java |   34 -
 standard/test/web/WEB-INF/web.xml                  |   44 -
 .../taglibs/standard/tag/el/core/TestSetTag.jsp    |    4 -
 standard/xml/intro.xml                             |  172 --
 628 files changed, 36858 insertions(+), 44788 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/taglibs-standard.git



More information about the pkg-java-commits mailing list