This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 5d47c04 Fix incorrect indent
new 0d421d6 Servlet API changes required to support errorOnELNotFound
new f6d14bb JSP API updates required to implement errorOnELNotFound
new 37bc60c Implement the new page/tag directive errorOnELNotFound
The 3 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:
.../descriptor/JspPropertyGroupDescriptor.java | 8 ++
.../jakarta/servlet/jsp/LocalStrings.properties | 2 +-
.../jakarta/servlet/jsp/el/NotFoundELResolver.java | 24 +++-
java/jakarta/servlet/jsp/resources/jspxml.dtd | 27 ++--
java/jakarta/servlet/jsp/resources/jspxml.xsd | 1 +
java/org/apache/jasper/compiler/Compiler.java | 4 +
java/org/apache/jasper/compiler/Generator.java | 15 +++
java/org/apache/jasper/compiler/JspConfig.java | 21 ++-
java/org/apache/jasper/compiler/PageInfo.java | 40 ++++++
.../apache/jasper/compiler/TagFileProcessor.java | 3 +-
java/org/apache/jasper/compiler/Validator.java | 15 +++
.../jasper/resources/LocalStrings.properties | 4 +
.../apache/jasper/runtime/JspContextWrapper.java | 9 ++
.../jasper/runtime/JspSourceDirectives.java} | 12 +-
.../org/apache/jasper/runtime/PageContextImpl.java | 6 +
.../util/descriptor/web/JspPropertyGroup.java | 6 +
.../web/JspPropertyGroupDescriptorImpl.java | 12 ++
.../tomcat/util/descriptor/web/WebRuleSet.java | 2 +
test/org/apache/jasper/compiler/TestJspConfig.java | 145 +++++++++++++++++++++
.../jasper/servlet/TestJspCServletContext.java | 2 +-
.../WEB-INF/tags/error-on-el-not-found-false.tag} | 7 +-
.../WEB-INF/tags/error-on-el-not-found-true.tag} | 7 +-
test/webapp/WEB-INF/web.xml | 8 ++
.../default.jsp} | 6 +-
.../page-directive-false.jsp} | 7 +-
.../page-directive-true.jsp} | 7 +-
.../jsp/errorOnELNotFound/tag-file-false.jsp} | 9 +-
.../jsp/errorOnELNotFound/tag-file-true.jsp} | 9 +-
.../web-xml-false.jsp} | 6 +-
.../web-xml-true.jsp} | 6 +-
webapps/docs/changelog.xml | 5 +
31 files changed, 387 insertions(+), 48 deletions(-)
copy res/META-INF/jasper-el.jar/services/jakarta.el.ExpressionFactory =>
java/jakarta/servlet/jsp/LocalStrings.properties (95%)
copy java/{jakarta/el/VariableMapper.java =>
org/apache/jasper/runtime/JspSourceDirectives.java} (74%)
copy test/{webapp-fragments/bug51396.jsp =>
webapp/WEB-INF/tags/error-on-el-not-found-false.tag} (93%)
copy test/{webapp-fragments/bug51396.jsp =>
webapp/WEB-INF/tags/error-on-el-not-found-true.tag} (93%)
copy test/webapp/jsp/{encoding/bom-none-prolog-none.jsp =>
errorOnELNotFound/default.jsp} (92%)
copy test/webapp/jsp/{encoding/bom-none-prolog-none.jsp =>
errorOnELNotFound/page-directive-false.jsp} (88%)
copy test/webapp/jsp/{encoding/bom-none-prolog-none.jsp =>
errorOnELNotFound/page-directive-true.jsp} (89%)
copy test/{deployment/dirContext/index.html =>
webapp/jsp/errorOnELNotFound/tag-file-false.jsp} (84%)
copy test/{deployment/dirContext/index.html =>
webapp/jsp/errorOnELNotFound/tag-file-true.jsp} (84%)
copy test/webapp/jsp/{encoding/bom-none-prolog-none.jsp =>
errorOnELNotFound/web-xml-false.jsp} (92%)
copy test/webapp/jsp/{encoding/bom-none-prolog-none.jsp =>
errorOnELNotFound/web-xml-true.jsp} (92%)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
