luehe 2003/02/12 18:41:26
Modified: jasper2/src/share/org/apache/jasper/compiler
JspDocumentParser.java
jasper2/src/share/org/apache/jasper/resources
messages.properties
Log:
added support for <jsp:fallback> action to XML syntax
Revision Changes Path
1.38 +7 -4
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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- JspDocumentParser.java 7 Feb 2003 20:16:18 -0000 1.37
+++ JspDocumentParser.java 13 Feb 2003 02:41:26 -0000 1.38
@@ -589,9 +589,12 @@
node = new Node.DoBodyAction(attrsCopy, start, current);
} else if (qName.equals(JSP_ELEMENT)) {
node = new Node.JspElement(attrsCopy, start, current);
+ } else if (qName.equals(JSP_FALLBACK)) {
+ node = new Node.FallBackAction(start, current);
} else {
throw new SAXParseException(
- Localizer.getMessage("jsp.error.badStandardAction"),
+ Localizer.getMessage("jsp.error.xml.badStandardAction",
+ qName),
locator);
}
1.92 +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.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- messages.properties 10 Feb 2003 18:21:32 -0000 1.91
+++ messages.properties 13 Feb 2003 02:41:26 -0000 1.92
@@ -306,6 +306,7 @@
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={0} not allowed in a template text body.
jsp.error.badStandardAction=Invalid standard action
+jsp.error.xml.badStandardAction=Invalid standard action: {0}
jsp.error.tagdirective.badbodycontent=Invalid body-content ({0}) in tag directive
jsp.error.config_pagedir_encoding_mismatch=Page-encoding specified in
jsp-property-group ({0}) is different from that specified in page directive ({1})
jsp.error.prolog_pagedir_encoding_mismatch=Page-encoding specified in XML prolog
({0}) is different from that specified in page directive ({1})
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
