luehe 2004/05/25 14:28:40
Modified: jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_fr.properties messages_ja.properties
Log:
Include javac errors whose line numbers cannot be mapped to JSP page in error
message that is returned to client.
For instance, a missing closing brace in a scriptlet causes havoc with the
try-catch-finally block that that JSP compiler puts around all generated code, and the
resulting javac error line numbers fall outside the scope of the begin and end java
line numbers of the scriptlet (and therefore cannot be mapped back to the JSP line
number of the scriptlet).
(This used to return the misleading error message about failure to find javac
compiler.)
Revision Changes Path
1.146 +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.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- messages.properties 21 May 2004 00:22:06 -0000 1.145
+++ messages.properties 25 May 2004 21:28:40 -0000 1.146
@@ -291,7 +291,7 @@
jsp.error.invalid.javaEncoding=Invalid java encodings. Tried {0} and then {1}. Both
failed.
jsp.error.needAlternateJavaEncoding=Default java encoding {0} is invalid on your
java platform. An alternate can be specified via the 'javaEncoding' parameter of
JspServlet.
#Error when compiling, used for jsp line number error messages
-jsp.error.single.line.number=\n\nAn error occurred at line: {0} in the jsp file:
{1}\n\n
+jsp.error.single.line.number=An error occurred at line: {0} in the jsp file: {1}
jsp.error.multiple.line.number=\n\nAn error occurred between lines: {0} and {1} in
the jsp file: {2}\n\n
jsp.error.corresponding.servlet=Generated servlet error:\n
jsp.error.empty.body.not.allowed=Empty body not allowed for {0}
1.50 +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.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- messages_es.properties 21 May 2004 00:22:06 -0000 1.49
+++ messages_es.properties 25 May 2004 21:28:40 -0000 1.50
@@ -292,7 +292,7 @@
jsp.error.invalid.javaEncoding=Codificaciones java incorrectas. Intenté {0} y luego
{1}. Ambas fallaron.
jsp.error.needAlternateJavaEncoding=La codificación java por defecto {0} es
incorrecta en tu plataforma java. Se puede especificar una alternativa vía parámetro
'javaEncoding' de JspServlet.
#Error when compiling, used for jsp line number error messages
-jsp.error.single.line.number=\n\nHa tenido lugar un error en la línea: {0} en el
archivo jsp: {1}\n\n
+jsp.error.single.line.number=Ha tenido lugar un error en la línea: {0} en el
archivo jsp: {1}
jsp.error.multiple.line.number=\n\nHa tenido lugar un error entre las líneas: {0} y
{1} en el archivo jsp: {2}\n\n
jsp.error.corresponding.servlet=Error de servlet generado:\n
jsp.error.empty.body.not.allowed=Cuerpo vacío no permitido para {0}
1.33 +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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- messages_fr.properties 10 Mar 2004 21:16:31 -0000 1.32
+++ messages_fr.properties 25 May 2004 21:28:40 -0000 1.33
@@ -243,7 +243,7 @@
jsp.error.invalid.javaEncoding=Encodage java incorrect. Essai de {0} puis de {1}.
Les deux ont échoué.
jsp.error.needAlternateJavaEncoding=L''encodage java par défaut {0} est incorrect
sur votre environnement java. Une alternative peut être indiquée via le paramêtre
'javaEncoding' de la JspServlet.
#Erreur lors de la compilation, utilisé pour la ligne jsp des messages d''erreur
-jsp.error.single.line.number=\n\nUne erreur s''est produite à la ligne: {0} dans le
fichier jsp: {1}\n\n
+jsp.error.single.line.number=Une erreur s''est produite à la ligne: {0} dans le
fichier jsp: {1}
jsp.error.multiple.line.number=\n\nUne erreur s''est produite entre les lignes: {0}
et {1} dans le fichier jsp: {2}\n\n
jsp.error.corresponding.servlet=Erreur de servlet générée:\n
jsp.error.empty.body.not.allowed=Un corps vide n'est pas autorisé pour {0}
1.53 +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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- messages_ja.properties 21 May 2004 00:22:07 -0000 1.52
+++ messages_ja.properties 25 May 2004 21:28:40 -0000 1.53
@@ -287,7 +287,7 @@
jsp.error.invalid.javaEncoding=\u7121\u52b9\u306aJava\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u3067\u3059\u3002{0}\u3092\u8a66\u3057\u3066\u3001\u305d\u308c\u304b\u3089{1}\u3092\u8a66\u3057\u307e\u3057\u305f\u304c\u3001\u4e21\u65b9\u304c\u5931\u6557\u3057\u307e\u3057\u305f
jsp.error.needAlternateJavaEncoding=\u30c7\u30d5\u30a9\u30eb\u30c8\u306eJava\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0
{0}
\u306f\u3042\u306a\u305f\u306e\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3067\u306f\u7121\u52b9\u3067\u3059\u3002JspServlet\u306e
'javaEncoding'
\u30d1\u30e9\u30e1\u30bf\u3067\u3001\u5225\u306e\u5024\u3092\u6307\u5b9a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002
#Error when compiling, used for jsp line number error messages
-jsp.error.single.line.number=\n\nJSP\u30d5\u30a1\u30a4\u30eb: {1}
\u306e\u4e2d\u306e{0}\u884c\u76ee\u3067\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\n\n
+jsp.error.single.line.number=JSP\u30d5\u30a1\u30a4\u30eb: {1}
\u306e\u4e2d\u306e{0}\u884c\u76ee\u3067\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
jsp.error.multiple.line.number=\n\nJPS\u30d5\u30a1\u30a4\u30eb:
{2}\u306e\u4e2d\u306e{0}\u884c\u76ee\u3068{1}\u884c\u76ee\u306e\u9593\u3067\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\n\n
jsp.error.corresponding.servlet=\u751f\u6210\u3055\u308c\u305f\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u306e\u30a8\u30e9\u30fc\u3067\u3059:\n
jsp.error.empty.body.not.allowed={0}
\u306b\u5bfe\u3057\u3066\u7a7a\u306e\u30dc\u30c7\u30a3\u306f\u8a31\u3055\u308c\u307e\u305b\u3093
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
