luehe 2004/05/21 10:52:59 Modified: jasper2/src/share/org/apache/jasper/compiler Compiler.java DefaultErrorHandler.java ErrorDispatcher.java ErrorHandler.java Log: Dispatch error report (in addition to BuildException) to error handler Revision Changes Path 1.86 +4 -3 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java Index: Compiler.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- Compiler.java 21 May 2004 00:20:53 -0000 1.85 +++ Compiler.java 21 May 2004 17:52:59 -0000 1.86 @@ -403,14 +403,15 @@ } if (be != null) { + String errorReportString = errorReport.toString(); log.error("Error compiling file: " + javaFileName + " " - + errorReport); + + errorReportString); JavacErrorDetail[] javacErrors = errDispatcher.parseJavacErrors( - errorReport.toString(), javaFileName, pageNodes); + errorReportString, javaFileName, pageNodes); if (javacErrors != null) { errDispatcher.javacError(javacErrors); } else { - errDispatcher.javacError(be); + errDispatcher.javacError(errorReportString, be); } } 1.11 +3 -2 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java Index: DefaultErrorHandler.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- DefaultErrorHandler.java 21 May 2004 00:20:53 -0000 1.10 +++ DefaultErrorHandler.java 21 May 2004 17:52:59 -0000 1.11 @@ -81,11 +81,12 @@ } /** - * Processes the given javac compilation exception. + * Processes the given javac error report and exception. * + * @param errorReport Compilation error report * @param exception Compilation exception */ - public void javacError(Exception exception) + public void javacError(String errorReport, Exception exception) throws JasperException { throw new JasperException( 1.19 +6 -4 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorDispatcher.java Index: ErrorDispatcher.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorDispatcher.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ErrorDispatcher.java 21 May 2004 00:20:53 -0000 1.18 +++ ErrorDispatcher.java 21 May 2004 17:52:59 -0000 1.19 @@ -334,14 +334,16 @@ /* - * Dispatches the given compilation exception to the configured error - * handler. + * Dispatches the given compilation error report and exception to the + * configured error handler. * + * @param errorReport Compilation error report * @param e Compilation exception */ - public void javacError(Exception e) throws JasperException { + public void javacError(String errorReport, Exception e) + throws JasperException { - errHandler.javacError(e); + errHandler.javacError(errorReport, e); } 1.6 +3 -2 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorHandler.java Index: ErrorHandler.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorHandler.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ErrorHandler.java 21 May 2004 00:20:53 -0000 1.5 +++ ErrorHandler.java 21 May 2004 17:52:59 -0000 1.6 @@ -62,10 +62,11 @@ throws JasperException; /** - * Processes the given javac compilation exception. + * Processes the given javac error report and exception. * + * @param errorReport Compilation error report * @param exception Compilation exception */ - public void javacError(Exception exception) + public void javacError(String errorReport, Exception exception) throws JasperException; }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]