This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 23ee190 Reword for clarity
23ee190 is described below
commit 23ee1901c85566ea9563206526ffa1ef2d7f7b70
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Mar 27 12:45:29 2020 +0000
Reword for clarity
---
java/jakarta/el/LocalStrings.properties | 2 +-
java/org/apache/jasper/resources/LocalStrings.properties | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/java/jakarta/el/LocalStrings.properties
b/java/jakarta/el/LocalStrings.properties
index 76e4fb8..cead8de 100644
--- a/java/jakarta/el/LocalStrings.properties
+++ b/java/jakarta/el/LocalStrings.properties
@@ -29,7 +29,7 @@ expressionFactory.readFailed=Failed to read [{0}]
importHandler.ambiguousImport=The class [{0}] could not be imported as it
conflicts with [{1}] which has already been imported
importHandler.ambiguousStaticImport=The static import [{0}] could not be
processed as it conflicts with [{1}] which has already been imported
importHandler.classNotFound=The class [{0}] could not be imported as it could
not be found
-importHandler.invalidClass=The class [{0}] must be public, non-abstract, not
an interface and (for Java 9+) in an exported package
+importHandler.invalidClass=The class [{0}] must be public, in an exported
package (for Java 9+), non-abstract and not an interface
importHandler.invalidClassName=Name of class to import [{0}] must include a
package
importHandler.invalidClassNameForStatic=The class [{0}] specified for static
import [{1}] is not valid
importHandler.invalidStaticName=Name of static method or field to import [{0}]
must include a class
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties
b/java/org/apache/jasper/resources/LocalStrings.properties
index 17a0ace..2443f05 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -212,8 +212,8 @@ jsp.error.tagdirective.badbodycontent=Invalid body-content
[{0}] in tag directiv
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"
jsp.error.tagfile.missingPath=Path not specified to tag file
-jsp.error.tagfile.nameFrom.badAttribute=The attribute directive (declared in
line [{1}] and whose name attribute is [{0}], the value of this
name-from-attribute attribute) must be of type java.lang.String, is "required"
and not a "rtexprvalue".
-jsp.error.tagfile.nameFrom.noAttribute=Cannot find an attribute directive with
a name attribute with a value [{0}], the value of this name-from-attribute
attribute.
+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.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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
