[jbossweb-commits] JBossWeb SVN: r2528 - in trunk/java/org/apache/jasper: resources and 1 other directory.
Author: aogburn
Date: 2014-10-22 09:39:40 -0400 (Wed, 22 Oct 2014)
New Revision: 2528
Modified:
trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java
trunk/java/org/apache/jasper/resources/LocalStrings.properties
trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
Log:
[JBWEB-305] Add file name information in detail error when compiling the java file
Modified: trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java 2014-10-21 14:36:24 UTC
(rev 2527)
+++ trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java 2014-10-22 13:39:40 UTC
(rev 2528)
@@ -80,7 +80,8 @@
buf.append(details[i].getJspExtract());
} else {
args = new Object[] {
- new Integer(details[i].getJavaLineNumber()) };
+ new Integer(details[i].getJavaLineNumber()),
+ details[i].getJavaFileName() };
buf.append("\n\n");
buf.append(Localizer.getMessage("jsp.error.java.line.number",
args));
Modified: trunk/java/org/apache/jasper/resources/LocalStrings.properties
===================================================================
--- trunk/java/org/apache/jasper/resources/LocalStrings.properties 2014-10-21 14:36:24 UTC
(rev 2527)
+++ trunk/java/org/apache/jasper/resources/LocalStrings.properties 2014-10-22 13:39:40 UTC
(rev 2528)
@@ -311,7 +311,7 @@
#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.multiple.line.number=\n\nAn error occurred between lines: {0} and {1} in the
jsp file: {2}\n\n
-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.corresponding.servlet=Generated servlet error:\n
jsp.error.empty.body.not.allowed=Empty body not allowed for {0}
jsp.error.jspbody.required=Must use jsp:body to specify tag body for {0} if jsp:attribute
is used.
Modified: trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
===================================================================
--- trunk/java/org/apache/jasper/resources/LocalStrings_es.properties 2014-10-21 14:36:24
UTC (rev 2527)
+++ trunk/java/org/apache/jasper/resources/LocalStrings_es.properties 2014-10-22 13:39:40
UTC (rev 2528)
@@ -328,7 +328,7 @@
\n\
Ha tenido lugar un error entre las l\u00EDneas\: {0} y {1} en el archivo jsp\: {2}\n\
\n
-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.corresponding.servlet = Error de servlet generado\:\n
jsp.error.empty.body.not.allowed = Cuerpo vac\u00EDo no permitido para {0}
jsp.error.jspbody.required = Se debe de usar jsp\:body para especificar cuerpo tag para
{0} si se usa jsp\:attribute.