yoavs 2005/03/23 07:48:37
Modified: webapps/docs changelog.xml
jasper2/src/share/org/apache/jasper/compiler
TagLibraryInfoImpl.java
jasper2/src/share/org/apache/jasper/resources
LocalStrings.properties LocalStrings_es.properties
LocalStrings_fr.properties
LocalStrings_ja.properties
Log:
Bugzilla 33539.
Revision Changes Path
1.249 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- changelog.xml 23 Mar 2005 15:41:47 -0000 1.248
+++ changelog.xml 23 Mar 2005 15:48:36 -0000 1.249
@@ -263,6 +263,9 @@
<fix>
<bug>33538</bug>: Ignore example and tag-extension elements in
TagLibraryInfoImpl. (yoavs)
</fix>
+ <fix>
+ <bug>33539</bug>: Better error message when an unknown element is
encountered in the tag file. (yoavs)
+ </fix>
</changelog>
</subsection>
1.59 +1 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Index: TagLibraryInfoImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- TagLibraryInfoImpl.java 23 Mar 2005 15:41:47 -0000 1.58
+++ TagLibraryInfoImpl.java 23 Mar 2005 15:48:37 -0000 1.59
@@ -480,7 +480,7 @@
} else {
if (log.isWarnEnabled()) {
log.warn(Localizer.getMessage(
- "jsp.warning.unknown.element.in.attribute",
tname));
+ "jsp.warning.unknown.element.in.tagfile",
tname));
}
}
}
1.8 +2 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LocalStrings.properties 19 Nov 2004 14:30:22 -0000 1.7
+++ LocalStrings.properties 23 Mar 2005 15:48:37 -0000 1.8
@@ -154,6 +154,7 @@
jsp.error.badGetReader=Cannot create a reader when the stream is not buffered
jsp.warning.unknown.element.in.taglib=Unknown element ({0}) in taglib
jsp.warning.unknown.element.in.tag=Unknown element ({0}) in tag
+jsp.warning.unknown.element.in.tagfile=Unknown element ({0}) in tag-file
jsp.warning.unknown.element.in.attribute=Unknown element ({0}) in attribute
jsp.warning.unknown.element.in.variable=Unknown element ({0}) in variable
jsp.warning.unknown.element.in.validator=Unknown element ({0}) in validator
1.5 +2 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings_es.properties
Index: LocalStrings_es.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings_es.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LocalStrings_es.properties 19 Nov 2004 14:30:22 -0000 1.4
+++ LocalStrings_es.properties 23 Mar 2005 15:48:37 -0000 1.5
@@ -151,6 +151,7 @@
jsp.error.badGetReader=No se puede crear un reader cuando el stream no tiene
buffer
jsp.warning.unknown.element.in.taglib=Elemento desconocido ({0}) en taglib
jsp.warning.unknown.element.in.tag=Elemento desconocido ({0}) en tag
+jsp.warning.unknown.element.in.tagfile=Elemento desconocido ({0}) en tag-file
jsp.warning.unknown.element.in.attribute=Elemento desconocido ({0}) en
attribute
jsp.warning.unknown.element.in.variable=Elemento desconocido ({0}) en
variable
jsp.warning.unknown.element.in.validator=Elemento desconocido ({0}) en
validator
1.5 +2 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings_fr.properties
Index: LocalStrings_fr.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings_fr.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LocalStrings_fr.properties 19 Nov 2004 14:30:22 -0000 1.4
+++ LocalStrings_fr.properties 23 Mar 2005 15:48:37 -0000 1.5
@@ -117,6 +117,7 @@
jsp.error.badGetReader=Impossible de créer un lecteur (reader) quand le flux
n''utilse pas des tampons (not buffered)
jsp.warning.unknown.element.in.TLD=Attention: Elément inconnu {0} dans le TLD
jsp.warning.unknown.element.in.tag=Attention: Elément inconnu {0} dans le tag
+jsp.warning.unknown.element.in.tagfile=Attention: El?ment inconnu {0} dans
le tag-file
jsp.warning.unknown.element.in.attribute=Attention: Elément inconnu {0} dans
l''attribute
jsp.error.more.than.one.taglib=plus d''un taglib dans le TLD: {0}
jsp.error.teiclass.instantiation=Impossible de charger ou d''instancier la
classe TagExtraInfo: {0}
1.5 +2 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings_ja.properties
Index: LocalStrings_ja.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings_ja.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LocalStrings_ja.properties 19 Nov 2004 14:30:22 -0000 1.4
+++ LocalStrings_ja.properties 23 Mar 2005 15:48:37 -0000 1.5
@@ -150,6 +150,7 @@
jsp.error.badGetReader=\u30b9\u30c8\u30ea\u30fc\u30e0\u304c\u30d0\u30c3\u30d5\u30a1\u30ea\u30f3\u30b0\u3055\u308c\u3066\u3044\u306a\u3044\u5834\u5408\u306b\u306f\u3001Reader\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093
jsp.warning.unknown.element.in.taglib=taglib\u4e2d\u306b\u672a\u77e5\u306e\u8981\u7d20
({0}) \u304c\u3042\u308a\u307e\u3059
jsp.warning.unknown.element.in.tag=tag\u4e2d\u306b\u672a\u77e5\u306e\u8981\u7d20
({0}) \u304c\u3042\u308a\u307e\u3059
+jsp.warning.unknown.element.in.tagfile=tag-file\u4e2d\u306b\u672a\u77e5\u306e\u8981\u7d20
({0}) \u304c\u3042\u308a\u307e\u3059
jsp.warning.unknown.element.in.attribute=attribute\u4e2d\u306b\u672a\u77e5\u306e\u8981\u7d20
({0}) \u304c\u3042\u308a\u307e\u3059
jsp.warning.unknown.element.in.variable=variable\u4e2d\u306b\u672a\u77e5\u306e\u8981\u7d20
({0}) \u304c\u3042\u308a\u307e\u3059
jsp.warning.unknown.element.in.validator=validator\u4e2d\u306b\u672a\u77e5\u306e\u8981\u7d20
({0}) \u304c\u3042\u308a\u307e\u3059
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
