Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 95129 invoked from network); 24 Jun 2007 11:48:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Jun 2007 11:48:11 -0000 Received: (qmail 20366 invoked by uid 500); 24 Jun 2007 11:48:10 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 20126 invoked by uid 500); 24 Jun 2007 11:48:09 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 20115 invoked by uid 500); 24 Jun 2007 11:48:09 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 20109 invoked by uid 99); 24 Jun 2007 11:48:09 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 24 Jun 2007 04:48:09 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 24 Jun 2007 04:48:01 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 198031A981A; Sun, 24 Jun 2007 04:47:35 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r550211 - in /tomcat: container/tc5.5.x/webapps/docs/changelog.xml jasper/tc5.5.x/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java jasper/tc5.5.x/src/share/org/apache/jasper/resources/LocalStrings.properties Date: Sun, 24 Jun 2007 11:47:34 -0000 To: tomcat-dev@jakarta.apache.org From: markt@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070624114735.198031A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Sun Jun 24 04:47:34 2007 New Revision: 550211 URL: http://svn.apache.org/viewvc?view=rev&rev=550211 Log: Fix bug 42314 by porting changes from TC6. Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/resources/LocalStrings.properties Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=550211&r1=550210&r2=550211 ============================================================================== --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jun 24 04:47:34 2007 @@ -39,6 +39,10 @@ 42643: Prevent creation of duplicate JSP function mapper variables. (markt) + + 42314: Provide compilation error details in cases where the + error can't be mapped back to a source file. (markt) + Modified: tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java URL: http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java?view=diff&rev=550211&r1=550210&r2=550211 ============================================================================== --- tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java (original) +++ tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java Sun Jun 24 04:47:34 2007 @@ -79,6 +79,14 @@ buf.append(details[i].getErrorMessage()); buf.append("\n"); buf.append(details[i].getJspExtract()); + } else { + args = new Object[] { + new Integer(details[i].getJavaLineNumber()) }; + buf.append("\n\n"); + buf.append(Localizer.getMessage("jsp.error.java.line.number", + args)); + buf.append("\n"); + buf.append(details[i].getErrorMessage()); } } buf.append("\n\nStacktrace:"); Modified: tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/resources/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/resources/LocalStrings.properties?view=diff&rev=550211&r1=550210&r2=550211 ============================================================================== --- tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/resources/LocalStrings.properties (original) +++ tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/resources/LocalStrings.properties Sun Jun 24 04:47:34 2007 @@ -301,6 +301,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.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. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org