pierred 00/11/06 13:05:03
Modified: jasper/src/share/org/apache/jasper/compiler Parser.java
jasper/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
Log:
Port Larry Isaacs' improvement to the error message for
unterminated user-defined tag. Thanks Larry.
> I found that the error is simply an unterminated custom tag, i.e.
> a typo in the ending tag achieves the same thing as a nesting error.
> As a result, I broadened the error message a bit from what you
> originally committed. It uses:
>
> Unterminated user-defined tag: ending tag {0} not found or incorrectly nested
Revision Changes Path
1.6 +1 -1
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Parser.java
Index: Parser.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Parser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Parser.java 2000/10/28 03:20:21 1.5
+++ Parser.java 2000/11/06 21:04:56 1.6
@@ -864,7 +864,7 @@
} catch (ParseException ex) {
throw new ParseException(
start,
- Constants.getString("jsp.error.incorrect.nesting",
+
Constants.getString("jsp.error.unterminated.user.tag",
new Object[]{JspUtil.escapeXml(tagEnd)}));
}
listener.setTemplateInfo(parser.tmplStart,
parser.tmplStop);
1.10 +2 -2
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages.properties
Index: messages.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- messages.properties 2000/11/02 01:12:16 1.9
+++ messages.properties 2000/11/06 21:04:59 1.10
@@ -1,4 +1,4 @@
-# $Id: messages.properties,v 1.9 2000/11/02 01:12:16 pierred Exp $
+# $Id: messages.properties,v 1.10 2000/11/06 21:04:59 pierred Exp $
#
# Default localized string information
# Localized this the Default Locale as is en_US
@@ -218,7 +218,6 @@
jsp.parser.sax.featurenotsupported=SAX feature not supported: {0}
jsp.parser.sax.featurenotrecognized=SAX feature not recognized: {0}
jsp.error.no.more.content=End of content reached while more parsing required: tag
nesting error?
-jsp.error.incorrect.nesting=Incorrect nesting involving {0}
jsp.error.parse.xml=XML parsing error on file {0}: {1}
jsp.error.parse.xml.line=XML parsing error on file {0}: (line {1}, col {2}): {3}
jsp.error.internal.filenotfound=Internal Error: File {0} not found
@@ -230,3 +229,4 @@
tld.error.variableNotAllowed=It is an error for a tag that has one or more variable
subelements to have a TagExtraInfo class that returns a non-null object.
jsp.error.tldInWebDotXmlNotFound=Could not locate TLD {1} for URI {0} specified in
web.xml
jsp.error.taglibDirective.absUriCannotBeResolved=This absolute uri ({0}) cannot be
resolved in either web.xml or the jar files deployed with this application
+jsp.error.unterminated.user.tag=Unterminated user-defined tag: ending tag {0} not
found or incorrectly nested
1.6 +1 -2
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages_es.properties
Index: messages_es.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages_es.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- messages_es.properties 2000/11/02 01:12:16 1.5
+++ messages_es.properties 2000/11/06 21:05:01 1.6
@@ -1,4 +1,4 @@
-# $Id: messages_es.properties,v 1.5 2000/11/02 01:12:16 pierred Exp $
+# $Id: messages_es.properties,v 1.6 2000/11/06 21:05:01 pierred Exp $
#
# Default localized string information
# Localized para Locale es_ES
@@ -208,7 +208,6 @@
jsp.parser.sax.featurenotsupported=
jsp.parser.sax.featurenotrecognized=
jsp.error.no.more.content=
-jsp.error.incorrect.nesting=
jsp.error.parse.xml=
jsp.error.parse.xml.line=
jsp.error.internal.filenotfound=
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
