Author: aogburn Date: 2014-10-22 09:54:07 -0400 (Wed, 22 Oct 2014) New Revision: 2530 Modified: branches/7.5.x/src/ branches/7.5.x/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java branches/7.5.x/src/main/java/org/apache/jasper/compiler/DefaultErrorHandler.java branches/7.5.x/src/main/java/org/jboss/web/JasperMessages.java Log: [JBWEB-305] Add file name information in detail error when compiling the java file Property changes on: branches/7.5.x/src ___________________________________________________________________ Added: svn:mergeinfo + /branches/8.0.x/src:2529 Property changes on: branches/7.5.x/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java:2485 + /branches/7.4.x/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java:2485 /branches/8.0.x/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java:2529 Modified: branches/7.5.x/src/main/java/org/apache/jasper/compiler/DefaultErrorHandler.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/jasper/compiler/DefaultErrorHandler.java 2014-10-22 13:50:30 UTC (rev 2529) +++ branches/7.5.x/src/main/java/org/apache/jasper/compiler/DefaultErrorHandler.java 2014-10-22 13:54:07 UTC (rev 2530) @@ -76,7 +76,7 @@ buf.append(details[i].getJspExtract()); } else { buf.append("\n\n"); - buf.append(MESSAGES.errorInJavaFile(details[i].getJavaLineNumber())); + buf.append(MESSAGES.errorInJavaFile(details[i].getJavaLineNumber(), details[i].getJavaFileName())); buf.append("\n"); buf.append(details[i].getErrorMessage()); } Modified: branches/7.5.x/src/main/java/org/jboss/web/JasperMessages.java =================================================================== --- branches/7.5.x/src/main/java/org/jboss/web/JasperMessages.java 2014-10-22 13:50:30 UTC (rev 2529) +++ branches/7.5.x/src/main/java/org/jboss/web/JasperMessages.java 2014-10-22 13:54:07 UTC (rev 2530) @@ -220,8 +220,8 @@ @Message(id = 4060, value = "An error occurred at line: %s in the jsp file: %s") String errorInJspFile(int line, String fileName); - @Message(id = 4061, value = "An error occurred at line: %s in the generated java file") - String errorInJavaFile(int line); + @Message(id = 4061, value = "An error occurred at line: %s in the generated java file: %s") + String errorInJavaFile(int line, String fileName); @Message(id = 4062, value = "Unable to compile class for JSP: %s") String failedClassCompilation(String errorReport);