luehe 2002/12/16 14:21:17
Modified: jasper2/src/share/org/apache/jasper/compiler Parser.java
jasper2/src/share/org/apache/jasper/resources
messages.properties
Log:
Fixed 15410: if the jsp:attribute action is used out of the spec'd context, a
misleading error message is generated.
Revision Changes Path
1.49 +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.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- Parser.java 16 Dec 2002 17:34:32 -0000 1.48
+++ Parser.java 16 Dec 2002 22:21:15 -0000 1.49
@@ -1173,6 +1173,8 @@
parsePlugin(parent);
} else if (reader.matches("element")) {
parseElement(parent);
+ } else if (reader.matches("attribute")) {
+ err.jspError(start, "jsp.error.attribute.invalidUse");
} else if (reader.matches("fallback")) {
err.jspError(start, "jsp.error.fallback.invalidUse");
} else if (reader.matches("params")) {
1.74 +2 -1
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.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- messages.properties 16 Dec 2002 20:39:17 -0000 1.73
+++ messages.properties 16 Dec 2002 22:21:16 -0000 1.74
@@ -106,6 +106,7 @@
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.attribute.invalidUse=jsp:attribute must be a sublement 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]>
