Author: markt
Date: Wed Jan 23 19:40:40 2013
New Revision: 1437649
URL: http://svn.apache.org/viewvc?rev=1437649&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54466
Improve error message by including the name of the file when the java file
generated from a tag file cannot be compiled.
Based on a patch by Sheldon Shao.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
Modified: tomcat/trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java?rev=1437649&r1=1437648&r2=1437649&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java Wed
Jan 23 19:40:40 2013
@@ -87,7 +87,8 @@ class DefaultErrorHandler implements Err
buf.append(details[i].getJspExtract());
} else {
args = new Object[] {
- Integer.valueOf(details[i].getJavaLineNumber()) };
+ Integer.valueOf(details[i].getJavaLineNumber()),
+ details[i].getJavaFileName() };
buf.append(Constants.NEWLINE);
buf.append(Constants.NEWLINE);
buf.append(Localizer.getMessage("jsp.error.java.line.number",
Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1437649&r1=1437648&r2=1437649&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Wed
Jan 23 19:40:40 2013
@@ -236,7 +236,7 @@ jsp.error.invalid.tagdir=Tag file direct
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=An error occurred at line: {0} in the jsp file:
{1}
-jsp.error.java.line.number=An error occurred at line: {0} in the generated
java file
+jsp.error.java.line.number=An error occurred at line: [{0}] in the generated
java file: [{1}]
jsp.error.location=line: {0}, column: {1}
jsp.error.corresponding.servlet=Generated servlet error:\n
jsp.error.jspbody.required=Must use jsp:body to specify tag body for {0} if
jsp:attribute is used.
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties?rev=1437649&r1=1437648&r2=1437649&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
Wed Jan 23 19:40:40 2013
@@ -234,7 +234,7 @@ jsp.error.invalid.tagdir = El directorio
jsp.error.needAlternateJavaEncoding = La codificaci\u00F3n java por defecto
{0} es incorrecta en tu plataforma java. Se puede especificar una alternativa
v\u00EDa par\u00E1metro 'javaEncoding' de JspServlet.
#Error when compiling, used for jsp line number error messages
jsp.error.single.line.number = Ha tenido lugar un error en la l\u00EDnea\: {0}
en el archivo jsp\: {1}
-jsp.error.java.line.number = Ha tenido lugar un error en la l\u00EDnea\: {0}
en el fichero java generado
+jsp.error.java.line.number = Ha tenido lugar un error en la l\u00EDnea\: [{0}]
en el fichero java generado: [{1}]
jsp.error.location = l\u00EDnea\: {0}, columna\: {1}
jsp.error.corresponding.servlet = Error de servlet generado\:\n
jsp.error.jspbody.required = Se debe de usar jsp\:body para especificar cuerpo
tag para {0} si se usa jsp\:attribute.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
