luehe 2002/10/28 14:01:34
Modified: jasper2/src/share/org/apache/jasper/compiler
TagLibraryInfoImpl.java
jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_ja.properties
Log:
No longer swallow TLV and TEI instantiation error
Revision Changes Path
1.22 +11 -32
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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- TagLibraryInfoImpl.java 28 Oct 2002 18:16:20 -0000 1.21
+++ TagLibraryInfoImpl.java 28 Oct 2002 22:01:34 -0000 1.22
@@ -390,27 +390,8 @@
try {
Class teiClass = ctxt.getClassLoader().loadClass(teiclass);
tei = (TagExtraInfo) teiClass.newInstance();
- } catch (ClassNotFoundException cex) {
- Constants.message("jsp.warning.teiclass.is.null",
- new Object[] {
- teiclass, cex.getMessage()
- },
- Logger.WARNING
- );
- } catch (IllegalAccessException iae) {
- Constants.message("jsp.warning.teiclass.is.null",
- new Object[] {
- teiclass, iae.getMessage()
- },
- Logger.WARNING
- );
- } catch (InstantiationException ie) {
- Constants.message("jsp.warning.teiclass.is.null",
- new Object[] {
- teiclass, ie.getMessage()
- },
- Logger.WARNING
- );
+ } catch (Exception e) {
+ err.jspError("jsp.error.teiclass.instantiation", teiclass, e);
}
}
@@ -561,7 +542,9 @@
className, declare, scope);
}
- private TagLibraryValidator createValidator(TreeNode elem) {
+ private TagLibraryValidator createValidator(TreeNode elem)
+ throws JasperException {
+
String validatorClass = null;
Map initParams = new Hashtable();
@@ -589,13 +572,9 @@
Class tlvClass =
ctxt.getClassLoader().loadClass(validatorClass);
tlv = (TagLibraryValidator)tlvClass.newInstance();
- } catch (Exception ex) {
- Constants.message("jsp.warning.tlvclass.is.null",
- new Object[] {
- validatorClass,
- "EXCEPTION: " + ex.getMessage()
- },
- Logger.ERROR);
+ } catch (Exception e) {
+ err.jspError("jsp.error.tlvclass.instantiation",
+ validatorClass, e);
}
}
if (tlv != null) {
1.51 +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.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- messages.properties 28 Oct 2002 18:16:21 -0000 1.50
+++ messages.properties 28 Oct 2002 22:01:34 -0000 1.51
@@ -131,7 +131,7 @@
jsp.warning.unknown.element.in.tag=Warning: Unknown element {0} in tag
jsp.warning.unknown.element.in.attribute=Warning: Unknown element {0} in attribute
jsp.error.more.than.one.taglib=More than one taglib in the TLD: {0}
-jsp.warning.teiclass.is.null=Could not load TagExtraInfo class {0}: {1}
+jsp.error.teiclass.instantiation=Failed to load or instantiate TagExtraInfo class:
{0}
jsp.error.non_null_tei_and_var_subelems=Tag {0} has one or more variable
subelements and a TagExtraInfo class that returns one or more VariableInfo
jsp.error.parse.error.in.TLD=Parse Error in the tag library descriptor: {0}
jsp.error.unable.to.open.TLD=Unable to open the tag library descriptor: {0}
@@ -225,7 +225,7 @@
jspc.error.fileDoesNotExist=The file argument ''{0}'' does not exist
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.tlvclass.instantiation=Failed to load or instantiate TagLibraryValidator
class: {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}
1.18 +3 -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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- messages_es.properties 28 Oct 2002 18:16:21 -0000 1.17
+++ messages_es.properties 28 Oct 2002 22:01:34 -0000 1.18
@@ -108,7 +108,7 @@
jsp.warning.unknown.element.in.attribute=Aviso: Elemento {0} desconocido en el
atributo
jsp.error.xml.taglib.uri.not_prefixed=El URI relativo {0} se debe prefijar por
\"urn:jsptld:\"
jsp.error.more.than.one.taglib=Mas de una libreria de tags en el TLD: {0}
-jsp.warning.teiclass.is.null=No se puedee cargar la clase TagExtraInfo llamada {0}:
{1}
+jsp.error.teiclass.instantiation=No se puedee cargar la clase TagExtraInfo llamada:
{0}
jsp.error.parse.error.in.TLD=Error de analisis en el descriptor de libreria de
tags: {0}
jsp.error.unable.to.open.TLD=No se puede abrir el descriptor de libreria de tags:
{0}
jsp.buffer.size.zero=Tamaņo de buffer <= 0
@@ -194,7 +194,7 @@
jspc.error.fileDoesNotExist=El archivo ''{0}'' utilizado como argumento no existe.
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.tlvclass.instantiation=No se puedee cargar la clase TagLibraryValidator
llamada: {0}
jsp.error.tlv.invalid.page=
jsp.error.tei.invalid.attributes=
jsp.error.taglib.reserved.prefix=
1.18 +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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- messages_ja.properties 28 Oct 2002 18:16:21 -0000 1.17
+++ messages_ja.properties 28 Oct 2002 22:01:34 -0000 1.18
@@ -119,7 +119,7 @@
jsp.warning.unknown.element.in.tag=\u8b66\u544a: {0}
\u306f\u672a\u77e5\u306e\u30bf\u30b0\u3067\u3059
jsp.warning.unknown.element.in.attribute=\u8b66\u544a:
\u5c5e\u6027\u306b\u672a\u77e5\u306e\u8981\u7d20 {0} \u304c\u3042\u308a\u307e\u3059
jsp.error.more.than.one.taglib=TLD\u306e\u4e2d\u306b\u8907\u6570\u306etaglib\u304c\u5b58\u5728\u3057\u307e\u3059:
{0}
-jsp.warning.teiclass.is.null=TagExtraInfo\u30af\u30e9\u30b9 {0}
\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093: {1}
+jsp.error.teiclass.instantiation=TagExtraInfo\u30af\u30e9\u30b9 {0}
\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093
jsp.error.parse.error.in.TLD=\u30bf\u30b0\u30e9\u30a4\u30d6\u30e9\u30ea\u8a18\u8ff0\u5b50
{0} \u4e2d\u306b\u89e3\u6790\u30a8\u30e9\u30fc\u304c\u5b58\u5728\u3057\u307e\u3059
jsp.error.unable.to.open.TLD=\u30bf\u30b0\u30e9\u30a4\u30d6\u30e9\u30ea\u8a18\u8ff0\u5b50
{0} \u3092\u30aa\u30fc\u30d7\u30f3\u3067\u304d\u307e\u305b\u3093
jsp.buffer.size.zero=\u30d0\u30c3\u30d5\u30a1\u30b5\u30a4\u30ba\u304c0\u4ee5\u4e0b\u3067\u3059
@@ -208,7 +208,7 @@
jspc.error.fileDoesNotExist=\u30d5\u30a1\u30a4\u30eb\u5f15\u6570 ''{0}''
\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
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.tlvclass.instantiation=TagLibraryValidator\u30af\u30e9\u30b9{0}\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093
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}
--
To unsubscribe, e-mail: <mailto:tomcat-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@;jakarta.apache.org>
