You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by lu...@apache.org on 2003/04/08 22:58:59 UTC
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler JspDocumentParser.java
luehe 2003/04/08 13:58:59
Modified: jasper2/src/share/org/apache/jasper/resources
messages.properties
jasper2/src/share/org/apache/jasper/compiler
JspDocumentParser.java
Log:
Fixed 18535: Jasper is not generating a translation error if jsp:text contains subelements.
Revision Changes Path
1.112 +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.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- messages.properties 1 Apr 2003 03:14:53 -0000 1.111
+++ messages.properties 8 Apr 2003 20:58:59 -0000 1.112
@@ -376,4 +376,4 @@
jsp.error.noFunctionMethod=Method \"{0}\" for function \"{1}\" not found in class \"{2}\"
jsp.error.function.classnotfound=The class {0} specified in TLD for the function {1} cannot be found: {2}
jsp.error.signature.classnotfound=The class {0} specified in the method signature in TLD for the function {1} cannot be found. {2}
-
+jsp.error.text.has_subelement=<jsp:text> must not have any subelements
1.52 +10 -3 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java
Index: JspDocumentParser.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- JspDocumentParser.java 1 Apr 2003 03:14:52 -0000 1.51
+++ JspDocumentParser.java 8 Apr 2003 20:58:59 -0000 1.52
@@ -221,6 +221,13 @@
return;
}
+ // jsp:text must not have any subelements
+ if (TEXT_ACTION.equals(current.getLocalName())) {
+ throw new SAXParseException(
+ Localizer.getMessage("jsp.error.text.has_subelement"),
+ locator);
+ }
+
Mark start = new Mark(path, locator.getLineNumber(),
locator.getColumnNumber());
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org