luehe 2002/07/31 09:04:39
Modified: jasper2/src/share/org/apache/jasper/compiler Validator.java
jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_ja.properties
Log:
Replaced call to TagExtraInfo.isValid() with the new
TagExtraInfo.validate(), as required by JSP 2.0.
Revision Changes Path
1.15 +22 -6
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java
Index: Validator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Validator.java 22 Jul 2002 20:35:27 -0000 1.14
+++ Validator.java 31 Jul 2002 16:04:39 -0000 1.15
@@ -837,9 +837,25 @@
err.jspError(n, "jsp.error.missing.tagInfo", n.getName());
}
- if (!tagInfo.isValid(n.getTagData())) {
- err.jspError(n, "jsp.error.invalid.attributes");
- }
+ ValidationMessage[] errors = tagInfo.validate(n.getTagData());
+ if (errors != null && errors.length != 0) {
+ StringBuffer errMsg = new StringBuffer();
+ errMsg.append("<h3>");
+ errMsg.append(err.getString("jsp.error.tei.invalid.attributes",
+ n.getName()));
+ errMsg.append("</h3>");
+ for (int i=0; i<errors.length; i++) {
+ errMsg.append("<p>");
+ if (errors[i].getId() != null) {
+ errMsg.append(errors[i].getId());
+ errMsg.append(": ");
+ }
+ errMsg.append(errors[i].getMessage());
+ errMsg.append("</p>");
+ }
+
+ err.jspError(n, errMsg.toString());
+ }
visitBody(n);
}
1.19 +3 -3
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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- messages.properties 29 Jul 2002 22:29:01 -0000 1.18
+++ messages.properties 31 Jul 2002 16:04:39 -0000 1.19
@@ -160,7 +160,6 @@
jsp.error.unable.to_find_method=Unable to find setter method for attribute: {0}
jsp.error.unable.to_convert_string=Unable to convert a String to {0} for attribute
{1}
jsp.error.unable.to_introspect=Unable to introspect on tag handler class: {0}
because of {1}
-jsp.error.invalid_attributes=Attributes are invalid according to TagInfo
jsp.error.bad_tag=No such tag {0} in the tag library imported with prefix {1}
jsp.error.bad_string_Character=Cannot extract a Character from a zero length array
jsp.error.bad_string_char=Cannot extract a char from a zero length array
@@ -225,7 +224,8 @@
jspc.error.emptyWebApp=-webapp requires a trailing file argument
jsp.error.library.invalid=JSP page is invalid according to library {0}: {1}
jsp.warning.tlvclass.is.null=Could not load TagLibraryValidator class {0}: {1}
-jsp.error.taglibraryvalidator.invalidpage=Validation error messages from tag
library {0}
+jsp.error.tlv.invalid.page=Validation error messages from TagLibraryValidator for
{0}
+jsp.error.tei.invalid.attributes=Validation error messages from TagExtraInfo for {0}
jsp.parser.sax.propertynotsupported=SAX property not supported: {0}
jsp.parser.sax.propertynotrecognized=SAX property not recognized: {0}
jsp.parser.sax.featurenotsupported=SAX feature not supported: {0}
1.4 +4 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_es.properties
Index: messages_es.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_es.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- messages_es.properties 8 Jul 2002 17:28:58 -0000 1.3
+++ messages_es.properties 31 Jul 2002 16:04:39 -0000 1.4
@@ -133,7 +133,6 @@
jsp.error.unable.to_load_taghandler_class=No se puede cargar clase manejadora {0}
del tag acausa de {1}
jsp.error.unable.to_find_method=No se puede encontrar el metodo de escritura para
el atributo: {0}
jsp.error.unable.to_introspect=No se puede introspect on tag handler clase: {0} a
causa de {1}
-jsp.error.invalid_attributes=Los atributos no son validos de acuerdo con TagInfo
jsp.error.bad_tag=No existe el tag {0} en la libreria importada con prefijo {1}
jsp.warning.compiler.class.cantcreate=No puede crear una instancia de la clase {0}
de compilador especificada debido a {1}. Se usara el compilador del JDK por defecto.
jsp.warning.compiler.class.notfound=No puede encontrar una instancia de la clase
{0} de compilador. Se usara el compilador del JDK por defecto.
@@ -196,7 +195,8 @@
jspc.error.emptyWebApp=-webapp necesita un argumento de archivo
jsp.error.library.invalid=
jsp.warning.tlvclass.is.null=No se puedee cargar la clase TagLibraryValidator
llamada {0}: {1}
-jsp.error.taglibraryvalidator.invalidpage=
+jsp.error.tlv.invalid.page=
+jsp.error.tei.invalid.attributes=
jsp.error.taglib.reserved.prefix=
jsp.parser.sax.propertynotsupported=
jsp.parser.sax.propertynotrecognized=
@@ -208,3 +208,4 @@
jsp.error.internal.filenotfound=
jsp.error.parse.xml.invalidPublicId=
jsp.error.usebean.notinsamefile=El tag useBean debe empezar y acabar en el mismo
archivo fisico
+jsp.error.invalid.attribute=
1.3 +3 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_ja.properties
Index: messages_ja.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_ja.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- messages_ja.properties 26 Jun 2002 16:50:38 -0000 1.2
+++ messages_ja.properties 31 Jul 2002 16:04:39 -0000 1.3
@@ -145,7 +145,6 @@
jsp.error.unable.to_find_method=\u5c5e\u6027 {0}
\u306esetter\u30e1\u30bd\u30c3\u30c9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
jsp.error.unable.to_convert_string=\u5c5e\u6027 {1}\u306e\u6587\u5b57\u5217\u3092
{0}\u306b\u5909\u63db\u3067\u304d\u307e\u305b\u3093
jsp.error.unable.to_introspect=\u30bf\u30b0\u30cf\u30f3\u30c9\u30e9\u30af\u30e9\u30b9
{0} \u3092 {1} \u306e\u305f\u3081\u306b\u5185\u7701\u3067\u304d\u307e\u305b\u3093
-jsp.error.invalid_attributes=TagInfo\u306b\u3088\u308b\u3068\u3001\u5c5e\u6027\u306f\u7121\u52b9\u3067\u3059
jsp.error.bad_tag=\u30d7\u30ec\u30d5\u30a3\u30c3\u30af\u30b9
{1}\u3067\u30a4\u30f3\u30dd\u30fc\u30c8\u3055\u308c\u305f\u30bf\u30b0\u30e9\u30a4\u30d6\u30e9\u30ea\u306b\u306f\u3001\u30bf\u30b0
{0} \u306f\u5b58\u5728\u3057\u307e\u305b\u3093
jsp.error.bad_string_Character=\u9577\u30550\u306e\u914d\u5217\u304b\u3089\u306f\u6587\u5b57\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093
jsp.error.bad_string_char=\u9577\u30550\u306e\u914d\u5217\u304b\u3089\u306f\u6587\u5b57\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093
@@ -210,7 +209,8 @@
jspc.error.emptyWebApp=-webapp\u30aa\u30d7\u30b7\u30e7\u30f3\u306b\u306f\u3001\u30d5\u30a1\u30a4\u30eb\u5f15\u6570\u304c\u5fc5\u8981\u3067\u3059
jsp.error.library.invalid=\u30e9\u30a4\u30d6\u30e9\u30ea{0}\u306b\u5f93\u3046\u3068JSP\u30da\u30fc\u30b8\u306f\u7121\u52b9\u3067\u3059:
{1}
jsp.warning.tlvclass.is.null=TagLibraryValidator\u30af\u30e9\u30b9{0}\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093:
{1}
-jsp.error.taglibraryvalidator.invalidpage=\u30bf\u30b0\u30e9\u30a4\u30d6\u30e9\u30ea
{0}
\u306e\u8a3c\u660e\u30a8\u30e9\u30fc\u30e1\u30c3\u30bb\u30fc\u30b8\u304c\u767a\u751f\u3057\u307e\u3057\u305f
+jsp.error.tlv.invalid.page=\u30bf\u30b0\u30e9\u30a4\u30d6\u30e9\u30ea {0}
\u306e\u8a3c\u660e\u30a8\u30e9\u30fc\u30e1\u30c3\u30bb\u30fc\u30b8\u304c\u767a\u751f\u3057\u307e\u3057\u305f
+jsp.error.tei.invalid.attributes=
jsp.parser.sax.propertynotsupported=SAX\u30d7\u30ed\u30d1\u30c6\u30a3\u304c\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u307e\u305b\u3093:
{0}
jsp.parser.sax.propertynotrecognized=SAX\u30d7\u30ed\u30d1\u30c6\u30a3\u304c\u8a8d\u8b58\u3055\u308c\u307e\u305b\u3093:
{0}
jsp.parser.sax.featurenotsupported=SAX\u30d5\u30a3\u30fc\u30c1\u30e3\u304c\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u307e\u305b\u3093:
{0}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
