[tomcat] 01/04: Align with 10.1.x onwards

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 20ddf3e9a79583246f266bf696b3fb4230f8eb63
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Oct 6 10:56:26 2023 +0100

    Align with 10.1.x onwards
---
 java/org/apache/catalina/security/LocalStrings.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings.properties  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/security/LocalStrings.properties b/java/org/apache/catalina/security/LocalStrings.properties
index b2f6cdf023..2af8b37d12 100644
--- a/java/org/apache/catalina/security/LocalStrings.properties
+++ b/java/org/apache/catalina/security/LocalStrings.properties
@@ -25,4 +25,4 @@ listener.notServer=This listener must only be nested within Server elements, but
 
 tlsCertRenewalListener.notRenewed=[{0}], TLS virtual host [{1}] with name [{2}] that expires on [{3}] is overdue for renewal
 tlsCertRenewalListener.reloadFailed=[{0}], TLS virtual host [{1}] reload of TLS configuration failed
-tlsCertRenewalListener.reloadSuccess=[{0}], TLS virtual host [{1}] reloaded TLS configuration
\ No newline at end of file
+tlsCertRenewalListener.reloadSuccess=[{0}], TLS virtual host [{1}] reloaded TLS configuration
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties b/java/org/apache/jasper/resources/LocalStrings.properties
index fd5a8e020d..e48ea1ab64 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -212,6 +212,7 @@ jsp.error.tag.invalid.iselignored=Tag directive: invalid value for isELIgnored
 jsp.error.tag.invalid.trimdirectivewhitespaces=Tag directive: invalid value for trimDirectiveWhitespaces
 jsp.error.tag.language.nonjava=Tag directive: invalid language attribute
 jsp.error.tag.multi.pageencoding=Tag directive must not have multiple occurrences of pageencoding
+jsp.error.tagHandlerPool=Cannot create tag handler pool [{0}]
 jsp.error.tagdirective.badbodycontent=Invalid body-content [{0}] in tag directive
 jsp.error.tagfile.badSuffix=Missing ".tag" suffix in tag file path [{0}]
 jsp.error.tagfile.illegalPath=Illegal tag file path: [{0}], must start with "/WEB-INF/tags" or "/META-INF/tags"
@@ -219,7 +220,6 @@ jsp.error.tagfile.missingPath=Path not specified to tag file
 jsp.error.tagfile.nameFrom.badAttribute=The attribute directive declared at line [{1}] with name [{0}] that matches the name-from-attribute value of this variable directive must be of type java.lang.String, must be "required" and must not be a "rtexprvalue".
 jsp.error.tagfile.nameFrom.noAttribute=Cannot find an attribute directive with a name [{0}] that matches the name-from-attribute value of this variable directive
 jsp.error.tagfile.nameNotUnique=The value of [{0}] and the value of [{1}] in line [{2}] are the same.
-jsp.error.tagHandlerPool=Cannot create tag handler pool [{0}]
 jsp.error.taglibDirective.absUriCannotBeResolved=The absolute uri: [{0}] cannot be resolved in either web.xml or the jar files deployed with this application
 jsp.error.taglibDirective.both_uri_and_tagdir=Both 'uri' and 'tagdir' attributes specified
 jsp.error.taglibDirective.missing.location=Neither 'uri' nor 'tagdir' attribute specified


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