Merge pull request #182 from dblevins/javax-renames

Remaining javax-to-jakarta renames
jakartaee · Sep 7, 2020 · 085a68e · 085a68e
2 parents 4c210fa + efb6f32
commit 085a68e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/impl/src/main/java/org/apache/jasper/resources/messages.properties b/impl/src/main/java/org/apache/jasper/resources/messages.properties
@@ -453,8 +453,8 @@ jsp.warning.boolean=PWC6337: Invalid value for the initParam {0}. Will use the d
 jsp.error.beans.property.conversion=PWC6338: Cannot convert \"{0}\" for the attribute {2} of the bean {1}: {3}
 jsp.error.setter.none=PWC6339: Cannot find a setter method for the attribute {1} of the tag handler {0}
 jsp.error.setter.notobject=PWC6340: According to the TLD, rtexprvalue is true, and deferred-value is specified for the attribute {1} of the tag handler {0}, but the argument for the setter method is not a java.lang.Object
-jsp.error.setter.notvalueexpression= PWC6341: According to the TLD, deferred-value is specified for the attribute {1} of the tag handler {0}, but the argument for the setter method is not a javax.el.ValueExpression
-jsp.error.setter.notmethodexpression=PWC6342: According to the TLD, deferred-method is specified for the attribute {1} of the tag handler {0}, but the argument for the setter method is not a javax.el.MethodExpression
+jsp.error.setter.notvalueexpression= PWC6341: According to the TLD, deferred-value is specified for the attribute {1} of the tag handler {0}, but the argument for the setter method is not a jakarta.el.ValueExpression
+jsp.error.setter.notmethodexpression=PWC6342: According to the TLD, deferred-method is specified for the attribute {1} of the tag handler {0}, but the argument for the setter method is not a jakarta.el.MethodExpression
 jsp.error.setter.notequal=PWC6343: The type in the TLD for attribute {1} of the tag handler {0} does not match the argument type of its setter method
 jsp.error.unableToCreateOutputWriter=PWC6344: Unable to create output writer for file {0}
 jsp.error.nojdk=PWC6345: There is an error in invoking javac.  A full JDK (not just JRE) is required

diff --git a/spec/src/main/asciidoc/ServerPages.adoc b/spec/src/main/asciidoc/ServerPages.adoc
@@ -11237,4 +11237,4 @@ JSP container and provides services in response to requests.
 
 *Web Container Provider* +
 A vendor that provides a servlet and JSP
-container that support the corresponding component contracts.
+container that support the corresponding component contracts.