luehe 2003/01/09 15:54:41
Modified: jasper2/src/share/org/apache/jasper/compiler Parser.java
jasper2/src/share/org/apache/jasper/resources
messages.properties
Log:
Fixed 15937: Misleading error message produced if jsp:body is not a
child of a standard or custom action.
Revision Changes Path
1.53 +5 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java
Index: Parser.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- Parser.java 18 Dec 2002 23:18:21 -0000 1.52
+++ Parser.java 9 Jan 2003 23:54:40 -0000 1.53
@@ -1196,6 +1196,8 @@
parseElement(parent);
} else if (reader.matches("attribute")) {
err.jspError(start, "jsp.error.namedAttribute.invalidUse");
+ } else if (reader.matches("body")) {
+ err.jspError(start, "jsp.error.jspbody.invalidUse");
} else if (reader.matches("fallback")) {
err.jspError(start, "jsp.error.fallback.invalidUse");
} else if (reader.matches("params")) {
1.77 +3 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties
Index: messages.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- messages.properties 3 Jan 2003 13:26:44 -0000 1.76
+++ messages.properties 9 Jan 2003 23:54:40 -0000 1.77
@@ -106,7 +106,8 @@
jsp.error.param.invalidUse=The jsp:param action must not be used outside the
jsp:include, jsp:forward, or jsp:params elements
jsp.error.params.invalidUse=jsp:params must be a direct child of jsp:plugin
jsp.error.fallback.invalidUse=jsp:fallback must be a direct child of jsp:plugin
-jsp.error.namedAttribute.invalidUse=jsp:attribute must be a sublement of a standard
or custom action
+jsp.error.namedAttribute.invalidUse=jsp:attribute must be the subelement of a
standard or custom action
+jsp.error.jspbody.invalidUse=jsp:body must be the subelement of a standard or
custom action
jsp.error.closeindividualparam=param tag needs to be closed with \"/>\"
jsp.error.closeparams=param tag needs to be closed with /params
jsp.error.params.emptyBody=jsp:params must contain at least one nested jsp:param
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
