Return-Path: Delivered-To: apmail-velocity-dev-archive@www.apache.org Received: (qmail 4620 invoked from network); 8 Jun 2007 03:57:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Jun 2007 03:57:43 -0000 Received: (qmail 22527 invoked by uid 500); 8 Jun 2007 03:57:47 -0000 Delivered-To: apmail-velocity-dev-archive@velocity.apache.org Received: (qmail 22347 invoked by uid 500); 8 Jun 2007 03:57:46 -0000 Mailing-List: contact dev-help@velocity.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Velocity Developers List" Delivered-To: mailing list dev@velocity.apache.org Received: (qmail 22338 invoked by uid 99); 8 Jun 2007 03:57:46 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jun 2007 20:57:46 -0700 X-ASF-Spam-Status: No, hits=2.0 required=10.0 tests=HTML_MESSAGE X-Spam-Check-By: apache.org Received-SPF: pass (herse.apache.org: local policy) Received: from [209.126.222.91] (HELO mail.newenterprise.com.br) (209.126.222.91) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jun 2007 20:57:42 -0700 Received: (qmail 1177 invoked by uid 509); 8 Jun 2007 00:57:18 -0300 Received: from 201.22.62.193.adsl.gvt.net.br (HELO giba) (convites@newenterprise.com.br@201.22.62.193) by mail.newenterprise.com.br with SMTP; 8 Jun 2007 00:57:18 -0300 Message-ID: <046601c7a981$1f189ad0$0301010a@giba> Reply-To: =?UTF-8?Q?S=C3=A9rgio_7_Reais?= From: =?UTF-8?Q?S=C3=A9rgio_7_Reais?= To: References: <20070605035222.D193F1A981A@eris.apache.org> <06b401c7a72c$47e38080$0301010a@giba> <004301c7a8ab$7b8cfda0$0301010a@giba> Subject: Re: svn commit: r544359 - in /velocity/engine/trunk: src/java/org/apache/velocity/app/event/implement/IncludeNotFound.java test/includeevent/compare/test6.cmp Date: Fri, 8 Jun 2007 00:57:21 -0300 MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----=_NextPart_000_045F_01C7A967.F884D910" X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2900.3028 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.3028 X-Virus-Checked: Checked by ClamAV on apache.org ------=_NextPart_000_045F_01C7A967.F884D910 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable ----- Original Message -----=20 From: S=C3=A9rgio 7 Reais=20 To: dev@velocity.apache.org=20 Sent: Wednesday, June 06, 2007 11:28 PM Subject: Re: svn commit: r544359 - in /velocity/engine/trunk: = src/java/org/apache/velocity/app/event/implement/IncludeNotFound.java = test/includeevent/compare/test6.cmp ----- Original Message -----=20 From: S=C3=A9rgio 7 Reais=20 To: dev@velocity.apache.org=20 Sent: Tuesday, June 05, 2007 1:45 AM Subject: Re: svn commit: r544359 - in /velocity/engine/trunk: = src/java/org/apache/velocity/app/event/implement/IncludeNotFound.java = test/includeevent/compare/test6.cmp ----- Original Message -----=20 From: wglass@apache.org=20 To: commits@velocity.apache.org=20 Sent: Tuesday, June 05, 2007 12:52 AM Subject: svn commit: r544359 - in /velocity/engine/trunk: = src/java/org/apache/velocity/app/event/implement/IncludeNotFound.java = test/includeevent/compare/test6.cmp Author: wglass Date: Mon Jun 4 20:52:21 2007 New Revision: 544359 URL: http://svn.apache.org/viewvc?view=3Drev&rev=3D544359 Log: Correctly display "not found" page. Fixes VELOCITY-551. Modified: = velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/In= cludeNotFound.java velocity/engine/trunk/test/includeevent/compare/test6.cmp Modified: = velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/In= cludeNotFound.java URL: = http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/ve= locity/app/event/implement/IncludeNotFound.java?view=3Ddiff&rev=3D544359&= r1=3D544358&r2=3D544359 = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- = velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/In= cludeNotFound.java (original) +++ = velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/In= cludeNotFound.java Mon Jun 4 20:52:21 2007 @@ -70,7 +70,7 @@ boolean exists =3D = (rs.getLoaderNameForResource(includeResourcePath) !=3D null); if (!exists) { - if (rs.getLoaderNameForResource(notfound) =3D=3D = null) + if (rs.getLoaderNameForResource(notfound) !=3D null) { return notfound; =20 Modified: = velocity/engine/trunk/test/includeevent/compare/test6.cmp URL: = http://svn.apache.org/viewvc/velocity/engine/trunk/test/includeevent/comp= are/test6.cmp?view=3Ddiff&rev=3D544359&r1=3D544358&r2=3D544359 = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- velocity/engine/trunk/test/includeevent/compare/test6.cmp = (original) +++ velocity/engine/trunk/test/includeevent/compare/test6.cmp Mon = Jun 4 20:52:21 2007 @@ -1,2 +1,2 @@ Bad include follows -After the bad include +page not foundAfter the bad include --=20 No virus found in this incoming message. Checked by AVG Free Edition.=20 Version: 7.5.472 / Virus Database: 269.8.7/830 - Release Date: = 3/6/2007 12:47 = -------------------------------------------------------------------------= ----- No virus found in this incoming message. Checked by AVG Free Edition.=20 Version: 7.5.472 / Virus Database: 269.8.7/830 - Release Date: = 3/6/2007 12:47 -------------------------------------------------------------------------= ----- No virus found in this incoming message. Checked by AVG Free Edition.=20 Version: 7.5.472 / Virus Database: 269.8.9/834 - Release Date: = 5/6/2007 14:38 ------=_NextPart_000_045F_01C7A967.F884D910--