luehe 2003/02/24 15:44:00
Modified: jasper2/src/share/org/apache/jasper/compiler
JspDocumentParser.java Parser.java
jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_fr.properties messages_ja.properties
Log:
Renamed jsp.error.unable.loadclass to jsp.error.loadclass.taghandler, and added name
of tag handler class to error string
Revision Changes Path
1.44 +7 -7
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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- JspDocumentParser.java 24 Feb 2003 23:23:39 -0000 1.43
+++ JspDocumentParser.java 24 Feb 2003 23:43:59 -0000 1.44
@@ -657,13 +657,13 @@
}
Class tagHandlerClass = null;
if (tagFileInfo == null) {
+ String handlerClassName = tagInfo.getTagClassName();
try {
- tagHandlerClass
- = ctxt.getClassLoader().loadClass(tagInfo.getTagClassName());
+ tagHandlerClass = ctxt.getClassLoader().loadClass(handlerClassName);
} catch (Exception e) {
throw new SAXException(
- Localizer.getMessage("jsp.error.unable.loadclass",
- localName, prefix));
+ Localizer.getMessage("jsp.error.loadclass.taghandler",
+ handlerClassName, qName));
}
} else {
tagInfo = tagFileInfo.getTagInfo();
1.63 +7 -7
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java
Index: Parser.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Parser.java 23 Feb 2003 20:57:05 -0000 1.62
+++ Parser.java 24 Feb 2003 23:43:59 -0000 1.63
@@ -1328,12 +1328,12 @@
if (tagFileInfo == null) {
// Must be a classic tag, load it here.
// tag files will be loaded later, in TagFileProcessor
+ String handlerClassName = tagInfo.getTagClassName();
try {
- tagHandlerClass
- = ctxt.getClassLoader().loadClass(tagInfo.getTagClassName());
+ tagHandlerClass = ctxt.getClassLoader().loadClass(handlerClassName);
} catch (Exception e) {
- err.jspError(start, "jsp.error.unable.loadclass", shortTagName,
- prefix);
+ err.jspError(start, "jsp.error.loadclass.taghandler",
+ handlerClassName, tagName);
}
} else {
tagInfo = tagFileInfo.getTagInfo();
1.99 +2 -2
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.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- messages.properties 24 Feb 2003 23:23:39 -0000 1.98
+++ messages.properties 24 Feb 2003 23:43:59 -0000 1.99
@@ -72,7 +72,7 @@
jsp.error.action.isnottagfile={0} action can be used in tag files only
jsp.error.unterminated=Unterminated {0} tag
jsp.error.usebean.notinsamefile=useBean tag must begin and end in the same physical
file
-jsp.error.unable.loadclass=Unable to load class {0}
+jsp.error.loadclass.taghandler=Unable to load tag handler class \"{0}\" for tag
\"{1}\"
jsp.error.unable.compile=Unable to compile class for JSP
jsp.error.unable.load=Unable to load class for JSP
jsp.error.unable.rename=Unable to rename class file {0} to {1}
1.35 +2 -2
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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- messages_es.properties 24 Feb 2003 19:39:39 -0000 1.34
+++ messages_es.properties 24 Feb 2003 23:44:00 -0000 1.35
@@ -54,7 +54,7 @@
jsp.error.unknownException= ! Error no caturado � Deberias considerar el poner una
pagina de error para avisar los errores mas elegantemente
jsp.error.invalid.directive=Directiva no valida
jsp.error.unterminated=Tag {0} no terminado
-jsp.error.unable.loadclass=No se puede cargar la clase {0}
+jsp.error.loadclass.taghandler=No se puede cargar la clase {0}
jsp.error.unable.compile=No se puede compilar la clase para JSP
jsp.error.unable.load=No se puede compilar la clase para JSP
jsp.error.unable.rename=No se puede renombrar el archivo de clase {0} a {1}
1.19 +2 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_fr.properties
Index: messages_fr.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_fr.properties,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- messages_fr.properties 24 Feb 2003 19:39:39 -0000 1.18
+++ messages_fr.properties 24 Feb 2003 23:44:00 -0000 1.19
@@ -71,7 +71,7 @@
jsp.error.action.isnottagfile=L''action {0} ne peut �tre utilis�e que dans un
fichier tag
jsp.error.unterminated=Tag {0} non termin�
jsp.error.usebean.notinsamefile=le tag useBean doit commenc� et finir dans le m�me
fichier physique
-jsp.error.unable.loadclass=Impossible de charger la classe {0}
+jsp.error.loadclass.taghandler=Impossible de charger la classe {0}
jsp.error.unable.compile=Impossible de compiler la classe pour la JSP
jsp.error.unable.load=Impossible de charger la classe pour la JSP
jsp.error.unable.rename=Impossible de renommer le fichier classe de {0} vers {1}
1.35 +2 -2
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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- messages_ja.properties 24 Feb 2003 19:39:39 -0000 1.34
+++ messages_ja.properties 24 Feb 2003 23:44:00 -0000 1.35
@@ -63,7 +63,7 @@
jsp.error.invalid.directive=\u7121\u52b9\u306a\u6307\u793a\u5b50\u3067\u3059
jsp.error.unterminated={0}
\u30bf\u30b0\u304c\u7d42\u4e86\u3057\u3066\u3044\u307e\u305b\u3093
jsp.error.useBean.notinsamefile=useBean\u30bf\u30b0\u306f\u3001\u540c\u4e00\u30d5\u30a1\u30a4\u30eb\u4e2d\u3067\u958b\u59cb\u3057\u3001\u7d42\u4e86\u3057\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
-jsp.error.unable.loadclass=\u30af\u30e9\u30b9 {0}
\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093
+jsp.error.loadclass.taghandler=\u30af\u30e9\u30b9 {0}
\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093
jsp.error.unable.compile=JSP\u306e\u30af\u30e9\u30b9\u3092\u30b3\u30f3\u30d1\u30a4\u30eb\u3067\u304d\u307e\u305b\u3093
jsp.error.unable.load=JSP\u306e\u30af\u30e9\u30b9\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093
jsp.error.unable.rename=\u30af\u30e9\u30b9\u30d5\u30a1\u30a4\u30eb {0} \u3092 {1}
\u306b\u30d5\u30a1\u30a4\u30eb\u540d\u3092\u5909\u66f4\u3067\u304d\u307e\u305b\u3093
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
