This is an automated email from the ASF dual-hosted git repository.
rmaucher pushed a change to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 05b4e876e4 Clean-up
new 17234c387e Fix jspc handling of the full stop (--) argument
new f35f427c80 Fix jspc infinite loop with a trailing -trimSpaces argument
new b94d6b83e6 Stop the Ant compiler System.err capture when compilation
fails unexpectedly
new 84ec9f7800 Report compilation errors before removing the generated
source
new 46ce2c54d1 Match JSP pages in sub-directories in JspConfig.isJspPage
new e54527e0d4 Avoid NullPointerException when the JSP source cannot be
read for an error detail
new f2706e6e97 Correct the "unusable error detail" line number in
JavacErrorDetail
new 0ffa6fac2d Fix the jsp:attribute trim loop skipping nodes after removal
new f9393219de Avoid NullPointerException in include error path for
non-JAR pages
new 947f7f75ca Validate page directive buffer values against the JSP
specification
new bab89e9ac2 Match the JSP namespace exactly when detecting JSP documents
new f0545bb994 Extract the SMAP from the end of the compiled class file
new 380eb782f9 Report a translation error for an empty taglib URI
new 209fa2e3be Report a translation error for an invalid TLD jsp-version
new 744a6e74c5 Avoid NullPointerException when a cached TLD is removed
new 22c06ced0d Omit the id from validation messages without one
new a2e083c5b5 Reject jsp:element with multiple name attributes
new 48208e0c78 Correct the assignability check for Graal bean property
writes
new 5162412292 Avoid NullPointerException writing a null bean property
value
new 37a1db8eb7 Report bean getter and setter exceptions in GraalVM mode
new 3428bfa6a4 Keep the wrapped exception in the JSP EL exception cause
chain
new 1a7f7ad2c9 Correct the expression wrapper equals implementation
new 01817b9e15 Use the canonical enum name in optimized tag setter code
generation
new ac7142b626 Use the canonical enum name in the optimized string
interpreter
new 6fe39d64b6 Avoid NullPointerException releasing a PageContext when the
pool size changed
new 607192fa11 Avoid StringIndexOutOfBoundsException forwarding a relative
path from a slash-less servlet path
new fa2825827f Record JSP usage time on every request, fixing premature
idle unload
new 99083290a8 Avoid registering TLD listeners twice for a duplicate
taglib URI
new dad31835db Resolve JspC resources whose path contains URI-illegal
characters
new 553a8633b8 Avoid StringIndexOutOfBoundsException on an empty
content-type parameter
new 06acd5918f Expose the ForEach tag plugin loop variable as an Integer
new 9b1f916e3f Validate begin, end and step in the ForEach and ForTokens
tag plugins
new 2a0b5a1cd0 Fall back when c:when or c:otherwise has no choose parent
new a0de9017ce Compute the ForEach tag plugin's state flags per request
new 4ea3677f93 Share the Import tag plugin URL with its params via the
plugin context
new d18bcf61d1 Trim and escape the Out tag plugin body fallback
new 1e88dd946d Store the Set tag plugin deferred value in the variable
mapper
new e48a38e62c Fall back when the Set tag plugin has nowhere to set
new 437c0be2b6 Strip a trailing slash from the context in resolveUrl
new 64c4b06524 Share the Url and Redirect tag plugin URLs with their params
new ab1313f0cc Honour a FastRemovalDequeue maximum size of one
new bd9e004a37 Avoid NullPointerException rendering a null entry
new 511586603b Keep UniqueAttributesImpl tracking in step with its
attributes
new d5ea224b93 Build UniqueAttributesImpl.setAttributes() from the
incoming set
new 9e7d4a6a7a Match duplicate page directive attribute names exactly
new c15a98ec3d Java compatibility
The 46 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/jasper/JspC.java | 43 ++--
java/org/apache/jasper/compiler/AntCompiler.java | 169 ++++++-------
java/org/apache/jasper/compiler/JDTCompiler.java | 12 +-
java/org/apache/jasper/compiler/JavaCompiler.java | 12 +-
.../apache/jasper/compiler/JavacErrorDetail.java | 14 +-
java/org/apache/jasper/compiler/JspConfig.java | 2 +-
.../apache/jasper/compiler/JspDocumentParser.java | 3 +
java/org/apache/jasper/compiler/PageInfo.java | 10 +
.../apache/jasper/compiler/ParserController.java | 9 +-
java/org/apache/jasper/compiler/SmapUtil.java | 66 ++---
.../apache/jasper/compiler/TagLibraryInfoImpl.java | 4 +
.../apache/jasper/compiler/TagPluginManager.java | 9 +
java/org/apache/jasper/compiler/TldCache.java | 6 +
java/org/apache/jasper/compiler/Validator.java | 35 ++-
.../compiler/tagplugin/TagPluginContext.java | 5 +-
java/org/apache/jasper/el/JasperELResolver.java | 19 +-
java/org/apache/jasper/el/JspELException.java | 2 +-
java/org/apache/jasper/el/JspMethodExpression.java | 10 +-
.../jasper/el/JspMethodNotFoundException.java | 2 +-
.../jasper/el/JspPropertyNotFoundException.java | 2 +-
.../jasper/el/JspPropertyNotWritableException.java | 2 +-
java/org/apache/jasper/el/JspValueExpression.java | 10 +-
.../optimizations/ELInterpreterTagSetters.java | 5 +-
.../optimizations/StringInterpreterEnum.java | 5 +-
.../jasper/resources/LocalStrings.properties | 4 +
java/org/apache/jasper/runtime/JspFactoryImpl.java | 11 +-
.../org/apache/jasper/runtime/PageContextImpl.java | 6 +-
.../apache/jasper/servlet/JspCServletContext.java | 37 ++-
.../apache/jasper/servlet/JspServletWrapper.java | 11 +-
java/org/apache/jasper/servlet/TldScanner.java | 12 +-
java/org/apache/jasper/tagplugins/jstl/Util.java | 18 +-
.../apache/jasper/tagplugins/jstl/core/Choose.java | 4 +
.../jasper/tagplugins/jstl/core/ForEach.java | 79 ++++--
.../jasper/tagplugins/jstl/core/ForTokens.java | 19 +-
.../apache/jasper/tagplugins/jstl/core/Import.java | 23 +-
.../jasper/tagplugins/jstl/core/Otherwise.java | 9 +
.../apache/jasper/tagplugins/jstl/core/Out.java | 24 ++
.../apache/jasper/tagplugins/jstl/core/Param.java | 37 ++-
.../jasper/tagplugins/jstl/core/Redirect.java | 19 +-
.../apache/jasper/tagplugins/jstl/core/Set.java | 37 ++-
.../apache/jasper/tagplugins/jstl/core/Url.java | 21 +-
.../apache/jasper/tagplugins/jstl/core/When.java | 12 +
.../org/apache/jasper/util/FastRemovalDequeue.java | 11 +-
.../apache/jasper/util/UniqueAttributesImpl.java | 59 ++++-
.../catalina/core/TestDefaultInstanceManager.java | 2 +-
test/org/apache/el/TestELInJsp.java | 2 +-
test/org/apache/jasper/TestJspC.java | 70 ++++++
.../apache/jasper/compiler/TestAntCompiler.java | 76 ++++++
.../apache/jasper/compiler/TestJavaCompiler.java | 114 +++++++++
.../jasper/compiler/TestJavacErrorDetail.java | 52 ++++
.../jasper/compiler/TestJspDocumentParser.java | 23 ++
test/org/apache/jasper/compiler/TestPageInfo.java | 79 ++++++
.../jasper/compiler/TestParserController.java | 110 +++++++++
test/org/apache/jasper/compiler/TestSmapUtil.java | 93 +++++++
.../jasper/compiler/TestTagLibraryInfoImpl.java | 18 ++
test/org/apache/jasper/compiler/TestTldCache.java | 49 ++++
test/org/apache/jasper/compiler/TestValidator.java | 71 ++++++
.../org/apache/jasper/el/TestJasperELResolver.java | 64 ++++-
.../optimizations/TestELInterpreterTagSetters.java | 29 +++
.../optimizations/TestStringInterpreterEnum.java | 20 ++
.../TestStringInterpreterTagSetters.java | 6 +
.../apache/jasper/runtime/TestPageContextImpl.java | 62 +++++
.../jasper/servlet/TestJspCServletContext.java | 44 ++++
test/org/apache/jasper/servlet/TestTldScanner.java | 61 +++++
.../jstl/core/{TestSet.java => TestChoose.java} | 24 +-
.../jasper/tagplugins/jstl/core/TestForEach.java | 54 ++++
.../jstl/core/{TestOut.java => TestForTokens.java} | 41 ++--
.../jasper/tagplugins/jstl/core/TestImport.java | 95 +++++++
.../jstl/core/{TestSet.java => TestOtherwise.java} | 29 +--
.../jasper/tagplugins/jstl/core/TestOut.java | 41 ++++
.../jasper/tagplugins/jstl/core/TestRedirect.java | 27 ++
.../jasper/tagplugins/jstl/core/TestSet.java | 61 +++++
.../jasper/tagplugins/jstl/core/TestUrl.java | 172 +++++++++++++
.../jstl/core/{TestForEach.java => TestWhen.java} | 38 ++-
...direct-tagPlugins.xml => import-tagPlugins.xml} | 8 +-
.../tagplugins/jstl/core/redirect-tagPlugins.xml | 4 +
...{redirect-tagPlugins.xml => url-tagPlugins.xml} | 16 +-
.../apache/jasper/util/TestFastRemovalDequeue.java | 82 +++++++
.../jasper/util/TestUniqueAttributesImpl.java | 273 +++++++++++++++++++++
.../WEB-INF/{bug53545.tld => invalid-version.tld} | 25 +-
.../WEB-INF/{bug53545.tld => null-id-tlv.tld} | 19 +-
test/webapp/WEB-INF/tag-setters.tld | 11 +
...biginteger.jsp => bug64872-nested-timeunit.jsp} | 8 +-
...-timeunit.jsp => bug64872b-nested-timeunit.jsp} | 6 +-
test/webapp/jsp/document/named-attribute-trim.jspx | 37 +++
.../pageinfo/buffer-min.jsp} | 2 +-
.../pageinfo/buffer-negative.jsp} | 2 +-
.../pageinfo/buffer-none.jsp} | 2 +-
.../pageinfo/buffer-overflow.jsp} | 2 +-
.../pageinfo/buffer-valid.jsp} | 2 +-
.../pageinfo/buffer-zero.jsp} | 2 +-
.../parsing/element-duplicate-name.jspx} | 5 +-
.../parsing/include-invalid-uri.jsp} | 7 +-
.../parsing/taglib-empty-uri.jsp} | 7 +-
.../jsp/parsing/taglib-invalid-version.jsp} | 7 +-
.../parsing/taglib-null-id-tlv.jsp} | 8 +-
.../webapp/jstl/{redirect.jsp => choose-basic.jsp} | 11 +-
.../foreach-begin-negative.jsp} | 6 +-
.../redirect.tag => jstl/foreach-end-negative.jsp} | 7 +-
.../redirect.tag => jstl/foreach-numeric-var.jsp} | 5 +-
.../redirect.tag => jstl/foreach-step-zero.jsp} | 6 +-
.../fortokens-begin-negative.jsp} | 6 +-
.../redirect.tag => jstl/fortokens-step-zero.jsp} | 6 +-
.../jstl/{redirect.jsp => import-clobber.jsp} | 11 +-
.../jstl/redirect.tag => jstl/import-nested.jsp} | 8 +-
.../jstl/redirect.tag => jstl/import-params.jsp} | 8 +-
.../jstl/import-target.jsp} | 9 +-
.../otherwise-outside-choose.jsp} | 7 +-
test/webapp/jstl/out-body.jsp | 38 +++
test/webapp/jstl/redirect-params.jsp | 22 ++
test/webapp/jstl/set-deferred.jsp | 39 +++
test/webapp/jstl/set-no-var-target.jsp | 24 ++
test/webapp/jstl/url-clobber.jsp | 23 ++
test/webapp/jstl/url-context-slash.jsp | 25 ++
test/webapp/jstl/url-nested.jsp | 20 ++
test/webapp/jstl/url-param-fallback-nested.jsp | 22 ++
test/webapp/jstl/url-param-nested-if.jsp | 25 ++
test/webapp/jstl/url-params.jsp | 22 ++
.../redirect.tag => jstl/when-outside-choose.jsp} | 7 +-
webapps/docs/changelog.xml | 98 ++++++++
120 files changed, 3089 insertions(+), 437 deletions(-)
create mode 100644 test/org/apache/jasper/compiler/TestAntCompiler.java
create mode 100644 test/org/apache/jasper/compiler/TestJavaCompiler.java
create mode 100644 test/org/apache/jasper/compiler/TestJavacErrorDetail.java
create mode 100644 test/org/apache/jasper/compiler/TestPageInfo.java
create mode 100644 test/org/apache/jasper/compiler/TestParserController.java
create mode 100644 test/org/apache/jasper/compiler/TestSmapUtil.java
copy test/org/apache/jasper/tagplugins/jstl/core/{TestSet.java =>
TestChoose.java} (67%)
copy test/org/apache/jasper/tagplugins/jstl/core/{TestOut.java =>
TestForTokens.java} (54%)
create mode 100644 test/org/apache/jasper/tagplugins/jstl/core/TestImport.java
copy test/org/apache/jasper/tagplugins/jstl/core/{TestSet.java =>
TestOtherwise.java} (66%)
create mode 100644 test/org/apache/jasper/tagplugins/jstl/core/TestUrl.java
copy test/org/apache/jasper/tagplugins/jstl/core/{TestForEach.java =>
TestWhen.java} (60%)
copy test/org/apache/jasper/tagplugins/jstl/core/{redirect-tagPlugins.xml =>
import-tagPlugins.xml} (72%)
copy test/org/apache/jasper/tagplugins/jstl/core/{redirect-tagPlugins.xml =>
url-tagPlugins.xml} (55%)
create mode 100644 test/org/apache/jasper/util/TestUniqueAttributesImpl.java
copy test/webapp/WEB-INF/{bug53545.tld => invalid-version.tld} (55%)
copy test/webapp/WEB-INF/{bug53545.tld => null-id-tlv.tld} (68%)
copy test/webapp/bug6nnnn/{bug64872-biginteger.jsp =>
bug64872-nested-timeunit.jsp} (81%)
copy test/webapp/bug6nnnn/{bug64872b-timeunit.jsp =>
bug64872b-nested-timeunit.jsp} (86%)
create mode 100644 test/webapp/jsp/document/named-attribute-trim.jspx
copy test/webapp/{jstl/redirect-target.jsp => jsp/pageinfo/buffer-min.jsp}
(96%)
copy test/webapp/{jstl/redirect-target.jsp =>
jsp/pageinfo/buffer-negative.jsp} (96%)
copy test/webapp/{jstl/redirect-target.jsp => jsp/pageinfo/buffer-none.jsp}
(96%)
copy test/webapp/{jstl/redirect-target.jsp =>
jsp/pageinfo/buffer-overflow.jsp} (96%)
copy test/webapp/{jstl/redirect-target.jsp => jsp/pageinfo/buffer-valid.jsp}
(96%)
copy test/webapp/{jstl/redirect-target.jsp => jsp/pageinfo/buffer-zero.jsp}
(96%)
copy test/webapp/{WEB-INF/tags/no-jsp-root.tagx =>
jsp/parsing/element-duplicate-name.jspx} (86%)
copy test/webapp/{bug49nnn/bug49297MultiplePageEncoding2.jsp =>
jsp/parsing/include-invalid-uri.jsp} (84%)
copy test/webapp/{bug49nnn/bug49297MultiplePageEncoding2.jsp =>
jsp/parsing/taglib-empty-uri.jsp} (84%)
copy test/{webapp-servletsecurity-b/protected.jsp =>
webapp/jsp/parsing/taglib-invalid-version.jsp} (78%)
copy test/webapp/{bug49nnn/bug49297MultiplePageEncoding1.jsp =>
jsp/parsing/taglib-null-id-tlv.jsp} (81%)
copy test/webapp/jstl/{redirect.jsp => choose-basic.jsp} (74%)
copy test/webapp/{WEB-INF/tags/jstl/redirect.tag =>
jstl/foreach-begin-negative.jsp} (79%)
copy test/webapp/{WEB-INF/tags/jstl/redirect.tag =>
jstl/foreach-end-negative.jsp} (77%)
copy test/webapp/{WEB-INF/tags/jstl/redirect.tag =>
jstl/foreach-numeric-var.jsp} (80%)
copy test/webapp/{WEB-INF/tags/jstl/redirect.tag =>
jstl/foreach-step-zero.jsp} (78%)
copy test/webapp/{WEB-INF/tags/jstl/redirect.tag =>
jstl/fortokens-begin-negative.jsp} (78%)
copy test/webapp/{WEB-INF/tags/jstl/redirect.tag =>
jstl/fortokens-step-zero.jsp} (78%)
copy test/webapp/jstl/{redirect.jsp => import-clobber.jsp} (73%)
copy test/webapp/{WEB-INF/tags/jstl/redirect.tag => jstl/import-nested.jsp}
(76%)
copy test/webapp/{WEB-INF/tags/jstl/redirect.tag => jstl/import-params.jsp}
(76%)
copy test/{webapp-2.3/el-as-literal.jsp => webapp/jstl/import-target.jsp} (83%)
copy test/webapp/{WEB-INF/tags/jstl/redirect.tag =>
jstl/otherwise-outside-choose.jsp} (78%)
create mode 100644 test/webapp/jstl/out-body.jsp
create mode 100644 test/webapp/jstl/redirect-params.jsp
create mode 100644 test/webapp/jstl/set-deferred.jsp
create mode 100644 test/webapp/jstl/set-no-var-target.jsp
create mode 100644 test/webapp/jstl/url-clobber.jsp
create mode 100644 test/webapp/jstl/url-context-slash.jsp
create mode 100644 test/webapp/jstl/url-nested.jsp
create mode 100644 test/webapp/jstl/url-param-fallback-nested.jsp
create mode 100644 test/webapp/jstl/url-param-nested-if.jsp
create mode 100644 test/webapp/jstl/url-params.jsp
copy test/webapp/{WEB-INF/tags/jstl/redirect.tag =>
jstl/when-outside-choose.jsp} (77%)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
