kinman 2002/09/12 14:57:01
Modified: jasper2/src/share/org/apache/jasper/compiler Parser.java
jasper2/src/share/org/apache/jasper/resources
messages.properties
Log:
- Fix 12590: <jsp:attribute> should be allowed in the body of <jsp:param>
for its value attribute
Revision Changes Path
1.31 +25 -12
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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Parser.java 6 Sep 2002 21:16:23 -0000 1.30
+++ Parser.java 12 Sep 2002 21:57:00 -0000 1.31
@@ -1505,23 +1505,32 @@
} else if (reader.matches("<jsp:directive.")) {
parseXMLDirective(parent);
} else if (reader.matches("<%!")) {
- err.jspError( reader.mark(), "jsp.error.not.in.template" );
+ err.jspError( reader.mark(), "jsp.error.not.in.template",
+ "Declarations" );
} else if (reader.matches("<jsp:declaration")) {
- err.jspError( reader.mark(), "jsp.error.not.in.template" );
+ err.jspError( reader.mark(), "jsp.error.not.in.template",
+ "Declarations" );
} else if (reader.matches("<%=")) {
- err.jspError( reader.mark(), "jsp.error.not.in.template" );
+ err.jspError( reader.mark(), "jsp.error.not.in.template",
+ "Expressions" );
} else if (reader.matches("<jsp:expression")) {
- err.jspError( reader.mark(), "jsp.error.not.in.template" );
+ err.jspError( reader.mark(), "jsp.error.not.in.template",
+ "Expressions" );
} else if (reader.matches("<%")) {
- err.jspError( reader.mark(), "jsp.error.not.in.template" );
+ err.jspError( reader.mark(), "jsp.error.not.in.template",
+ "Scriptlets" );
} else if (reader.matches("<jsp:scriptlet")) {
- err.jspError( reader.mark(), "jsp.error.not.in.template" );
+ err.jspError( reader.mark(), "jsp.error.not.in.template",
+ "Scriptlets" );
} else if (reader.matches("<jsp:text")) {
- err.jspError( reader.mark(), "jsp.error.not.in.template" );
+ err.jspError( reader.mark(), "jsp.error.not.in.template",
+ "<jsp:text" );
} else if (reader.matches("${")) {
- err.jspError( reader.mark(), "jsp.error.not.in.template" );
+ err.jspError( reader.mark(), "jsp.error.not.in.template",
+ "Expression language" );
} else if (reader.matches("<jsp:")) {
- err.jspError( reader.mark(), "jsp.error.not.in.template" );
+ err.jspError( reader.mark(), "jsp.error.not.in.template",
+ "Standard actions" );
} else {
parseTemplateText(parent);
}
@@ -1736,6 +1745,10 @@
}
} else if (n instanceof Node.PlugIn) {
if ("width".equals(name) || "height".equals(name)) {
+ return TagInfo.BODY_CONTENT_JSP;
+ }
+ } else if (n instanceof Node.ParamAction) {
+ if ("value".equals(name)) {
return TagInfo.BODY_CONTENT_JSP;
}
}
1.39 +2 -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.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- messages.properties 11 Sep 2002 20:50:45 -0000 1.38
+++ messages.properties 12 Sep 2002 21:57:01 -0000 1.39
@@ -298,6 +298,6 @@
jsp.error.xmlns.redefinition.notimplemented=Internal error: Attempt to redefine
xmlns:{0}. Redefinition of namespaces is not implemented.
jsp.error.could.not.add.taglibraries=Could not add tag one or more libraries.
jsp.error.duplicate.name.jspattribute=The attribute {0} specified in the standard
or custom action also appears as the value of the name attribute in the enclosed
jsp:attribute
-jsp.error.not.in.template=Not allowed in a template text body.
+jsp.error.not.in.template={0} not allowed in a template text body.
jsp.error.badaction=The action is not a recognizable standard action.
jsp.error.tagdirective.badbodycontent=Invalid body-content ({0}) in tag directive
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
