This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 7937ac579c3b25aa42ab4962a1aba3c2a9ba60ba
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Mar 27 13:23:00 2020 +0000
REword for clarity
---
java/javax/el/LocalStrings.properties | 2 +-
.../apache/jasper/resources/LocalStrings.properties | 21 +++++++++++----------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/java/javax/el/LocalStrings.properties
b/java/javax/el/LocalStrings.properties
index 76e4fb8..cead8de 100644
--- a/java/javax/el/LocalStrings.properties
+++ b/java/javax/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 bc45b72..0736ae9 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -170,7 +170,7 @@ jsp.error.quotes.unterminated=Unterminated quotes
jsp.error.scripting.variable.missing_name=Unable to determine scripting
variable name from attribute [{0}]
jsp.error.security=Security initialization failed for context
jsp.error.servlet.destroy.failed=Exception during Servlet.destroy() for JSP
page
-jsp.error.servlet.invalid.method=JSPs only permit GET POST or HEAD
+jsp.error.servlet.invalid.method=JSPs only permit GET, POST or HEAD. Jasper
also permits OPTIONS
jsp.error.setLastModified=Unable to set last modified date for file [{0}]
jsp.error.signature.classnotfound=The class [{0}] specified in the method
signature in TLD for the function [{1}] cannot be found. [{2}]
jsp.error.simpletag.badbodycontent=The TLD for the class [{0}] specifies an
invalid body-content (JSP) for a SimpleTag.
@@ -191,8 +191,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
@@ -348,10 +348,11 @@ where options include:\n\
\ -ieplugin <clsid> Java Plugin classid for Internet Explorer\n\
\ -classpath <path> Overrides java.class.path system property\n\
\ -xpoweredBy Add X-Powered-By response header\n\
-\ -trimSpaces Remove template text that consists entirely of
whitespace\n\
+\ -trimSpaces [single] Remove template text that consists entirely of
whitespace\n\
+\ (if "single", replace such template text with a
single space)\n\
\ -javaEncoding <enc> Set the encoding charset for Java classes (default
UTF-8)\n\
-\ -source <version> Set the -source argument to the compiler (default
1.7)\n\
-\ -target <version> Set the -target argument to the compiler (default
1.7)\n\
+\ -source <version> Set the -source argument to the compiler (default
1.8)\n\
+\ -target <version> Set the -target argument to the compiler (default
1.8)\n\
\ -threadCount <count> Number of threads to use for compilation.\n\
\ ("2.0C" means two threads per core)\n
jspc.webfrg.footer=\n\
@@ -361,8 +362,8 @@ jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\
http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd"\n\
-\ version="3.1"\n\
+\
http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"\n\
+\ version="4.0"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
@@ -389,8 +390,8 @@ jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"\n\
-\ version="3.1"\n\
+\ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"\n\
+\ version="4.0"\n\
\ metadata-complete="false">\n\
<!--\n\
Automatically created by Apache Tomcat JspC.\n\
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
